google_drive-persistent_session 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83178b5a54bc6968c24af6877303713a6938b254
-  data.tar.gz: 9ef742360e4f9f64c61ec9f104459df5808051ad
+SHA256:
+  metadata.gz: 0b5bdef8e2f0bd44da8d68b3a5ce2532ca972c8c3ddee6acbb328323b2dfd7c2
+  data.tar.gz: 7f4df6909ee4be4cf3fb68307d89ab34488b67f6918e89ced9aa3a99a040491e
 SHA512:
-  metadata.gz: ba764cee625d7d7f27a298ba6d4de614c3b234ad770f97dadfdbb55fb79d64326858e83ac657f4ad1a2f4665786dee0e03ff5648d00e9db13f002f067e95a95c
-  data.tar.gz: 78650a9ee022c7df9629ba1f6993d5245cce387e697f2e82ee2dcdf96905352b82aae9c1eecf9080c57359349a79065dcd54b81d03f36626787aad8c128afe38
+  metadata.gz: 03bb11202767d968a0aff3fdef3aa6bda9568e2cdd193c9279f59e77e0e64b1f4cd67cfc11e95b2843a323f4226708efef2f0d829897f61ca2d1039cfe459ccf
+  data.tar.gz: 7433eedb639ccd7803a105570b918b59ad408b4a2f0f8fc1296ebbee9c21aecce63466ec2885231a247c0031111a22570b33f50ddf7a9d59d77ae425e7601481

data/google_drive-persistent_session.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'google_drive-persistent_session'
   spec.version       = GoogleDrive::PersistentSession::VERSION
   spec.authors       = ['Genki Sugawara']
-  spec.email         = ['sgwr_dts@yahoo.co.jp']
+  spec.email         = ['sugawara@winebarrel.jp']
   spec.summary       = %q{Persist credential for google-drive-ruby.}
   spec.description   = %q{Persist credential for google-drive-ruby.}
   spec.homepage      = 'https://github.com/winebarrel/google_drive-persistent_session'
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'google-api-client', '~> 0.8.0'
-  spec.add_dependency 'google_drive', '~> 1.0'
+  spec.add_dependency 'google_drive', '>= 3.0.7'
   spec.add_dependency 'highline'
+  spec.add_dependency 'webrick'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 end

data/lib/google_drive/persistent_session/credential_storage.rb

@@ -1,3 +1,5 @@
+require 'google/api_client/auth/storage'
+
 module GoogleDrive::CredentialStorage
   DEFAULE_FILE_STORE_PATH = '~/.google_drive-oauth2.json'
 

data/lib/google_drive/persistent_session/file_store_ext.rb

@@ -1,3 +1,5 @@
+require 'google/api_client/auth/storages/file_store'
+
 class Google::APIClient::FileStore
   alias write_credentials_orig write_credentials
 

data/lib/google_drive/persistent_session/persistent_session.rb

@@ -1,3 +1,7 @@
+require 'securerandom'
+require 'uri'
+require 'webrick'
+
 class GoogleDrive::PersistentSession
   extend Forwardable
   include GoogleDrive::CredentialStorage
@@ -21,9 +25,7 @@ class GoogleDrive::PersistentSession
     store_credential unless credential_stored?
     credential = storage.authorize
 
-    if !credential.access_token
-      fetch_access_token(credential)
-    elsif credential.expired?
+    if credential.expired?
       refresh(credential)
     end
 
@@ -37,27 +39,88 @@ class GoogleDrive::PersistentSession
     client_secret = ask('Enter CLIENT SECRET: ') {|q| q.echo = false }
     puts # line break
 
-    credential = Signet::OAuth2::Client.new(
+    # Use loopback IP address redirect option
+    # https://developers.google.com/identity/protocols/oauth2/native-app#redirect-uri_loopback
+    server = WEBrick::HTTPServer.new(Port: 0, AccessLog: [])
+    queue = Thread::SizedQueue.new(1)
+    health_token = SecureRandom.uuid
+    server.mount_proc('/') do |req, resp|
+      resp.content_type = 'text/plain'
+      if req.request_method != 'GET'
+        resp.status = 405
+        res.body = 'Method Not Allowed'
+        next
+      end
+
+      case req.path
+      when '/'
+        # redirect
+        params = URI.decode_www_form(req.query_string).to_h
+        if params.key?('code')
+          code = params.fetch('code')
+          resp.status = 200
+          resp.body = 'Successfully authorized. Back to console'
+          queue.push(code)
+        else
+          resp.status = 400
+          resp.body = 'Failed to authorize: code is missing'
+          queue.push(nil)
+        end
+      when '/health'
+        resp.status = 200
+        resp.body = health_token
+      else
+        resp.status = 404
+        resp.body = 'not found'
+      end
+    end
+    server_thread = Thread.start { server.start }
+    credential =  Google::Auth::UserRefreshCredentials.new(
       :client_id => client_id,
       :client_secret => client_secret,
-      :refresh_token => ''
+      :scope => [
+        'https://www.googleapis.com/auth/drive',
+        'https://spreadsheets.google.com/feeds/'
+      ],
+      :redirect_uri => "http://127.0.0.1:#{server.config[:Port]}",
+      :grant_type => 'authorization_code'
     )
 
+    server_launched = false
+    60.times do |i|
+      begin
+        resp = Net::HTTP.get_response('127.0.0.1', '/health', server.config[:Port])
+        resp.value
+        if resp.body == health_token
+          server_launched = true
+          break
+        else
+          $stderr.puts "  Server returned unknown response: #{resp.body}"
+          sleep 1
+        end
+      rescue => e
+        $stderr.puts "  Waiting server launch: #{e.class}: #{e.message}"
+        sleep 1
+      end
+    end
+    unless server_launched
+      server.shutdown
+      server_thread.join
+      raise 'Failed to start HTTP server'
+    end
+    fetch_access_token(credential, queue, server, server_thread)
     storage.write_credentials(credential)
   end
 
-  def fetch_access_token(credential)
-    credential.scope = %w(
-      https://www.googleapis.com/auth/drive
-      https://spreadsheets.google.com/feeds/
-    ).join(' ')
-
-    credential.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
-    credential.grant_type = 'authorization_code'
-
-    message =  "1. Open this page:\n%s\n\n" % credential.authorization_uri
-    message << "2. Enter the authorization code shown in the page: "
-    credential.code = ask(message)
+  def fetch_access_token(credential, queue, server, server_thread)
+    puts "Open this page in web browser: #{credential.authorization_uri}"
+    code = queue.pop
+    server.shutdown
+    server_thread.join
+    unless code
+      raise 'authorization failed'
+    end
+    credential.code = code
 
     credential.fetch_access_token!
     storage.write_credentials(credential)

data/lib/google_drive/persistent_session/version.rb

@@ -1,5 +1,5 @@
 module GoogleDrive
   class PersistentSession
-    VERSION = '0.1.3'
+    VERSION = '0.3.0'
   end
 end

data/lib/google_drive/persistent_session.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'forwardable'
-require 'google/api_client'
 require 'google_drive'
 require 'highline'
 

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: google_drive-persistent_session
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2022-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google_drive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
-  name: google_drive
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: Persist credential for google-drive-ruby.
 email:
-- sgwr_dts@yahoo.co.jp
+- sugawara@winebarrel.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -102,7 +102,7 @@ homepage: https://github.com/winebarrel/google_drive-persistent_session
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Persist credential for google-drive-ruby.
 test_files: []