sf-gdrive 0.1.5 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e4943733d57b672e338e22561fc187b4149aeee
-  data.tar.gz: 8ba1765fb57a9cf43e13ec3ef52a007f17be5975
+SHA256:
+  metadata.gz: bea772569dca67a5b5866ac45b026b36ba311db4ed71ef32f0e9c9c9eb5bf70c
+  data.tar.gz: cf7375758c11b092499ccc115702540f5e3cdcb6b77c94c839fba3c763d5f731
 SHA512:
-  metadata.gz: 02ec85d72d0a0def81f77ed3cb09dbe775eaf5e981c740f062013d6c16a99f3f766e460d9d538a70d6da4871e6293e0ab1aa6e3dd2d21ab88e02597d5204707c
-  data.tar.gz: 1fc1129844ecb70ab34ffd3681bce7ac1ad0f3e9f30effd1ea15369c5c28d7730477682ed0fedd25a266be47d728a7f4bf91985bb55cf26839d5e09ab8aeb44c
+  metadata.gz: 1046fdcfbdeb38aed95321e534b1db655cd58b39e21d164f0448f6381c56faefd12daf93ba2eb5c6418f3c3f207f13ec25af481244f34c6a3584617e47de3588
+  data.tar.gz: 8228caf3e1213690f96c9b93370e6f5284d0d1edce830c180551664de054c50ea72bf6b67f362586f4b4331e6792e6a5b54a5fbaea648adc6a895308cb8fd35d

data/app/controllers/gdrive/drive_controller.rb

@@ -14,19 +14,22 @@ module Gdrive
       )
 
       if request["code"] == nil
+        session["redirect_url"] = params[:redirect_url]
         @auth_uri = auth_client.authorization_uri.to_s
+        redirect_to @auth_uri
       else
         auth_code = params[:code]
         auth_client.code = auth_code
         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".'
+          if secret_hash["refresh_token"] == nil
+            @error = 'You have already authorized this application. In order to re-configure, go to <a href="https://myaccount.google.com/permissions">https://myaccount.google.com/permissions</a> 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}"
+            @secret_url = CGI.escape("#{Gdrive.mount_url}/sync?key=#{secret}")
+            redirect_to "#{session["redirect_url"]}&gdrive_secret_url=#{@secret_url}"
           end
         rescue
           redirect_to(Gdrive.mount_url)
@@ -58,22 +61,17 @@ module Gdrive
       end
     end
 
-    def sync
-      client_secrets = Google::APIClient::ClientSecrets.load
-      client_params = client_secrets.to_authorization.as_json
-      secret_hash = JSON.parse(Base64.decode64(params[:key]))
-      client_params.merge!(secret_hash)
-      auth_client = Signet::OAuth2::Client.new(client_params)
-      drive = Google::Apis::DriveV3::DriveService.new
-      drive.authorization = auth_client
-
-      folder_name = "Standard Notes"
+    def find_or_create_folder(drive, folder_name, parent_folder)
       folder_mime = "application/vnd.google-apps.folder"
-
       folder_search = nil
       begin
-        folder_search = drive.list_files(q: "mimeType='#{folder_mime}' and name='#{folder_name}'")
-      rescue
+        if parent_folder
+          folder_search = drive.list_files(q: "mimeType='#{folder_mime}' and name='#{folder_name}' and parents in '#{parent_folder.id}'")
+        else
+          folder_search = drive.list_files(q: "mimeType='#{folder_mime}' and name='#{folder_name}'")
+        end
+      rescue Exception => e
+        puts "\n\n find_or_create_folder exception: #{e}\n\n"
         return
       end
 
@@ -84,33 +82,73 @@ module Gdrive
           name: folder_name,
           mime_type: folder_mime
         }
+        if parent_folder
+          folder_data[:parents] = [parent_folder.id]
+        end
         folder = drive.create_file(folder_data, fields: 'id')
       end
 
-      auth_params = params[:auth_params]
+      return folder
+    end
+
+    def sync
+      client_secrets = Google::APIClient::ClientSecrets.load
+      client_params = client_secrets.to_authorization.as_json
+      secret_hash = JSON.parse(Base64.decode64(params[:key]))
+      client_params.merge!(secret_hash)
+      auth_client = Signet::OAuth2::Client.new(client_params)
+      drive = Google::Apis::DriveV3::DriveService.new
+      drive.authorization = auth_client
+
+      parent = nil
+      folders = ["Standard Notes", "#{Time.current.year}", "#{DateTime.now.strftime("%B")}"]
+      resolved_folders = []
+      folders.each do |current_folder_name|
+        result = find_or_create_folder(drive, current_folder_name, parent)
+        resolved_folders.push(result)
+        parent = result
+      end
+
+      folder = resolved_folders.last
 
-      self.sync_decrypt_file(drive, folder)
+      self.sync_decrypt_file(drive, resolved_folders.first)
 
+      auth_params = params[:auth_params]
       items = params[:items]
       if items && items.length > 0
-        items.each do |item|
-          tmp = Tempfile.new(item[:uuid])
-          payload = { "items" => [item]}
-          payload["auth_params"] = auth_params if auth_params != nil
-          tmp.write("#{JSON.pretty_generate(payload.as_json)}")
-          tmp.rewind
-          file_name = "#{item[:content_type]}-#{item[:uuid]}.txt"
-          existing = drive.list_files(q: "name = '#{file_name}'")
-          if existing.files.length > 0
-            file = existing.files[0]
-            drive.update_file(file.id, upload_source: tmp.path)
-          else
-            file = drive.create_file({:name => file_name, :parents => [folder.id]}, upload_source: tmp.path, content_type: "text/plain")
-          end
+        tmp = Tempfile.new(SecureRandom.hex)
+        payload = { "items" => items}
+        payload["auth_params"] = auth_params if auth_params != nil
+        tmp.write("#{JSON.pretty_generate(payload.as_json)}")
+        tmp.rewind
+
+        file_name = "#{DateTime.now.strftime("%B %-d, %Y").sub(',', '')}.txt"
+        existing = drive.list_files(q: "name = '#{file_name}'")
+        if existing.files.length > 0
+          file = existing.files[0]
+          drive.update_file(file.id, upload_source: tmp.path)
+        else
+          file = drive.create_file({:name => file_name, :parents => [folder.id]}, upload_source: tmp.path, content_type: "text/plain")
         end
       end
-
+    rescue Signet::AuthorizationError => _e
+      render(
+        json: {
+          error: {
+            message: 'Could not authorize with Google Drive. Please verify your integration.'
+          }
+        },
+        status: :bad_request
+      )
+    rescue Google::Apis::Error => _e
+      render(
+        json: {
+          error: {
+            message: 'Could not sync with Google Drive. Please verify your integration.'
+          }
+        },
+        status: :bad_request
+      )
     end
-
   end
 end

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

@@ -19,7 +19,7 @@
   <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 %>
+  <strong style="color: red;">Error:</strong> <%= @error.html_safe %>
 <% else %>
   <a href="<%= @auth_uri %>">Link Google Drive</a>
 <% end %>

data/lib/gdrive/version.rb

@@ -1,3 +1,3 @@
 module Gdrive
-  VERSION = '0.1.5'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sf-gdrive
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.12
 platform: ruby
 authors:
 - "@StandardNotes"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.25.0
 description: Google Drive Extension for Standard File/Standard Notes.
 email:
 - mo@standardnotes.org
@@ -69,7 +69,7 @@ files:
 - lib/tasks/gdrive_tasks.rake
 homepage: https://standardnotes.org
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -86,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Google Drive Extension for Standard File/Standard Notes.