volcano-sdk 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c502d5485b551f8308988375a3b89d581b46ef42af03143898afc583395cc0b
-  data.tar.gz: 336f60885935dd30f4ff6886505095f90bfb4d9c7c7b1f572e5511b53e824897
+  metadata.gz: 92b94c10570347e736103b57ee437cf54d72ca334a8e87f3528087655fd80e78
+  data.tar.gz: 68c2e41eac585bc12ee2086c5574431136de600236737e820224b88579ca91ca
 SHA512:
-  metadata.gz: 7849ada9eaa8cf569961c5a4b750c33610ff46ff0914321a753e09ff2b3b5f969b9879c11db7014199f2e31ba61052b45fa67ef61603b4fa7e427f9857628f84
-  data.tar.gz: 782fbaf15537f564c4349cea3f206c63857b95f8e1b919203784f0e4963a0e31a0ce9739ac10011336847e84e9137b69232379acd96d9ee9e1d8218b14e5c1a1
+  metadata.gz: 76a68bc5ba09715be91401c60e8b7183f75450907e51d9b9fc1a0437d262538de69c8b22ab78f184ff0b3cb57f267a8bf45efd8f29c8669b2c82a0a655a95806
+  data.tar.gz: 1b055512555848049b55205e62fb9b60b126f333469d3c9eef8d09712201136c03dc70e93fe2cb2f67b388f6902f5dd4df8b76da7618c54ccfb9d9bb2ac3625e

data/lib/volcano/auth.rb

@@ -33,6 +33,15 @@ module Volcano
 
     private
 
+    def session_payload(status, decode: nil)
+      binding = @client.capture_session_binding
+      request = yield
+      payload = Transport.body(session_request(binding: binding, &request), status)
+      result = decode ? send(decode, payload) : payload
+      owned_session_binding(binding)
+      result
+    end
+
     def sign_in_for_generation(email:, password:, generation:)
       raise Error::SessionChangedError unless @client.capture_session.first == generation
 

data/lib/volcano/auth_email_change.rb

@@ -7,22 +7,15 @@ module Volcano
     private_constant :INVALID_EMAIL_CHANGE_RESULT
 
     def request_email_change(new_email:)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      payload = Transport.body(email_change_response(current.access_token, new_email), 200)
-      result = email_change_result(payload)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :email_change_result) do
+        request_email = new_email.dup.freeze
+        ->(token) { email_change_response(token, request_email) }
+      end
     end
 
     def cancel_email_change
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      Transport.body(cancel_email_change_response(current.access_token), 200)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
+      session_payload(200) { ->(token) { cancel_email_change_response(token) } }
+      nil
     end
 
     def confirm_email_change(token:)

data/lib/volcano/auth_oauth.rb

@@ -7,35 +7,22 @@ module Volcano
     private_constant :OAUTH_PROVIDERS
 
     def list_linked_oauth_providers
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      body = Transport.body(list_oauth_providers_response(current.access_token), 200)
-      result = linked_oauth_providers(body)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :linked_oauth_providers) { ->(token) { list_oauth_providers_response(token) } }
     end
 
     def link_oauth_provider(provider)
-      provider_name = oauth_provider_name(provider)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      body = Transport.body(link_oauth_provider_response(current.access_token, provider_name), 200)
-      result = oauth_authorization_url(body)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :oauth_authorization_url) do
+        provider_name = oauth_provider_name(provider)
+        ->(token) { link_oauth_provider_response(token, provider_name) }
+      end
     end
 
     def unlink_oauth_provider(provider)
-      provider_name = oauth_provider_name(provider)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      Transport.body(unlink_oauth_provider_response(current.access_token, provider_name), 204)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
+      session_payload(204) do
+        provider_name = oauth_provider_name(provider)
+        ->(token) { unlink_oauth_provider_response(token, provider_name) }
+      end
+      nil
     end
 
     private
@@ -59,7 +46,7 @@ module Volcano
     end
 
     def oauth_provider_name(provider)
-      return provider if provider.is_a?(String) && OAUTH_PROVIDERS.include?(provider)
+      return provider.dup.freeze if provider.is_a?(String) && OAUTH_PROVIDERS.include?(provider)
 
       raise ArgumentError, 'Unsupported OAuth provider'
     end

data/lib/volcano/auth_oauth_api.rb

