Merge remote-tracking branch 'upstream/master' into token_destroy_event

Conflicts:
	dist/oauth-ng.js

Author: jfturcot

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+
+## 0.3.1 (November 3, 2014)
+
+* Replace $timeout with $interval #50
+* Add broadcast “oath:profile” once profile is retrieved. #51
+
+## 0.3.0 (October 30, 2014)
+
+* Solved bug on access token definition from hash
+* Correctly running tests with E2E protractor
+
 ## 0.2.8 (August 27, 2014)
 
 * Fixed `expries_at` not being set in some situations

app/scripts/services/access-token.js

@@ -2,7 +2,7 @@
 
 var accessTokenService = angular.module('oauth.accessToken', ['ngStorage']);
 
-accessTokenService.factory('AccessToken', function($rootScope, $location, $sessionStorage, $timeout){
+accessTokenService.factory('AccessToken', function($rootScope, $location, $sessionStorage, $interval){
 
     var service = {
             token: null
@@ -25,7 +25,7 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
      * - takes the token from the sessionStorage
      */
     service.set = function(){
-        setTokenFromString($location.hash());
+        this.setTokenFromString($location.hash());
 
         //If hash is present in URL always use it, cuz its coming from oAuth2 provider redirect
         if(null === service.token){
@@ -54,15 +54,11 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
     };
 
 
-    /* * * * * * * * * *
-     * PRIVATE METHODS *
-     * * * * * * * * * */
-
     /**
      * Get the access token from a string and save it
      * @param hash
      */
-    var setTokenFromString = function(hash){
+    service.setTokenFromString = function(hash){
         var params = getTokenFromString(hash);
 
         if(params){
@@ -73,6 +69,11 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
         }
     };
 
+   
+    /* * * * * * * * * *
+     * PRIVATE METHODS *
+     * * * * * * * * * */
+   
     /**
      * Set the access token from the sessionStorage.
      */
@@ -143,9 +144,9 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
     var setExpiresAtEvent = function(){
         var time = (new Date(service.token.expires_at))-(new Date());
         if(time){
-            $timeout(function(){
+            $interval(function(){
                 $rootScope.$broadcast('oauth:expired', service.token)
-            }, time)
+            }, time, 1)
         }
     };
 

app/scripts/services/profile.js

@@ -2,13 +2,16 @@
 
 var profileClient = angular.module('oauth.profile', [])
 
-profileClient.factory('Profile', function($http, AccessToken) {
+profileClient.factory('Profile', function($http, AccessToken, $rootScope) {
   var service = {};
   var profile;
 
   service.find = function(uri) {
     var promise = $http.get(uri, { headers: headers() });
-    promise.success(function(response) { profile = response });
+    promise.success(function(response) {
+        profile = response;
+        $rootScope.$broadcast('oauth:profile', profile);
+    });
     return promise;
   };
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth-ng",
-  "version": "0.2.8",
+  "version": "0.3.1",
   "main": [
     "dist/oauth-ng.js",
     "dist/views/templates/default"
@@ -14,7 +14,7 @@
     "package.json"
   ],
   "dependencies": {
-    "angular": "~1.2.22",
+    "angular": "~1.2.26",
     "ngstorage": "~0.3.0"
   },
   "devDependencies": {
@@ -23,6 +23,6 @@
     "timecop": "~0.1.1",
     "bootstrap-sass": "~3.0.2",
     "jquery": "~1.9.1",
-    "angular-mocks": "~1.2.22"
+    "angular-mocks": "~1.2.26"
   }
 }

dist/oauth-ng.js

@@ -1,4 +1,4 @@
-/* oauth-ng - v0.2.8 - 2014-10-28 */
+/* oauth-ng - v0.3.0 - 2014-10-30 */
 
 'use strict';
 
@@ -20,7 +20,7 @@ angular.module('oauth').config(['$locationProvider','$httpProvider',
 
 var accessTokenService = angular.module('oauth.accessToken', ['ngStorage']);
 
-accessTokenService.factory('AccessToken', function($rootScope, $location, $sessionStorage, $timeout){
+accessTokenService.factory('AccessToken', function($rootScope, $location, $sessionStorage, $interval){
 
     var service = {
             token: null
@@ -43,7 +43,7 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
      * - takes the token from the sessionStorage
      */
     service.set = function(){
-        setTokenFromString($location.hash());
+        this.setTokenFromString($location.hash());
 
         //If hash is present in URL always use it, cuz its coming from oAuth2 provider redirect
         if(null === service.token){
@@ -72,15 +72,11 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
     };
 
 
-    /* * * * * * * * * *
-     * PRIVATE METHODS *
-     * * * * * * * * * */
-
     /**
      * Get the access token from a string and save it
      * @param hash
      */
-    var setTokenFromString = function(hash){
+    service.setTokenFromString = function(hash){
         var params = getTokenFromString(hash);
 
         if(params){
@@ -91,6 +87,11 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
         }
     };
 
+   
+    /* * * * * * * * * *
+     * PRIVATE METHODS *
+     * * * * * * * * * */
+   
     /**
      * Set the access token from the sessionStorage.
      */
@@ -161,9 +162,9 @@ accessTokenService.factory('AccessToken', function($rootScope, $location, $sessi
     var setExpiresAtEvent = function(){
         var time = (new Date(service.token.expires_at))-(new Date());
         if(time){
-            $timeout(function(){
+            $interval(function(){
                 $rootScope.$broadcast('oauth:expired', service.token)
-            }, time)
+            }, time, 1)
         }
     };
 
@@ -239,13 +240,16 @@ endpointClient.factory('Endpoint', function(AccessToken, $location) {
 
 var profileClient = angular.module('oauth.profile', [])
 
-profileClient.factory('Profile', function($http, AccessToken) {
+profileClient.factory('Profile', function($http, AccessToken, $rootScope) {
   var service = {};
   var profile;
 
   service.find = function(uri) {
     var promise = $http.get(uri, { headers: headers() });
-    promise.success(function(response) { profile = response });
+    promise.success(function(response) {
+        profile = response;
+        $rootScope.$broadcast('oauth:profile', profile);
+    });
     return promise;
   };