From ce98a31a119653c813b0a277f14558cbdcd7e99a Mon Sep 17 00:00:00 2001
From: maximepvrt <maximepvrt@gmail.com>
Date: Mon, 2 Nov 2015 00:25:34 +0100
Subject: [PATCH] new version with angular-google-gapi v 1.0.0-SNAPSHOT

---
 app/app.js                         | 10 +++++++---
 index.html                         |  4 +++-
 vendors/angular-google-gapi.min.js |  5 ++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/app.js b/app/app.js
index 9b6fccd..6a21982 100644
--- a/app/app.js
+++ b/app/app.js
@@ -8,8 +8,10 @@ var app = angular.module('angular-google-api-example', [
 
 ]);
 
-app.run(['GAuth', 'GApi', '$state', '$rootScope', '$window',
-    function(GAuth, GApi, $state, $rootScope, $window) {
+app.run(['GAuth', 'GApi', 'GData', '$state', '$rootScope', '$window',
+    function(GAuth, GApi, GData, $state, $rootScope, $window) {
+
+        $rootScope.gdata = GData;
 
         var CLIENT = '526374069175-4vv42arm0ksdr9a1lgkve6vbktfkmlvv.apps.googleusercontent.com';
         var BASE;
@@ -19,6 +21,8 @@ app.run(['GAuth', 'GApi', '$state', '$rootScope', '$window',
             BASE = 'https://cloud-endpoints-gae.appspot.com/_ah/api';
         }
 
+          BASE = 'https://cloud-endpoints-gae.appspot.com/_ah/api';
+
         GApi.load('myContactApi', 'v1', BASE);
         GApi.load('calendar', 'v3');
         GAuth.setClient(CLIENT);
@@ -40,4 +44,4 @@ app.run(['GAuth', 'GApi', '$state', '$rootScope', '$window',
             });
         };
     }
-]);
\ No newline at end of file
+]);
diff --git a/index.html b/index.html
index f41459d..f7f4494 100644
--- a/index.html
+++ b/index.html
@@ -30,6 +30,7 @@
         <div id="navbar" class="collapse navbar-collapse">
           <ul class="nav navbar-nav navbar-right">
             <li><a href="" ng-click="logout()">logout</a></li>
+            <li><a href="" ng-click="logout()">{{gdata.getUser().name}}</a></li>
           </ul>
         </div><!--/.nav-collapse -->
       </div>
@@ -46,7 +47,8 @@
       </div>
     </footer>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular-cookies.min.js"></script>
     <script src="vendors/angular-ui-router.min.js"></script>
     <script src="vendors/angular-google-gapi.min.js"></script>
 
diff --git a/vendors/angular-google-gapi.min.js b/vendors/angular-google-gapi.min.js
index f404bdf..f13ab0e 100644
--- a/vendors/angular-google-gapi.min.js
+++ b/vendors/angular-google-gapi.min.js
@@ -1,7 +1,6 @@
 /**
  * An AngularJS module for use all Google Apis and your Google Cloud Endpoints
- * @version v0.1.2
+ * @version 1.0.0-SNAPSHOT
  * @link https://github.com/maximepvrt/angular-google-gapi
  */
-
- angular.module("angular-google-gapi",[]),angular.module("angular-google-gapi").factory("GClient",["$document","$q","$timeout","$interval","$window",function(e,n,o,t,i){function r(t){var i=n.defer(),r=e[0].createElement("script");return r.onload=function(e){o(function(){i.resolve(e)})},r.onerror=function(e){o(function(){i.reject(e)})},r.src=t,e[0].body.appendChild(r),i.promise}function a(e){r(c).then(function(){var n=function(e){void 0!=i.gapi.client&&(e(),t.cancel(o))};n(e);var o=t(function(){n(e)},10);u=!0})}var u=!1,c="https://apis.google.com/js/client.js";return{get:function(e){u?e():a(e)}}}]),angular.module("angular-google-gapi").factory("GData",["$rootScope",function(e){e.gapi={};var n=!1,o=null;return{isLogin:function(o){return 0==arguments.length?n:(n=o,void(e.gapi.login=o))},getUser:function(n){return 0==arguments.length?o:(o=n,void(e.gapi.user=n))}}}]),angular.module("angular-google-gapi").factory("GAuth",["$rootScope","$q","GClient","GApi","GData","$interval","$window","$location",function(e,n,o,t,i,r,a){function u(e){if(0==s){var n=arguments.length;o.get(function(){a.gapi.client.load("oauth2","v2",function(){s=!0,1==n&&e()})})}else e()}function c(e,n){u(function(){a.gapi.auth.authorize({client_id:f,scope:p,immediate:e,response_type:d},n)})}function l(){function e(n){if("https://accounts.google.com"===n.origin){var i=JSON.parse(n.data);a.removeEventListener("message",e),i=o(i.a[0],"code"),void 0==i?t.reject():t.resolve(i)}}function o(e,n){n=n.replace(/[[]/,"[").replace(/[]]/,"]");var o=n+"=([^&#]*)",t=new RegExp(o),i=t.exec(e);return null==i?void 0:i[1]}var t=n.defer(),i=$location.protocol+"//"+$location.hostname;console.log($location.port),""!=$location.port&&(i=i+":"+$location.port);a.open("https://accounts.google.com/o/oauth2/auth?scope="+encodeURI(p)+"&redirect_uri=postmessage&response_type=code&client_id="+f+"&access_type=offline&approval_prompt=force&origin="+i,null,"width=800, height=600");return a.addEventListener("message",e),t.promise}function g(){var e=n.defer();return a.gapi.client.oauth2.userinfo.get().execute(function(n){if(n.code)e.reject();else{i.isLogin(!0),t.executeCallbacks();var o={};o.email=n.email,o.picture=n.picture,o.id=n.id,o.name=void 0==n.name?n.email:n.name,o.link=n.link,i.getUser(o),e.resolve()}}),e.promise}var f,s=!1,p="https://www.googleapis.com/auth/userinfo.email",d="token id_token";return{setClient:function(e){f=e},setScope:function(e){p=e},load:function(e){var n=arguments.length;o.get(function(){a.gapi.client.load("oauth2","v2",function(){1==n&&e()})})},checkAuth:function(){var e=n.defer();return c(!0,function(){g().then(function(){e.resolve()},function(){e.reject()})}),e.promise},login:function(){var e=n.defer();return c(!1,function(){g().then(function(){e.resolve()},function(){e.reject()})}),e.promise},logout:function(){var e=n.defer();return u(function(){a.gapi.auth.setToken(null),i.isLogin(!1),i.getUser(null),e.resolve()}),e.promise},offline:function(){var e=n.defer();return l().then(function(n){e.resolve(n)},function(){e.reject()}),e.promise}}}]),angular.module("angular-google-gapi").factory("GApi",["$q","GClient","GData","$window",function(e,n,o,t){function i(e,n,o,t,i){var r={};r.api=e,r.apiLoad=!1,r.method=n,r.params=o,r.auth=t,r.deferred=i,g.push(r)}function r(e,o,i){n.get(function(){t.gapi.client.load(e,o,function(){console.log(e+" "+o+" api loaded"),l.push(e),a(e)},i)})}function a(e){for(var n=e,t=0;t<g.length;t++){var i=g[t];i.api!=n&&!i.apiLoad||0!=i.auth&&1!=o.isLogin()?i.api==n&&(g[t].apiLoad=!0):(u(i.api,i.method,i.params,i.deferred),t>-1&&g.splice(t--,1))}}function u(e,n,o,i){for(var r=n.split("."),e=t.gapi.client[e],a=0;a<r.length;a++)e=e[r[a]];e(o).execute(function(e){e.error?i.reject(e):i.resolve(e)})}function c(n,o,t,r){var a=e.defer();return l.indexOf(n)>-1?u(n,o,t,a):i(n,o,t,r,a),a.promise}var l=[],g=[];return{executeCallbacks:function(){a()},load:function(e,n,o){r(e,n,o)},execute:function(e,n,o){return 3==arguments.length?c(e,n,o,!1):2==arguments.length?c(e,n,null,!1):void 0},executeAuth:function(e,n,o){return 3==arguments.length?c(e,n,o,!0):2==arguments.length?c(e,n,null,!0):void 0}}}]);
\ No newline at end of file
+angular.module("angular-google-gapi",["ngCookies"]),angular.module("angular-google-gapi").factory("GClient",["$document","$q","$window",function($document,$q,$window){function loadScript(src){var deferred=$q.defer();$window._gapiOnLoad=function(){deferred.resolve()};var script=$document[0].createElement("script");return script.onerror=function(e){$timeout(function(){deferred.reject(e)})},script.src=src,$document[0].body.appendChild(script),deferred.promise}var LOAD_GAE_API=!1,LOADING_GAE_API=!1,URL="https://apis.google.com/js/client.js?onload=_gapiOnLoad",API_KEY=null,OBSERVER_CALLBACKS=[];return{get:function(){var deferred=$q.defer();return LOAD_GAE_API?deferred.resolve():LOADING_GAE_API?OBSERVER_CALLBACKS.push(deferred):(LOADING_GAE_API=!0,loadScript(URL).then(function(){$window.gapi.client.setApiKey(API_KEY),LOAD_GAE_API=!0,LOADING_GAE_API=!1,deferred.resolve();for(var i=0;i<OBSERVER_CALLBACKS.length;i++)OBSERVER_CALLBACKS[i].resolve()})),deferred.promise},setApiKey:function(apiKey){API_KEY=apiKey,LOAD_GAE_API&&$window.gapi.client.setApiKey(API_KEY)},getApiKey:function(){return API_KEY}}}]),angular.module("angular-google-gapi").factory("GData",["$rootScope","$cookies",function($rootScope,$cookies){$rootScope.gapi={};var isLogin=!1,user=null;return{isLogin:function(value){return 0==arguments.length?isLogin:(isLogin=value,void($rootScope.gapi.login=value))},getUser:function(value){return 0==arguments.length?user:(user=value,void(null!==value?$cookies.put("userId",value.id):$cookies.remove("userId")))}}}]),angular.module("angular-google-gapi").factory("GAuth",["$rootScope","$q","GClient","GApi","GData","$interval","$cookies","$window","$location","$q",function($rootScope,$q,GClient,GApi,GData,$interval,$cookies,$window,$location,$q){function load(){var deferred=$q.defer();return 0==isLoad?GClient.get().then(function(){$window.gapi.client.load("oauth2","v2",function(){isLoad=!0,deferred.resolve()})}):deferred.resolve(),deferred.promise}function signin(mode,authorizeCallback){load().then(function(){var config={client_id:CLIENT_ID,scope:SCOPE,immediate:!1,authuser:-1,response_type:RESPONSE_TYPE};mode?(config.user_id=$cookies.get("userId"),config.immediate=!0):config.immediate=!1,void 0!=DOMAIN&&(config.hd=DOMAIN),$window.gapi.auth.authorize(config,authorizeCallback)})}function offline(){function getCode(event){if("https://accounts.google.com"===event.origin){var data=JSON.parse(event.data);$window.removeEventListener("message",getCode),data=gup(data.a[0],"code"),void 0==data?deferred.reject():deferred.resolve(data)}}function gup(url,name){name=name.replace(/[[]/,"[").replace(/[]]/,"]");var regexS=name+"=([^&#]*)",regex=new RegExp(regexS),results=regex.exec(url);return null==results?void 0:results[1]}var deferred=$q.defer(),origin=$location.protocol+"//"+$location.hostname;""!=$location.port&&(origin=origin+":"+$location.port);$window.open("https://accounts.google.com/o/oauth2/auth?scope="+encodeURI(SCOPE)+"&redirect_uri=postmessage&response_type=code&client_id="+CLIENT_ID+"&access_type=offline&approval_prompt=force&origin="+origin,null,"width=800, height=600");return $window.addEventListener("message",getCode),deferred.promise}function getUser(){var deferred=$q.defer();return $window.gapi.client.oauth2.userinfo.get().execute(function(resp){if(resp.code)deferred.reject();else{GData.isLogin(!0),GApi.executeCallbacks();var user={};user.email=resp.email,user.picture=resp.picture,user.id=resp.id,resp.name&&0!==resp.name.length?user.name=resp.name:user.name=resp.email,user.link=resp.link,GData.getUser(user),deferred.resolve(user)}}),deferred.promise}var CLIENT_ID,isLoad=!1,DOMAIN=void 0,SCOPE="https://www.googleapis.com/auth/userinfo.email",RESPONSE_TYPE="token id_token";return{setClient:function(client){CLIENT_ID=client},setDomain:function(domain){DOMAIN=domain},setScope:function(scope){SCOPE=scope},checkAuth:function(){var deferred=$q.defer();return signin(!0,function(){getUser().then(function(user){deferred.resolve(user)},function(){deferred.reject()})}),deferred.promise},login:function(){var deferred=$q.defer();return signin(!1,function(){getUser().then(function(user){deferred.resolve()},function(){deferred.reject()})}),deferred.promise},setToken:function(token){var deferred=$q.defer();return load().then(function(){$window.gapi.auth.setToken(token),getUser().then(function(){deferred.resolve()},function(){deferred.reject()})}),deferred.promise},getToken:function(){var deferred=$q.defer();return load().then(function(){deferred.resolve($window.gapi.auth.getToken())}),deferred.promise},logout:function(){var deferred=$q.defer();return load().then(function(){$window.gapi.auth.setToken(null),GData.isLogin(!1),GData.getUser(null),deferred.resolve()}),deferred.promise},offline:function(){var deferred=$q.defer();return offline().then(function(code){deferred.resolve(code)},function(){deferred.reject()}),deferred.promise}}}]),angular.module("angular-google-gapi").factory("GApi",["$q","GClient","GData","$window",function($q,GClient,GData,$window){function registerObserverCallback(api,method,params,auth,deferred){var observerCallback={};observerCallback.api=api,observerCallback.apiLoad=!1,observerCallback.method=method,observerCallback.params=params,observerCallback.auth=auth,observerCallback.deferred=deferred,observerCallbacks.push(observerCallback)}function load(api,version,url){GClient.get().then(function(){$window.gapi.client.load(api,version,function(){console.log(api+" "+version+" api loaded"),apisLoad.push(api),executeCallbacks(api)},url)})}function executeCallbacks(api){for(var apiName=api,i=0;i<observerCallbacks.length;i++){var observerCallback=observerCallbacks[i];observerCallback.api!=apiName&&!observerCallback.apiLoad||0!=observerCallback.auth&&1!=GData.isLogin()?observerCallback.api==apiName&&(observerCallbacks[i].apiLoad=!0):(runGapi(observerCallback.api,observerCallback.method,observerCallback.params,observerCallback.deferred),i>-1&&observerCallbacks.splice(i--,1))}}function createRequest(api,method,params){for(var pathMethod=method.split("."),api=$window.gapi.client[api],i=0;i<pathMethod.length;i++)api=api[pathMethod[i]];return api(params)}function runGapi(api,method,params,deferred){createRequest(api,method,params).execute(function(response){response.error?deferred.reject(response):deferred.resolve(response)})}function execute(api,method,params,auth){var deferred=$q.defer();return apisLoad.indexOf(api)>-1?runGapi(api,method,params,deferred):registerObserverCallback(api,method,params,auth,deferred),deferred.promise}var apisLoad=[],observerCallbacks=[];return{executeCallbacks:function(){executeCallbacks()},load:load,createRequest:createRequest,execute:function(api,method,params){return 3==arguments.length?execute(api,method,params,!1):2==arguments.length?execute(api,method,null,!1):void 0},executeAuth:function(api,method,params){return 3==arguments.length?execute(api,method,params,!0):2==arguments.length?execute(api,method,null,!0):void 0}}}]);