Merge pull request #11 from incuna/auth-header-prefix

Add auth-header-prefix option
incuna · May 23, 2014 · f0e59b7 · f0e59b7
2 parents 80ab6cc + f406519
commit f0e59b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+# 3.0.3
+
+* Add option for authorisation header prefix to allow oAuth 2.0 bearer authorisation
+
 # 3.0.2
 
 * Only broadcast tokenAuth events after cookie manipulation.

diff --git a/angular_token_auth.js b/angular_token_auth.js
@@ -8,7 +8,8 @@
         ENDPOINT: '/auth/',
         LOGIN: '/login/',
         LOGOUT: '/logout/',
-        LOGIN_REDIRECT_URL: '/'
+        LOGIN_REDIRECT_URL: '/',
+        AUTH_HEADER_PREFIX: 'Token'
     });
 
     auth.config(['$routeProvider', 'TOKEN_AUTH', 'PROJECT_SETTINGS', function ($routeProvider, TOKEN_AUTH, PROJECT_SETTINGS) {
@@ -25,13 +26,15 @@
             });
     }]);
 
-    auth.factory('authInterceptor', ['$rootScope', '$q', 'tokenFactory', function ($rootScope, $q, tokenFactory) {
+    auth.factory('authInterceptor', ['$rootScope', '$q', 'tokenFactory', 'TOKEN_AUTH', 'PROJECT_SETTINGS', function ($rootScope, $q, tokenFactory, TOKEN_AUTH, PROJECT_SETTINGS) {
+        var MODULE_SETTINGS = angular.extend({}, TOKEN_AUTH, PROJECT_SETTINGS.TOKEN_AUTH);
+
         return {
             request: function (config) {
                 config.headers = config.headers || {};
                 var token = tokenFactory.getToken();
                 if (token) {
-                    config.headers.Authorization = 'Token ' + token;
+                    config.headers.Authorization = MODULE_SETTINGS.AUTH_HEADER_PREFIX + ' ' + token;
                 }
                 return config;
             },

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-token-auth",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "main": "./angular_token_auth.js",
   "dependencies": {
     "angular": "~1.2",
@@ -9,7 +9,8 @@
   "homepage": "https://github.com/incuna/angular-token-auth",
   "authors": [
     "Perry Roper <[email protected]>",
-    "Anna Powell-Smith <[email protected]>"
+    "Anna Powell-Smith <[email protected]>",
+    "Graham Gilchrist <[email protected]>"
   ],
   "license": "MIT",
   "ignore": [