google_sign_in 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c821832dbcdff6dabee85bee7555ed38ea75f7
-  data.tar.gz: 71d2aa594d621e5077d88b373f2dee0ec7289ac6
+  metadata.gz: 0b1d9fd3259a66f7304ba5130515d1cfda99211a
+  data.tar.gz: 3d0d4a66f812fe29aa70981e6331d9d1c0fbcebe
 SHA512:
-  metadata.gz: 8886bd5132c3e69289b752a7f17bd361bd8a9e9db01e6a850d605d24b4c944d3b9d27ce3be477603435a3143bf828a10802e36b1ae0f1c3b1c47ba3b0fb07758
-  data.tar.gz: 1ac5a753f98bb8788a391d963dac2a1e0922655bf595ec244b51319b5471e46cf7ec66725514b44a8f4c03ccfe1a914cb32a0e92e3dcb6c852839624a4545574
+  metadata.gz: 3911369b014ca6aeb902f89fd14406a99e053d2184560cd0392af98df174e1753e47bf01b73c92e34ffa22e443756d5e0479b295cedce8dbe41c4533658707d4
+  data.tar.gz: fca8d21ba6b78465353764be25ea8d2b5f2d8c4814813b785ec09684508be9ad11a5ac7149065d4d89da9fa693ad08b0e3cdc6d970ffa9acacde3d4dc5089bdc

data/google_sign_in.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'google_sign_in'
-  s.version  = '0.1.1'
+  s.version  = '0.1.2'
   s.authors  = 'David Heinemeier Hansson'
   s.email    = 'david@basecamp.com'
   s.summary  = 'Sign in (or up) with Google for Rails applications'

data/lib/google_sign_in/helper.rb

@@ -7,14 +7,17 @@ module GoogleSignIn
         google_sign_in_javacript_include_tag +
         google_sign_in_client_id_meta_tag
 
-      google_sign_in_javascript_tag + 
+      google_sign_in_javascript_tag +
       google_sign_in_hidden_form_tag(url: url) +
       google_sign_in_click_handler(&block)
     end
 
     private
       def google_sign_in_javacript_include_tag
-        javascript_include_tag "https://apis.google.com/js/platform.js?onload=setupGoogleSignIn", async: true, defer: true
+        javascript_include_tag "https://apis.google.com/js/api.js", async: true, defer: true,
+          onload: "this.onload=function(){};setupGoogleSignIn()",
+          onreadystatechange: "if (this.readyState === 'complete') this.onload()",
+          data: { turbolinks_track: :reload, force_turbolinks_reload: Time.now.to_i }
       end
 
       def google_sign_in_client_id_meta_tag
@@ -22,39 +25,46 @@ module GoogleSignIn
       end
 
       def google_sign_in_hidden_form_tag(url:)
-        form_with url: url, id: "google_signin", html: { style: "display: none" } do |form|
-          form.hidden_field :google_id_token, id: "google_id_token"
+        form_with url: url, html: { style: "display: none" } do |form|
+          form.hidden_field(:google_id_token, id: "google_sign_in_token") + form.submit(id: "google_sign_in_submit")
         end
       end
 
       def google_sign_in_click_handler(&block)
-        tag.div(onclick: 'selectGoogleSignInAccount(event)') { capture(&block) }
+        tag.div(id: "google_sign_in_container", style: "visibility: hidden") { capture(&block) }
       end
 
       def google_sign_in_javascript_tag
-        javascript_tag(<<-EOS
-          function setupGoogleSignIn() {
-            gapi.load("auth2", function () { gapi.auth2.init() })
-          }
-
-          function selectGoogleSignInAccount(event) {
-            event.preventDefault()
-      
-            options = new gapi.auth2.SigninOptionsBuilder
-            options.setPrompt("select_account")
-
-            gapi.auth2.getAuthInstance().signIn(options).then(function (googleUser) {
-              var token = googleUser.getAuthResponse().id_token
+        javascript_tag <<-JS.strip_heredoc
+          (function() {
+            function installAuthClient(callback) {
+              gapi.load("client:auth2", function() {
+                gapi.auth2.init().then(callback)
+              })
+            }
+
+            function installClickHandler() {
+              var element = document.getElementById("google_sign_in_container")
+              var options = new gapi.auth2.SigninOptionsBuilder()
+              options.setPrompt("select_account")
+              gapi.auth2.getAuthInstance().attachClickHandler(element, options, handleSignIn)
+              element.style.visibility = "visible"
+            }
 
-              if (token !== null) {
-                document.getElementById('google_id_token').value = token
-                document.getElementById('google_signin').submit()
+            function handleSignIn(googleUser) {
+              var token = googleUser.getAuthResponse().id_token
+              if (token) {
+                document.getElementById("google_sign_in_token").value = token
+                document.getElementById("google_sign_in_submit").click()
                 gapi.auth2.getAuthInstance().signOut()
               }
-            })
-          }
-  EOS
-        )
+            }
+
+            window.setupGoogleSignIn = function() {
+              installAuthClient(installClickHandler)
+            }
+          })()
+        JS
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_sign_in
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport