[rubygems/rubygems] Move Webauthn listener thread to WebauthnListener class

https://github.com/rubygems/rubygems/commit/6ec474975e

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/rubygems/gemcutter_utilities/webauthn_listener.rb b/lib/rubygems/gemcutter_utilities/webauthn_listener.rb
index 5db6604f1a..ee3fc7bcab 100644
--- a/lib/rubygems/gemcutter_utilities/webauthn_listener.rb
+++ b/lib/rubygems/gemcutter_utilities/webauthn_listener.rb
@@ -18,8 +18,10 @@ require_relative "webauthn_listener/response"
 #
 # Example usage:
 #
-#   server = TCPServer.new(0)
-#   otp = Gem::WebauthnListener.wait_for_otp_code("https://rubygems.example", server)
+#   thread = Gem::WebauthnListener.listener_thread("https://rubygems.example", server)
+#   thread.join
+#   otp = thread[:otp]
+#   error = thread[:error]
 #
 
 module Gem::GemcutterUtilities
@@ -32,7 +34,7 @@ module Gem::GemcutterUtilities
 
     def self.listener_thread(host, server)
       thread = Thread.new do
-        Thread.current[:otp] = wait_for_otp_code(host, server)
+        Thread.current[:otp] = new(host).wait_for_otp_code(server)
       rescue Gem::WebauthnVerificationError => e
         Thread.current[:error] = e
       ensure
@@ -44,11 +46,7 @@ module Gem::GemcutterUtilities
       thread
     end
 
-    def self.wait_for_otp_code(host, server)
-      new(host).fetch_otp_from_connection(server)
-    end
-
-    def fetch_otp_from_connection(server)
+    def wait_for_otp_code(server)
       loop do
         socket = server.accept
         request_line = socket.gets