omniauth-atproto 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e79046605d1235915ec27cb5f200e0744f1a645c630efcf5792b7ee3563d86f8
-  data.tar.gz: b36566fae3041251882c97e10c9d110fc5893edcf2da9e1f779d1c9aee525d42
+  metadata.gz: 2dacca65da2377668999f5815835a51e76d4d04e5e0cdcf6a00098a52595fef1
+  data.tar.gz: a8118eaa5ddc0783e1ffdef5dc247249dff770448b815f4d41f22084ebf00159
 SHA512:
-  metadata.gz: a2bffaa5781a042deb22166582c8d3d0301abee04eccd1c01ccfee320a5cd3af590a0e1a41e97e94a4e1e70b16bb3421ec5b7102334caf83f9421df76111a1e0
-  data.tar.gz: babee933a42f7d584dd7899aab66434d9b5c4438dc524ded0f4030b401bc1205a00d01547000787ede9835410fdaa52118b10ff6379f396e644080dd371da1e1
+  metadata.gz: 0b9bdf0247dc29d947be68633642a9da43ef6332b39e126c05766dea3dc694e087bf9c95aa935d3a7681335138fbb6393a6a5da0316955fefad2267d0f265c23
+  data.tar.gz: c8687b847a82eee5a57023940184033dc01294bfcc5b4cc0b9da05737b8c2120fafe5ecca5503f4ab63f66d6a1630db5f324a3a98b4d14b5dcf8b2b8da1b6b64

data/lib/omniauth/strategies/atproto.rb

@@ -19,47 +19,39 @@ module OmniAuth
         }
       end
 
-      def request_phase
-        unless has_default_client_options?
-          @handle = request.params['handle']
-
-          unless @handle
-            fail!(:missing_handle,
-                  OmniAuth::Error.new(
-                    'Handle parameter is required if no client options are set'
-                  ))
-          end
+      def self.setup
+        lambda do |env|
+          session = env["rack.session"]
 
-          set_client_options
-        end
-        super
-      end
+          if env["rack.request.form_hash"] && handle = env["rack.request.form_hash"]["handle"]
+            resolver = DIDKit::Resolver.new
+            did = resolver.resolve_handle(handle)
 
-      private
+            unless did
+              env['omniauth.strategy'].fail!(:unknown_handle,
+                OmniAuth::Error.new(
+                  'Handle parameter did not resolve to a did'
+                ))
+            end
 
-      def has_default_client_options?
-        %i[site authorize_url token_url].all? { |k| options.client_options.key? k }
+            endpoint = resolver.resolve_did(did).pds_endpoint
+            auth_server = get_authorization_server(endpoint)
+            session["authorization_info"] = authorization_info = get_authorization_data(auth_server)
+          end
+          
+          if authorization_info ||= session.delete("authorization_info")
+            env['omniauth.strategy'].options["client_options"]["site"] = authorization_info["issuer"]
+            env['omniauth.strategy'].options["client_options"]["authorize_url"] = authorization_info['authorization_endpoint']
+            env['omniauth.strategy'].options["client_options"]["token_url"] = authorization_info['token_endpoint']
+          end
+        end
       end
 
-      def set_client_options
-        options.client_options[:site] = authorization_info['issuer']
-        options.client_options[:authorize_url] = authorization_info['authorization_endpoint']
-        options.client_options[:token_url] = authorization_info['token_endpoint']
-      end
+      option :setup, setup
 
-      def authorization_info
-        session['omniauth.auth_info'] ||= begin
-          resolver = DIDKit::Resolver.new
-          did = resolver.resolve_handle(@handle)
-          endpoint = resolver.resolve_did(did).pds_endpoint
-          auth_server = get_authorization_server(endpoint)
-          auth_info = get_authorization_data(auth_server)
-        end
-      end
+      private
 
       def build_access_token
-        set_client_options unless has_default_client_options?
-
         new_token_params = token_params.merge(
           {
             grant_type: 'authorization_code',
@@ -67,7 +59,7 @@ module OmniAuth
             code: request.params['code'],
             client_id: options.client_id,
             client_assertion_type: 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer',
-            client_assertion: generate_client_assertion
+            client_assertion: generate_client_assertion,
           }
         )
         dpop_handler = AtProto::DpopHandler.new(options.private_key)
@@ -115,7 +107,7 @@ module OmniAuth
         )
       end
 
-      def get_authorization_server(pds_endpoint)
+      def self.get_authorization_server(pds_endpoint)
         response = Faraday.get("#{pds_endpoint}/.well-known/oauth-protected-resource")
 
         unless response.success?
@@ -135,7 +127,7 @@ module OmniAuth
         auth_server
       end
 
-      def get_authorization_data(issuer)
+      def self.get_authorization_data(issuer)
         response = Faraday.get("#{issuer}/.well-known/oauth-authorization-server")
 
         unless response.success?

data/lib/omniauth-atproto/key_manager.rb

@@ -48,11 +48,11 @@ module OmniAuth
         def rotate_keys
           # Backup current keys if they exist
           if File.exist?(KEY_PATH)
-            # File.write(KEY_PATH, 'config/old_atproto_private_key.pem')
+            File.write(KEY_PATH, 'config/old_atproto_private_key.pem')
             FileUtils.rm(KEY_PATH)
           end
           if File.exist?(JWK_PATH)
-            # File.write(JWK_PATH, 'config/old_atproto_jwk.json')
+            File.write(JWK_PATH, 'config/old_atproto_jwk.json')
             FileUtils.rm(JWK_PATH)
           end
           load_or_generate_keys

data/lib/omniauth-atproto/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Atproto
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-atproto
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - frabr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atproto_client