Skip to content
This repository was archived by the owner on Feb 19, 2022. It is now read-only.

Oauth 2.0 Fernando approach :) #89

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Oauth 2.0 Fernando approach :) #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 47 additions & 10 deletions src/factories/GApi.factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
(function() {
'use strict';
angular.module('angular-google-gapi').factory('GApi', ['$q', 'GClient', 'GData', '$window',
function($q, GClient, GData, $window){
angular.module('angular-google-gapi', []);
})();

(function() {
'use strict';
angular.module('angular-google-gapi').factory('GApi', ['$q', 'GClient', '$window', 'GAuth',
function($q, GClient, $window, GAuth){
var apisLoad = [];

var observerCallbacks = [];

function registerObserverCallback(api, method, params, auth, deferred){
Expand All @@ -19,12 +22,15 @@
};

function load(api, version, url) {

//logTimer("GApi.load: " + api);

var deferred = $q.defer();
GClient.get().then(function (){
$window.gapi.client.load(api, version, undefined, url).then(function(response) {
var result = {'api': api, 'version': version, 'url': url};
if(response && response.hasOwnProperty('error')) {
console.log(version);
//logTimer(version);
deferred.reject(result);
} else {
deferred.resolve(result);
Expand All @@ -37,11 +43,12 @@
}

function executeCallbacks(api){

var apiName = api;

for(var i= 0; i < observerCallbacks.length; i++){
var observerCallback = observerCallbacks[i];
if ((observerCallback.api == apiName || observerCallback.apiLoad) && (observerCallback.auth == false || GData.isLogin() == true)) {
if ((observerCallback.api == apiName || observerCallback.apiLoad) && (observerCallback.auth == false || GAuth.isSignedIn() == true)) {
runGapi(observerCallback.api, observerCallback.method, observerCallback.params, observerCallback.deferred);
if (i > -1) {
observerCallbacks.splice(i--, 1);
Expand All @@ -51,10 +58,10 @@
observerCallbacks[i]['apiLoad'] = true;
}
};

}

function createRequest(api, method, params) {
function createRequest(api, method, params) {
////logTimer("GApi.createRequest: " + api);
var pathMethod = method.split('.');
var api = $window.gapi.client[api];
for(var i= 0; i < pathMethod.length; i++) {
Expand Down Expand Up @@ -83,6 +90,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() {
Expand All @@ -91,7 +129,6 @@

load: load,
createRequest: createRequest,

execute: function(api, method, params){
if(arguments.length == 3)
return execute(api, method, params, false);
Expand All @@ -101,9 +138,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)
},
}
}]);
Expand Down
178 changes: 112 additions & 66 deletions src/factories/GAuth.factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,93 @@
(function() {
'use strict';
angular.module('angular-google-gapi').factory('GAuth', ['$rootScope', '$q', 'GClient', 'GApi', 'GData', '$interval', '$window', '$location',
function($rootScope, $q, GClient, GApi, GData, $interval, $window, $location){
var isLoad = false;
angular.module('angular-google-gapi').factory('GAuth', ['$q', 'GClient', '$window', '$localstorage',
function($q, GClient, $window, $localstorage){

var isLoad = false;
var CLIENT_ID;
var DOMAIN = undefined;
var SCOPE = 'https://www.googleapis.com/auth/userinfo.email';
var SCOPE = '';
var RESPONSE_TYPE = 'token id_token';
var gapiauth2GoogleAuth = null;

function load(){
//logt("GAuth.load function");
var deferred = $q.defer();
if (isLoad == false) {
GClient.get().then(function (){
$window.gapi.client.load('oauth2', 'v2', function() {
logt("GClient.get().then");
$window.gapi.load('auth2', function() {
logt("auth2 loaded");
isLoad = true;
deferred.resolve();
deferred.resolve();
});
}).catch(function (resp){
//logTimer(resp);
deferred.reject();
});
} else {
}
else {
deferred.resolve();
}
return deferred.promise;
}

function signin(mode, authorizeCallback) {

load().then(function (){
var config = {client_id: CLIENT_ID, scope: SCOPE, immediate: false, authuser: -1, response_type: RESPONSE_TYPE};
if(mode) {
config.user_id = GData.getUserId();
config.immediate = true;
//logTimer("GAuth.signin: " + mode);

function executeSignin(mode, authorizeCallback){

//logTimer("GAuth.executeSignin: " + mode);

if (gapiauth2GoogleAuth){
if (gapiauth2GoogleAuth.isSignedIn.get() == true) {
//logTimer("GAuth.executeSignin RESOLVED! ARRIBA");
//resp.signIn().then(authorizeCallback);
authorizeCallback();
}
else{
//logTimer("GAuth.executeSignin RESOLVED! ABAJO");
gapiauth2GoogleAuth.signIn({prompt: 'select_account'}).then(authorizeCallback);
}
}
else{

$window.gapi.auth2.init({
client_id: CLIENT_ID,
fetch_basic_profile: false,
scope: SCOPE,
authuser: -1,
immediate: false
}).then(function (resp) {

gapiauth2GoogleAuth = resp;

if (gapiauth2GoogleAuth.isSignedIn.get() == true) {
//logTimer("GAuth.executeSignin RESOLVED! ARRIBA");
//resp.signIn().then(authorizeCallback);
authorizeCallback();
}
else{
//logTimer("GAuth.executeSignin RESOLVED! ABAJO");
gapiauth2GoogleAuth.signIn({prompt: 'select_account'}).then(authorizeCallback);
}
});
}
if(DOMAIN != undefined)
config.hd = DOMAIN;
$window.gapi.auth.authorize(config, authorizeCallback);
});
}

if(!mode && isLoad === true){
// don't break the caller stack with async tasks
executeSignin(mode, authorizeCallback);
} else {
load().then(function (){
executeSignin(mode, authorizeCallback);
});
}
}

function offline() {
/*
var deferred = $q.defer();
var origin = $location.protocol() + "//" + $location.hostname();
if($location.port() != "" || ($location.port() != 443 && $location.protocol()== "https")) {
Expand Down Expand Up @@ -73,24 +122,7 @@
}

return deferred.promise;
}

function getUser() {

var deferred = $q.defer();
$window.gapi.client.oauth2.userinfo.get().execute(function(resp) {
if (!resp.code) {
GData.isLogin(true);
GApi.executeCallbacks();
if (!resp.name || 0 === resp.name.length)
resp.name = resp.email;
GData.getUser(resp);
deferred.resolve(resp);
} else {
deferred.reject();
}
});
return deferred.promise;
*/
}

return {
Expand All @@ -106,75 +138,89 @@
setScope: function(scope) {
SCOPE = scope;
},

load: load,

checkAuth: function(){

logt("GAuth.checkAuth");
var deferred = $q.defer();
signin(true, function() {
getUser().then(function (user) {
deferred.resolve(user);
}, function () {
deferred.reject();
});
});
load().then(function (){
$window.gapi.auth2.init({
client_id: CLIENT_ID,
fetch_basic_profile: false,
scope: SCOPE,
authuser: -1,
immediate: false
}).then(function (resp) {
gapiauth2GoogleAuth = resp;
if (resp.isSignedIn.get() == true) {
deferred.resolve();
}
else{
deferred.reject();
}
});
});

return deferred.promise;
},

login: function(){
var deferred = $q.defer();
signin(false, function() {
getUser().then(function (user) {
deferred.resolve();
}, function () {
deferred.reject();
});
deferred.resolve();
});
return deferred.promise;
},

setToken: function(token){
getToken: function(){
var deferred = $q.defer();
load().then(function (){
$window.gapi.auth.setToken(token);
getUser().then(function () {
deferred.resolve();
}, function () {
deferred.reject();
deferred.resolve(gapiauth2GoogleAuth.currentUser.get().getAuthResponse().access_token);
});
});
return deferred.promise;
},

getToken: function(){
logout: function(){
var deferred = $q.defer();
load().then(function (){
deferred.resolve($window.gapi.auth.getToken());
load().then(function() {
gapiauth2GoogleAuth.signOut().then(function() {
deferred.resolve();
});
});
return deferred.promise;
},

logout: function(){
grant: function(scopes){
var deferred = $q.defer();
load().then(function() {
$window.gapi.auth.setToken(null);
GData.isLogin(false);
GData.getUser(null);
deferred.resolve();
});

gapiauth2GoogleAuth.currentUser.get().grant({'scope': scopes}).then(
function(success){
deferred.resolve();
},
function(fail){
deferred.reject();
});

return deferred.promise;
},
},

offline: function(){
/*
var deferred = $q.defer();
offline().then( function(code){
deferred.resolve(code);
}, function(){
deferred.reject();
});
return deferred.promise;
*/
},


isSignedIn: function(){
return gapiauth2GoogleAuth.isSignedIn.get();
},
}

}]);
})();
Loading