sf-gdrive 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af454780cbf5115041e33273ff51e72b5c84e6b
-  data.tar.gz: d1d98e944b9bbcafb87dd13ab937007af106a8d0
+  metadata.gz: c1621f24a75c22f6bab7ad05adb924df7fb64904
+  data.tar.gz: b96f1a3b2918b368e7ee33a09c9195df09c1bb00
 SHA512:
-  metadata.gz: cedf5f283aaea3c77b82decd7141f5cc18def7be76a8ba46a55fcc2ef0ad9fab9bba1ea424775d39dc512da9171fad2df4e9fd08bf84adf2dd4ecf5ac9987b06
-  data.tar.gz: 0b678b751dc78bfee914c89f8f224f8b1c7718a8cf5af6f8359feafaf00e2e620b1389ad6d479ffb75643bbaaf7bea0bc0ab27f9c42c4c6941aec968349d457b
+  metadata.gz: e0bf3abe215b0a6cc22ecef889a0913a7db5e1a36dc5fdb8df810482febf05bcecbe4a8c088c46e617d82827c094f6be5d471e4fc603a7dd20951f5c3cc93c40
+  data.tar.gz: 00c28b4714c9e186a7d1995ac4e2eac2035b7e3ac349226b9e573ec305947ea0df460311fc48d89c3909064220651481f196804e9be999a56f80fddc85377558

data/app/controllers/gdrive/drive_controller.rb

@@ -18,11 +18,19 @@ module Gdrive
       else
         auth_code = params[:code]
         auth_client.code = auth_code
-        auth_client.fetch_access_token!
-        secret_hash = auth_client.as_json.slice("expiry", "refresh_token", "access_token")
-        secret_hash[:expires_at] = auth_client.expires_at
-        secret = Base64.encode64(secret_hash.to_json)
-        @secret_url = "#{Gdrive.mount_url}/sync?key=#{secret}"
+        begin
+          auth_client.fetch_access_token!
+          secret_hash = auth_client.as_json.slice("expiry", "refresh_token", "access_token")
+          if secret_hash[:refresh_token] == nil
+            @error = 'You have already authorized this application. In order to re-configure, go to https://myaccount.google.com/permissions and revoke access to "Standard File".'
+          else
+            secret_hash[:expires_at] = auth_client.expires_at
+            secret = Base64.encode64(secret_hash.to_json)
+            @secret_url = "#{Gdrive.mount_url}/sync?key=#{secret}"
+          end
+        rescue
+          redirect_to(Gdrive.mount_url)
+        end
       end
     end
 

data/app/views/gdrive/drive/index.html.erb

@@ -18,6 +18,8 @@
 
   <p>That's it! Now, whenever you make changes to a note or tag, it will automatically be synced to your Drive.<p>
 
+<% elsif @error %>
+  <strong style="color: red;">Error:</strong> <%= @error %>
 <% else %>
   <a href="<%= @auth_uri %>">Link Google Drive</a>
 <% end %>

data/lib/gdrive/version.rb

@@ -1,3 +1,3 @@
 module Gdrive
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sf-gdrive
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - "@StandardNotes"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails