aws-google 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a99a98afdd145f3e2077599e0a90c743f215c8ee7e32c3d74fc50d0f670e881
-  data.tar.gz: 451a434fde3537db95a1c58d8989afc9a0a00491c90f90b3d2203f5cc3cf0bdc
+  metadata.gz: 18ff05fe6afc1416f8dc34990d987385b8c97122ceafa10c90673a1cd2a047c6
+  data.tar.gz: 8ab7a59cab3adda81249173d6805f1ed64a1ddda1c4260ca149780ad930e4ab9
 SHA512:
-  metadata.gz: ed65637fb6d1ce3c527ae90aae5a46a1e1358a7afe411e71eee9dc76d05b34ab3d75a0b2cbe7a7811890a872e1d268e5b23b849e66956091405f43f2c425a9f9
-  data.tar.gz: 4bc5596979411c3d27fea983d592bb7c947aa2375a6e072b433cbbfe24d537ce042a688d4f118b87fd1438c4aa0d3fce039148c8cc79af680b615772a8204a6b
+  metadata.gz: 8bb4a7f371d72fc5028433d7481a154b59426d01a895ba75ff82a7c308b8f4041e913a9e2d74bb54108e1e0e6af0d342b6e967bcf942a768d142e02fe266874f
+  data.tar.gz: 817bb378d79596567c086f2a8d29c810da0de47e18af5e1954141a791f7a2f543d7315a190b30e0ac5f406c4de6018d3eab548b1dbcc958251b134c930873b7f

data/lib/aws/google/version.rb

@@ -1,5 +1,5 @@
 module Aws
   class Google
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.2.3'.freeze
   end
 end

data/lib/aws/google.rb

@@ -108,24 +108,28 @@ module Aws
     end
 
     def get_oauth_code(client, options)
-      raise 'fallback' unless @port && !@port.zero?
+      raise ArgumentError.new('Missing port for local oauth server') unless @port && !@port.zero?
 
       require 'launchy'
       require 'webrick'
+
       code = nil
       server = WEBrick::HTTPServer.new(
         Port: @port,
         Logger: WEBrick::Log.new(STDOUT, 0),
         AccessLog: []
       )
+
       server.mount_proc '/' do |req, res|
         code = req.query['code']
         res.status = 202
         res.body = 'Login successful, you may close this browser window.'
-        server.stop
+        server.shutdown
       end
+
       trap('INT') { server.shutdown }
       client.redirect_uri = "http://localhost:#{@port}"
+
       silence_output do
         launchy = Launchy.open(client.authorization_uri(options).to_s)
         server_thread = Thread.new do
@@ -134,21 +138,13 @@ module Aws
           ensure server.shutdown
           end
         end
-        while server_thread.alive?
-          raise 'fallback' if !launchy.alive? && !launchy.value.success?
-
-          sleep 0.1
-        end
+        
+        server_thread.join
       end
-      code || raise('fallback')
-    rescue StandardError
-      trap('INT', 'DEFAULT')
-      # Fallback to out-of-band authentication if browser launch failed.
-      client.redirect_uri = 'oob'
-      return ENV['OAUTH_CODE'] if ENV['OAUTH_CODE']
 
-      raise RuntimeError, 'Open the following URL in a browser to get a code,' \
-             "export to $OAUTH_CODE and rerun:\n#{client.authorization_uri(options)}", []
+      code || raise('Local Google Oauth failed to get code')
+    ensure
+      trap('INT', 'DEFAULT')
     end
 
     def refresh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-google
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Will Jordan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core