diff --git a/website/client/js/services/memberServices.js b/website/client/js/services/memberServices.js index 039743cea5..c62e4cdbc2 100644 --- a/website/client/js/services/memberServices.js +++ b/website/client/js/services/memberServices.js @@ -1,8 +1,8 @@ 'use strict'; angular.module('habitrpg') -.factory('Members', [ '$rootScope', 'Shared', 'ApiUrl', '$resource', '$http', '$q', - function($rootScope, Shared, ApiUrl, $resource, $http, $q) { +.factory('Members', [ '$rootScope', 'Shared', 'ApiUrl', '$http', '$q', + function($rootScope, Shared, ApiUrl, $http, $q) { var members = {}; var selectedMember = {}; var apiV3Prefix = '/api/v3'; diff --git a/website/client/js/static.js b/website/client/js/static.js index 67a07df815..c8af2adf27 100644 --- a/website/client/js/static.js +++ b/website/client/js/static.js @@ -6,18 +6,21 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui. .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') .constant("MOBILE_APP", false) -.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', function($scope, $location, $modal, $http, Stats){ +.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', 'Members', + function($scope, $location, $modal, $http, Stats, Members) { var memberId = $location.search()['memberId']; if (memberId) { - $http.get('/api/v2/members/'+memberId).success(function(data, status, headers, config){ - $scope.profile = window.habitrpgShared.wrap(data, false); - $scope.statCalc = Stats; - $scope.Content = window.habitrpgShared.content; - $modal.open({ - templateUrl: 'modals/member.html', - scope: $scope + Members.fetchMember(memberId) + .success(function(response) { + $scope.profile = response.data; + + $scope.statCalc = Stats; + $scope.Content = window.habitrpgShared.content; + $modal.open({ + templateUrl: 'modals/member.html', + scope: $scope + }); }); - }) } $http.defaults.headers.common['x-client'] = 'habitica-web'; diff --git a/website/client/manifest.json b/website/client/manifest.json index 10b9d9f7ac..2c770893f1 100644 --- a/website/client/manifest.json +++ b/website/client/manifest.json @@ -136,6 +136,7 @@ "js/services/statServices.js", "js/services/taskServices.js", "js/services/tagsServices.js", + "js/services/memberServices.js", "js/controllers/authCtrl.js", "js/controllers/footerCtrl.js" ], @@ -172,6 +173,7 @@ "js/services/taskServices.js", "js/services/tagsServices.js", "js/services/userServices.js", + "js/services/memberServices.js", "js/controllers/authCtrl.js", "js/controllers/footerCtrl.js" ], diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js index 3d6334967d..f85b7d86e5 100644 --- a/website/server/controllers/api-v3/members.js +++ b/website/server/controllers/api-v3/members.js @@ -33,7 +33,7 @@ let api = {}; api.getMember = { method: 'GET', url: '/members/:memberId', - middlewares: [authWithHeaders()], + middlewares: [], async handler (req, res) { req.checkParams('memberId', res.t('memberIdRequired')).notEmpty().isUUID();