@@ -4,17 +4,12 @@ module Volcano
   # Fixed-host OAuth-provider API proxy behavior for the auth facade.
   class Auth
     def call_oauth_api(provider, endpoint:, method: 'GET', body: nil)
-      provider_name = oauth_provider_name(provider)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      response = oauth_api_response(
-        current.access_token, provider_name, endpoint: endpoint, method: method, body: body
-      )
-      result = oauth_api_data(Transport.body(response, 200))
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :oauth_api_data) do
+        provider_name = oauth_provider_name(provider)
+        request = { endpoint: endpoint.dup.freeze, method: method.dup.freeze,
+                    body: body.nil? ? nil : JSON.parse(JSON.generate(body), freeze: true) }
+        ->(token) { oauth_api_response(token, provider_name, **request) }
+      end
     end
 
     private

data/lib/volcano/auth_oauth_token.rb

@@ -4,27 +4,17 @@ module Volcano
   # Server-held OAuth-provider token metadata behavior for the auth facade.
   class Auth
     def get_oauth_provider_token(provider)
-      provider_name = oauth_provider_name(provider)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      body = Transport.body(oauth_provider_token_response(current.access_token, provider_name), 200)
-      result = oauth_provider_token_status(body)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :oauth_provider_token_status) do
+        provider_name = oauth_provider_name(provider)
+        ->(token) { oauth_provider_token_response(token, provider_name) }
+      end
     end
 
     def refresh_oauth_provider_token(provider)
-      provider_name = oauth_provider_name(provider)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      body = Transport.body(refresh_oauth_provider_token_response(current.access_token, provider_name), 200)
-      result = oauth_provider_token_status(body)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :oauth_provider_token_status) do
+        provider_name = oauth_provider_name(provider)
+        ->(token) { refresh_oauth_provider_token_response(token, provider_name) }
+      end
     end
 
     private

data/lib/volcano/auth_sessions.rb

@@ -47,31 +47,22 @@ module Volcano
     include SessionPageMapping
 
     def list_sessions(page: 1, limit: 20)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      body = Transport.body(list_sessions_response(current.access_token, page, limit), 200)
-      result = session_page(body)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
-
-      result
+      session_payload(200, decode: :session_page) { ->(token) { list_sessions_response(token, page, limit) } }
     end
 
     def delete_all_other_sessions
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
-
-      Transport.body(delete_all_other_sessions_response(current.access_token), 204)
-      raise Error::SessionChangedError unless @client.capture_session.first == generation
+      session_payload(204) { ->(token) { delete_all_other_sessions_response(token) } }
+      nil
     end
 
     def delete_session(session_id)
-      generation, current = @client.capture_session
-      raise Error::AuthenticationError, 'No active session' unless current
+      binding = @client.capture_session_binding
+      raise Error::AuthenticationError, 'No active session' unless binding.last
 
-      deletes_current = same_session_id?(current.access_token, session_id)
-      error = delete_session_error(current.access_token, session_id)
-      current_unchanged = session_unchanged_after_deletion?(deletes_current, error, generation)
+      request_id = session_id.dup.freeze
+      deletes_current = same_session_id?(binding.last.access_token, request_id)
+      error = delete_bound_session_error(binding, request_id)
+      current_unchanged = session_unchanged_after_deletion?(deletes_current, error, binding)
       raise Error::SessionChangedError, cause: error unless current_unchanged
 
       raise error if error
@@ -111,11 +102,20 @@ module Volcano
       e
     end
 
-    def session_unchanged_after_deletion?(deletes_current, error, generation)
+    def delete_bound_session_error(binding, session_id)
+      response = session_request(binding: binding) { |token| delete_session_response(token, session_id) }
+      Transport.body(response, 204)
+      nil
+    rescue Error::VolcanoError => e
+      e
+    end
+
+    def session_unchanged_after_deletion?(deletes_current, error, binding)
       uncertain = error.nil? || error.is_a?(Error::TransportError)
-      return @client.clear_session_if_current?(generation) if deletes_current && uncertain
+      return @client.clear_session_if_current?(binding.first, lineage: binding[1]) if deletes_current && uncertain
 
-      @client.capture_session.first == generation
+      active = @client.capture_session_binding
+      (active.last && active[1] == binding[1]) || (error && rejected_refresh?(binding, active))
     end
 
     def same_session_id?(access_token, session_id)

data/lib/volcano/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Volcano
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volcano-sdk
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kong