Adds default Authorization header.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/0374f805 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/0374f805 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/0374f805 Branch: refs/heads/angular Commit: 0374f805a230a3b74c2e9002de8e22aa1e654a91 Parents: 6dc17cd Author: Jmeas <[email protected]> Authored: Thu Aug 14 13:34:14 2014 -0400 Committer: Jmeas <[email protected]> Committed: Thu Aug 14 14:16:21 2014 -0400 ---------------------------------------------------------------------- .jshintrc-dev | 1 - .jshintrc-prod | 1 - .../admin/categories/resources/categories.js | 21 +++-------------- .../admin/categories/resources/category.js | 19 +++------------- .../admin/preferences/resources/preferences.js | 16 +++---------- .../src/subapps/admin/users/resources/user.js | 19 +++------------- .../src/subapps/admin/users/resources/users.js | 24 +++----------------- .../src/subapps/admin/users/routes.js | 2 +- .../subapps/auth/security/services/security.js | 7 ++++-- 9 files changed, 21 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/.jshintrc-dev ---------------------------------------------------------------------- diff --git a/.jshintrc-dev b/.jshintrc-dev index fd37322..8a4efdd 100644 --- a/.jshintrc-dev +++ b/.jshintrc-dev @@ -28,7 +28,6 @@ "unused" : "vars", "strict" : false, "trailing" : true, - "maxparams" : 7, "maxdepth" : 2, "maxlen" : 120, http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/.jshintrc-prod ---------------------------------------------------------------------- diff --git a/.jshintrc-prod b/.jshintrc-prod index 6aa9844..3db027a 100644 --- a/.jshintrc-prod +++ b/.jshintrc-prod @@ -27,7 +27,6 @@ "unused" : "vars", "strict" : false, "trailing" : true, - "maxparams" : 7, "maxdepth" : 2, "maxstatements" : 30, "maxcomplexity" : 6, http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/admin/categories/resources/categories.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/resources/categories.js b/rave-portal-ng/src/subapps/admin/categories/resources/categories.js index d6ec7d7..e5b6cb9 100644 --- a/rave-portal-ng/src/subapps/admin/categories/resources/categories.js +++ b/rave-portal-ng/src/subapps/admin/categories/resources/categories.js @@ -10,23 +10,8 @@ define(function(require) { var URL = '/api/v1/categories'; // Return the categories resource - return ['$resource', 'authToken', - function($resource, authToken) { - var authHeader = { - Authorization: 'Basic ' + authToken.get() - }; - - return $resource(URL, {}, { - save: { - method: 'POST', - headers: authHeader - }, - - query: { - method: 'GET', - isArray: true, - headers: authHeader - } - }); + return ['$resource', + function($resource) { + return $resource(URL); }]; }); http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/admin/categories/resources/category.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/resources/category.js b/rave-portal-ng/src/subapps/admin/categories/resources/category.js index 4475eaf..bccb38e 100644 --- a/rave-portal-ng/src/subapps/admin/categories/resources/category.js +++ b/rave-portal-ng/src/subapps/admin/categories/resources/category.js @@ -10,24 +10,11 @@ define(function(require) { var URL = '/api/v1/category/:id'; // Return the categories resource - return ['$resource', 'authToken', - function($resource, authToken) { - var authHeader = { - Authorization: 'Basic ' + authToken.get() - }; - + return ['$resource', + function($resource) { return $resource(URL, {id: '@id'}, { - get: { - method: 'GET', - headers: authHeader - }, update: { - method: 'PUT', - headers: authHeader - }, - delete: { - method: 'DELETE', - headers: authHeader + method: 'PUT' } }); }]; http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/admin/preferences/resources/preferences.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/preferences/resources/preferences.js b/rave-portal-ng/src/subapps/admin/preferences/resources/preferences.js index 63a5e05..269718a 100644 --- a/rave-portal-ng/src/subapps/admin/preferences/resources/preferences.js +++ b/rave-portal-ng/src/subapps/admin/preferences/resources/preferences.js @@ -10,21 +10,11 @@ define(function(require) { var URL = '/api/v1/preferences'; // Return the categories resource - return ['$resource', 'authToken', - function($resource, authToken) { - var authHeader = { - Authorization: 'Basic ' + authToken.get() - }; - + return ['$resource', + function($resource) { return $resource(URL, {}, { - get: { - method: 'GET', - headers: authHeader - }, - update: { - method: 'PUT', - headers: authHeader + method: 'PUT' }, }); }]; http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/admin/users/resources/user.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/resources/user.js b/rave-portal-ng/src/subapps/admin/users/resources/user.js index 074b587..ae1323f 100644 --- a/rave-portal-ng/src/subapps/admin/users/resources/user.js +++ b/rave-portal-ng/src/subapps/admin/users/resources/user.js @@ -10,24 +10,11 @@ define(function(require) { var URL = '/api/v1/user/:id'; // Return the categories resource - return ['$resource', 'authToken', - function($resource, authToken) { - var authHeader = { - Authorization: 'Basic ' + authToken.get() - }; - + return ['$resource', + function($resource) { return $resource(URL, {id: '@id'}, { - get: { - method: 'GET', - headers: authHeader - }, update: { - method: 'PUT', - headers: authHeader - }, - delete: { - method: 'DELETE', - headers: authHeader + method: 'PUT' } }); }]; http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/admin/users/resources/users.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/resources/users.js b/rave-portal-ng/src/subapps/admin/users/resources/users.js index cafd29d..41b3283 100644 --- a/rave-portal-ng/src/subapps/admin/users/resources/users.js +++ b/rave-portal-ng/src/subapps/admin/users/resources/users.js @@ -10,26 +10,8 @@ define(function(require) { var URL = '/api/v1/users'; // Return the categories resource - return ['$resource', 'authToken', - function($resource, authToken) { - - var authHeader = {}; - - // We return a factory method from this due to logging in and out - // requiring a dynamic header - return function() { - - // Dynamically set the authorization header, based on our current authToken - authHeader.Authorization = 'Basic ' + authToken.get(); - - // Return the resource. - return $resource(URL, {}, { - query: { - method: 'GET', - isArray: true, - headers: authHeader - } - }); - }; + return ['$resource', + function($resource) { + return $resource(URL); }]; }); http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/admin/users/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/routes.js b/rave-portal-ng/src/subapps/admin/users/routes.js index b658575..592144d 100644 --- a/rave-portal-ng/src/subapps/admin/users/routes.js +++ b/rave-portal-ng/src/subapps/admin/users/routes.js @@ -23,7 +23,7 @@ define(function(require) { resolve: { usersList: ['usersResource', function(usersResource) { - return usersResource().query(); + return usersResource.query(); }] } }) http://git-wip-us.apache.org/repos/asf/rave/blob/0374f805/rave-portal-ng/src/subapps/auth/security/services/security.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/auth/security/services/security.js b/rave-portal-ng/src/subapps/auth/security/services/security.js index 29ca642..7e2cc2c 100644 --- a/rave-portal-ng/src/subapps/auth/security/services/security.js +++ b/rave-portal-ng/src/subapps/auth/security/services/security.js @@ -14,8 +14,8 @@ */ define(function(require) { - return ['$rootScope', 'authToken', '$q', 'authApi', 'authCache', '$state', 'locationCache', - function($rootScope, authToken, $q, authApi, authCache, $state, locationCache) { + return ['$rootScope', 'authToken', '$q', 'authApi', 'authCache', '$state', 'locationCache', '$http', + function($rootScope, authToken, $q, authApi, authCache, $state, locationCache, $http) { return { // Returns a promise that resolves true or rejects false. @@ -43,6 +43,7 @@ define(function(require) { authApi.verify(myToken) .then(function(res) { $rootScope.currentUser = res.data.user; + $http.defaults.headers.common.Authorization = 'Basic ' + myToken; $rootScope.authenticated = true; authCache.put('verified', true); response.resolve(true); @@ -72,6 +73,8 @@ define(function(require) { authCache.put('verified', true); authToken.set(res.data.token, credentials.remember); + $http.defaults.headers.common.Authorization = 'Basic ' + res.data.token; + var toState = locationCache.get('toState') || 'portal.home'; var toParams = locationCache.get('toParams') || undefined;
