From 1d6034761b6f3dd83dd3787ebd577a41ca956232 Mon Sep 17 00:00:00 2001
From: Rui Silva <penso@uphold.com>
Date: Fri, 12 Feb 2016 14:49:49 +0000
Subject: [PATCH] Revert "Merge pull request #77 from
 seegno/enhancement/authorization-header"

---
 src/interceptors/oauth-interceptor.js         |  5 ++---
 .../interceptors/oauth-interceptor.spec.js    | 22 -------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/interceptors/oauth-interceptor.js b/src/interceptors/oauth-interceptor.js
index bbdcadb..896ae6d 100644
--- a/src/interceptors/oauth-interceptor.js
+++ b/src/interceptors/oauth-interceptor.js
@@ -6,10 +6,9 @@
 function oauthInterceptor($q, $rootScope, OAuthToken) {
   return {
     request: function(config) {
-      config.headers = config.headers || {};
-
       // Inject `Authorization` header.
-      if (!config.headers.hasOwnProperty('Authorization') && OAuthToken.getAuthorizationHeader()) {
+      if (OAuthToken.getAuthorizationHeader()) {
+        config.headers = config.headers || {};
         config.headers.Authorization = OAuthToken.getAuthorizationHeader();
       }
 
diff --git a/test/unit/interceptors/oauth-interceptor.spec.js b/test/unit/interceptors/oauth-interceptor.spec.js
index 4c5e3c7..9611589 100644
--- a/test/unit/interceptors/oauth-interceptor.spec.js
+++ b/test/unit/interceptors/oauth-interceptor.spec.js
@@ -37,28 +37,6 @@ describe('oauthInterceptor', function() {
     $httpBackend.flush();
   }));
 
-  it('should not inject `Authorization` header if it already exists', inject(function($http, $httpBackend, OAuthToken) {
-    OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
-
-    $httpBackend.expectGET('https://website.com', function(headers) {
-      headers.Authorization = undefined;
-
-      return headers;
-    }).respond(200);
-
-    $http.get('https://website.com').then(function(response) {
-      response.config.headers.should.have.property('Authorization');
-      (undefined === response.config.headers.Authorization).should.be.true;
-    }).catch(function() {
-      should.fail();
-    });
-
-    $httpBackend.flush();
-
-    $httpBackend.verifyNoOutstandingExpectation();
-    $httpBackend.verifyNoOutstandingRequest();
-  }));
-
   it('should remove `token` if an `invalid_request` error occurs', inject(function($http, $httpBackend, OAuthToken) {
     sinon.spy(OAuthToken, 'removeToken');