google_drive-persistent_session 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a1a8c546ac3cd9ba880dc7068a27e955eab85b790edbbfbde8b40e1a1cd9c4d
-  data.tar.gz: 321e034033e5c35b3c7bb47e1ecdc31731fb5c5b8ed6e5a8594abe9d6da7598e
+  metadata.gz: 0b5bdef8e2f0bd44da8d68b3a5ce2532ca972c8c3ddee6acbb328323b2dfd7c2
+  data.tar.gz: 7f4df6909ee4be4cf3fb68307d89ab34488b67f6918e89ced9aa3a99a040491e
 SHA512:
-  metadata.gz: 9b7f6a6dfa29a22a5617e29093e5131e27cf85fe4b6c44f3df3458bbd194e1d05c3a23fe69b9e2f54f3dbfb5f48d22b80902fd5211f8d91ef56d8da6e6375194
-  data.tar.gz: a3c9cdcfdc3b5bb177c7c94e75e37ddad43ef9decb592c301f5ee2774205fd839874c4edfb8da37ac143956184ce5b6041322f05b64380fc3b6f371be5236ee8
+  metadata.gz: 03bb11202767d968a0aff3fdef3aa6bda9568e2cdd193c9279f59e77e0e64b1f4cd67cfc11e95b2843a323f4226708efef2f0d829897f61ca2d1039cfe459ccf
+  data.tar.gz: 7433eedb639ccd7803a105570b918b59ad408b4a2f0f8fc1296ebbee9c21aecce63466ec2885231a247c0031111a22570b33f50ddf7a9d59d77ae425e7601481

data/google_drive-persistent_session.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   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/persistent_session.rb

@@ -1,3 +1,7 @@
+require 'securerandom'
+require 'uri'
+require 'webrick'
+
 class GoogleDrive::PersistentSession
   extend Forwardable
   include GoogleDrive::CredentialStorage
@@ -35,6 +39,42 @@ class GoogleDrive::PersistentSession
     client_secret = ask('Enter CLIENT SECRET: ') {|q| q.echo = false }
     puts # line break
 
+    # 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,
@@ -42,18 +82,45 @@ class GoogleDrive::PersistentSession
         'https://www.googleapis.com/auth/drive',
         'https://spreadsheets.google.com/feeds/'
       ],
-      :redirect_uri => 'urn:ietf:wg:oauth:2.0:oob',
+      :redirect_uri => "http://127.0.0.1:#{server.config[:Port]}",
       :grant_type => 'authorization_code'
     )
 
-    fetch_access_token(credential)
+    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)
-    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.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_drive-persistent_session
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2022-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Persist credential for google-drive-ruby.