Release 4.0.0

oauthjs · Feb 12, 2016 · 49341f2 · 49341f2
1 parent 946048b
commit 49341f2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+### upcoming / 2016-02-12
+- [#80](https://github.com/seegno/angular-oauth2/pull/80) Reintroduce authorization header to be overridden (@ruipenso)
+
 ### 3.1.1 / 2016-02-12
 - [#79](https://github.com/seegno/angular-oauth2/pull/79) Update dependencies (@ruipenso)
 
@@ -42,4 +45,4 @@
 
 ### 1.0.0 / 2015-01-18
 - [#2](https://github.com/seegno/angular-oauth2/pull/2) Fix indentation in README examples (@fixe)
-- [#1](https://github.com/seegno/angular-oauth2/pull/1) Add project structure (@ruipenso)
+- [#1](https://github.com/seegno/angular-oauth2/pull/1) Add project structure (@ruipenso)
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-oauth2",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "AngularJS OAuth2",
   "main": "./dist/angular-oauth2.js",
   "authors": [

diff --git a/dist/angular-oauth2.js b/dist/angular-oauth2.js
@@ -1,6 +1,6 @@
 /**
  * angular-oauth2 - Angular OAuth2
- * @version v3.1.1
+ * @version v4.0.0
  * @link https://github.com/seegno/angular-oauth2
  * @license MIT
  */
@@ -21,8 +21,8 @@
     function oauthInterceptor($q, $rootScope, OAuthToken) {
         return {
             request: function request(config) {
-                if (OAuthToken.getAuthorizationHeader()) {
-                    config.headers = config.headers || {};
+                config.headers = config.headers || {};
+                if (!config.headers.hasOwnProperty("Authorization") && OAuthToken.getAuthorizationHeader()) {
                     config.headers.Authorization = OAuthToken.getAuthorizationHeader();
                 }
                 return config;

diff --git a/dist/angular-oauth2.min.js b/dist/angular-oauth2.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-oauth2",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "Angular OAuth2",
   "main": "./dist/angular-oauth2.js",
   "repository": {