Use auth2 instead of auth

softmonkeyjapan · Dec 18, 2017 · 2f98198 · 2f98198
1 parent 8ef4b9e
commit 2f98198
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/dist/google-picker.js b/dist/google-picker.js
@@ -61,8 +61,8 @@
         /**
          * Load required modules
          */
-        function instanciate () {
-          gapi.load('auth', { 'callback': onApiAuthLoad });
+        function instantiate () {
+          gapi.load('auth2', { 'callback': onApiAuthLoad });
           gapi.load('picker');
         }
 
@@ -71,17 +71,18 @@
          * If user is already logged in, then open the Picker modal
          */
         function onApiAuthLoad () {
-          var authToken = gapi.auth.getToken();
-
-          if (authToken) {
-            handleAuthResult(authToken);
-          } else {
-            gapi.auth.authorize({
-              'client_id' : lkGoogleSettings.clientId,
-              'scope'     : lkGoogleSettings.scopes,
-              'immediate' : false
-            }, handleAuthResult);
-          }
+          gapi.auth2.init({
+            'client_id' : lkGoogleSettings.clientId,
+            'scope'     : lkGoogleSettings.scopes
+          })
+          .then(function (authInstance) {
+            return authInstance.signIn();
+          })
+          .then(function (guser) {
+            var response = guser.getAuthResponse();
+            accessToken = response.access_token;
+            openDialog();
+          });
         }
 
         /**
@@ -139,11 +140,9 @@
           });
         }
 
-        gapi.load('auth');
-        gapi.load('picker');
-
         element.bind('click', function (e) {
-          instanciate();
+	  /* dynamically load dependencies only on click */
+          instantiate();
         });
       }
     }

diff --git a/dist/google-picker.min.js b/dist/google-picker.min.js
diff --git a/example/google-picker.min.js b/example/google-picker.min.js
diff --git a/src/google-picker.js b/src/google-picker.js
@@ -62,7 +62,7 @@
          * Load required modules
          */
         function instantiate () {
-          gapi.load('auth', { 'callback': onApiAuthLoad });
+          gapi.load('auth2', { 'callback': onApiAuthLoad });
           gapi.load('picker');
         }
 
@@ -71,17 +71,18 @@
          * If user is already logged in, then open the Picker modal
          */
         function onApiAuthLoad () {
-          var authToken = gapi.auth.getToken();
-
-          if (authToken) {
-            handleAuthResult(authToken);
-          } else {
-            gapi.auth.authorize({
-              'client_id' : lkGoogleSettings.clientId,
-              'scope'     : lkGoogleSettings.scopes,
-              'immediate' : false
-            }, handleAuthResult);
-          }
+          gapi.auth2.init({
+            'client_id' : lkGoogleSettings.clientId,
+            'scope'     : lkGoogleSettings.scopes
+          })
+          .then(function (authInstance) {
+            return authInstance.signIn();
+          })
+          .then(function (guser) {
+            var response = guser.getAuthResponse();
+            accessToken = response.access_token;
+            openDialog();
+          });
         }
 
         /**