From 7a0883746c5a129a0fb63c8fc5055d58a4192d4b Mon Sep 17 00:00:00 2001 From: Negue Date: Mon, 15 Sep 2014 21:31:39 +0200 Subject: [PATCH] Use ApiUrlService in all services --- public/js/services/authServices.js | 6 ++++-- public/js/services/challengeServices.js | 6 ++++-- public/js/services/groupServices.js | 6 ++++-- public/js/services/memberServices.js | 7 +++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/public/js/services/authServices.js b/public/js/services/authServices.js index 9e55d7af32..5efd96761e 100644 --- a/public/js/services/authServices.js +++ b/public/js/services/authServices.js @@ -9,8 +9,8 @@ var facebook = {} angular.module('authServices', ['userServices']). factory('Facebook', - ['$http', '$location', 'User', 'API_URL', - function($http, $location, User, API_URL) { + ['$http', '$location', 'User', 'ApiUrlService', + function($http, $location, User, ApiUrlService) { //TODO FB.init({appId: '${section.parameters['facebook.app.id']}', status: true, cookie: true, xfbml: true}); var auth, user = User.user; @@ -29,6 +29,8 @@ factory('Facebook', email: response.email } + var API_URL = ApiUrlService.getApiUrl(); + $http.post(API_URL + '/api/v2/user/auth/facebook', data).success(function(data, status, headers, config) { User.authenticate(data.id, data.token, function(err) { if (!err) { diff --git a/public/js/services/challengeServices.js b/public/js/services/challengeServices.js index cf4adf9579..3473677cd2 100644 --- a/public/js/services/challengeServices.js +++ b/public/js/services/challengeServices.js @@ -5,8 +5,10 @@ */ angular.module('challengeServices', ['ngResource']). - factory('Challenges', ['API_URL', '$resource', 'User', '$q', 'Members', - function(API_URL, $resource, User, $q, Members) { + factory('Challenges', ['ApiUrlService', '$resource', 'User', '$q', 'Members', + function(ApiUrlService, $resource, User, $q, Members) { + var API_URL = ApiUrlService.getApiUrl(); + var Challenge = $resource(API_URL + '/api/v2/challenges/:cid', {cid:'@_id'}, { diff --git a/public/js/services/groupServices.js b/public/js/services/groupServices.js index cabb68fa9f..da1bab8f78 100644 --- a/public/js/services/groupServices.js +++ b/public/js/services/groupServices.js @@ -5,8 +5,10 @@ */ angular.module('groupServices', ['ngResource']). - factory('Groups', ['API_URL', '$resource', '$q', '$http', 'User', - function(API_URL, $resource, $q, $http, User) { + factory('Groups', ['ApiUrlService', '$resource', '$q', '$http', 'User', + function(ApiUrlService, $resource, $q, $http, User) { + var API_URL = ApiUrlService.getApiUrl(); + var Group = $resource(API_URL + '/api/v2/groups/:gid', {gid:'@_id', messageId: '@_messageId'}, { diff --git a/public/js/services/memberServices.js b/public/js/services/memberServices.js index 29384f4cab..19572d14b2 100644 --- a/public/js/services/memberServices.js +++ b/public/js/services/memberServices.js @@ -5,8 +5,11 @@ */ angular.module('memberServices', ['ngResource', 'sharedServices']). - factory('Members', ['$rootScope', 'Shared', 'API_URL', '$resource', - function($rootScope, Shared, API_URL, $resource) { + factory('Members', ['$rootScope', 'Shared', 'ApiUrlService', '$resource', + function($rootScope, Shared, ApiUrlService, $resource) { + + var API_URL = ApiUrlService.getApiUrl(); + var members = {}; var Member = $resource(API_URL + '/api/v2/members/:uid', {uid:'@_id'}); var memberServices = {