version 1.0.0-beta.2

fix #61 & #62
maximepvrt · Mar 22, 2016 · 235d848 · 235d848
1 parent 64bc6d0
commit 235d848
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 37 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-google-gapi",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "homepage": "https://maximepvrt.github.io/angular-google-gapi",
   "authors": [
     "maximepvrt <[email protected]>"

diff --git a/dist/angular-google-gapi.js b/dist/angular-google-gapi.js
@@ -1,6 +1,6 @@
 /**
  * An AngularJS module for use all Google Apis and your Google Cloud Endpoints
- * @version 1.0.0-beta.1
+ * @version 1.0.0-beta.2
  * @link https://github.com/maximepvrt/angular-google-gapi
  */
 
@@ -94,34 +94,35 @@
             }
 
             //exponentialBackoff
-            function retryExecute(actionPromise, args) {
-                var queryResults = $q.defer();
-                var iter = 0;
-                retry(actionPromise, iter);
-                function retry(actionPromise, iter) {
-                    actionPromise.apply(this, args).then(function(body) {
-                        queryResults.resolve(body);
-                    }).catch(function(error){
-                        if((error.code == 403 && error.message.toLowerCase().indexOf('limit exceeded')>-1) || error.code == 503){
-                            var base = 2;
-                            var ms = 1000;
-                            var randomMilliseconds = Math.floor((Math.random() * 1000) + 1);
-                            if(iter < 5){
-                                setTimeout(function(){
-                                    retry(actionPromise, ++iter);
-                                }, (ms * Math.pow(base, iter)) + randomMilliseconds);
-                            }
-                            else{
-                                queryResults.reject(error);
-                            }
-                        }
-                        else{
-                            queryResults.reject(error);
-                        }
-                    });
-                }
-                return queryResults.promise;
-            }
+             function retryExecute(actionPromise, args) {
+                 var queryResults = $q.defer();
+                 var iter = 0;
+                 retry(actionPromise, iter);
+                 function retry(actionPromise, iter) {
+                     actionPromise.apply(this, args).then(function(body) {
+                         queryResults.resolve(body);
+                     }).catch(function(error){
+                         if((error.code == 403 && error.message.toLowerCase().indexOf('limit exceeded')>-1) || error.code == 503){
+                             var base = 2;
+                             var ms = 1000;
+                             var randomMilliseconds = Math.floor((Math.random() * 1000) + 1);
+                             if(iter < 5){
+                                 setTimeout(function(){
+                                     retry(actionPromise, ++iter);
+                                 }, (ms * Math.pow(base, iter)) + randomMilliseconds);
+                             }
+                             else{
+                                 queryResults.reject(error);
+                             }
+                         }
+                         else{
+                             queryResults.reject(error);
+                         }
+                     });
+                 }
+                 return queryResults.promise;
+             }
+
 
             return {
 
@@ -273,7 +274,7 @@
                     var deferred = $q.defer();
                     signin(false, function() {
                         getUser().then(function (user) {
-                            deferred.resolve();
+                            deferred.resolve(user);
                         }, function () {
                             deferred.reject();
                         });
@@ -328,6 +329,7 @@
 
         }]);
 })();
+
 (function() {
     'use strict';
     angular.module('angular-google-gapi').factory('GClient', ['$document', '$q', '$window',

diff --git a/dist/angular-google-gapi.min.js b/dist/angular-google-gapi.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-google-gapi",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "An AngularJS module for use all Google Apis and your Google Cloud Endpoints (Google App Engine) with OAuth. This module use Google APIs Client Library for JavaScript, available for all GApis.",
   "main": "dist/angular-google-gapi.min.js",
   "repository": {
@@ -25,6 +25,10 @@
   "dependencies": {
     "angular": "~1.x"
   },
+  "files": ["dist"],
+  "scripts": {
+      "build": "glup"
+  },
   "devDependencies": {
     "del": "^2.0.2",
     "gulp": "^3.9.0",

diff --git a/src/angular-google-gapi.module.js b/src/angular-google-gapi.module.js
@@ -1,6 +1,6 @@
 /**
  * An AngularJS module for use all Google Apis and your Google Cloud Endpoints
- * @version 1.0.0-beta.1
+ * @version 1.0.0-beta.2
  * @link https://github.com/maximepvrt/angular-google-gapi
  */
 

diff --git a/src/factories/GApi.factory.js b/src/factories/GApi.factory.js
@@ -83,6 +83,37 @@
                 return deferred.promise;
             }
 
+            //exponentialBackoff
+             function retryExecute(actionPromise, args) {
+                 var queryResults = $q.defer();
+                 var iter = 0;
+                 retry(actionPromise, iter);
+                 function retry(actionPromise, iter) {
+                     actionPromise.apply(this, args).then(function(body) {
+                         queryResults.resolve(body);
+                     }).catch(function(error){
+                         if((error.code == 403 && error.message.toLowerCase().indexOf('limit exceeded')>-1) || error.code == 503){
+                             var base = 2;
+                             var ms = 1000;
+                             var randomMilliseconds = Math.floor((Math.random() * 1000) + 1);
+                             if(iter < 5){
+                                 setTimeout(function(){
+                                     retry(actionPromise, ++iter);
+                                 }, (ms * Math.pow(base, iter)) + randomMilliseconds);
+                             }
+                             else{
+                                 queryResults.reject(error);
+                             }
+                         }
+                         else{
+                             queryResults.reject(error);
+                         }
+                     });
+                 }
+                 return queryResults.promise;
+             }
+
+
             return {
 
                 executeCallbacks : function() {
@@ -101,9 +132,9 @@
 
                 executeAuth: function(api, method, params){
                     if(arguments.length == 3)
-                        return execute(api, method, params, true);
+                        return retryExecute(execute, arguments); //return execute(api, method, params, true)
                     if(arguments.length == 2)
-                        return execute(api, method, null, true);
+                        return retryExecute(execute, arguments); //return execute(api, method, null, true)
                 },
             }
         }]);