kinde_sdk 1.6.3 → 1.6.5

data/kinde_api/spec/spec_helper.rb

@@ -1,15 +1,14 @@
-# frozen_string_literal: true
+=begin
+#Kinde Management API
 
-# #Kinde Management API
-#
-# Provides endpoints to manage your Kinde Businesses
-#
-# The version of the OpenAPI document: 1
-# Contact: support@kinde.com
-# Generated by: https://openapi-generator.tech
-# OpenAPI Generator version: 7.0.0-SNAPSHOT
-#
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+# Provides endpoints to manage your Kinde Businesses.  ## Intro  ## How to use  1. [Set up and authorize a machine-to-machine (M2M) application](https://docs.kinde.com/developer-tools/kinde-api/connect-to-kinde-api/).  2. [Generate a test access token](https://docs.kinde.com/developer-tools/kinde-api/access-token-for-api/)  3. Test request any endpoint using the test token 
+
+The version of the OpenAPI document: 1
+Contact: support@kinde.com
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.4.0
+
+=end
 
 # load the gem
 require 'kinde_api'
@@ -56,55 +55,57 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  #   # These two settings work together to allow you to limit a spec run
-  #   # to individual examples or groups you care about by tagging them with
-  #   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  #   # get run.
-  #   config.filter_run :focus
-  #   config.run_all_when_everything_filtered = true
-  #
-  #   # Allows RSpec to persist some state between runs in order to support
-  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
-  #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  #   config.disable_monkey_patching!
-  #
-  #   # This setting enables warnings. It's recommended, but in some cases may
-  #   # be too noisy due to issues in dependencies.
-  #   config.warnings = true
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = 'doc'
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
-  #   # Run specs in random order to surface order dependencies. If you find an
-  #   # order dependency and want to debug it, you can fix the order by providing
-  #   # the seed, which is printed after each run.
-  #   #     --seed 1234
-  #   config.order = :random
-  #
-  #   # Seed global randomization in this process using the `--seed` CLI option.
-  #   # Setting this allows you to use `--seed` to deterministically reproduce
-  #   # test failures related to randomization by passing the same `--seed` value
-  #   # as the one that triggered the failure.
-  #   Kernel.srand config.seed
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
 end

data/lib/kinde_sdk/client.rb

@@ -1,26 +1,62 @@
 require_relative '../../kinde_api/lib/kinde_api'
+require_relative 'token_manager'
+require_relative 'token_store'
+require_relative 'current'
 
 module KindeSdk
+  # Constants for portal page navigation
+  module PortalPage
+    ORGANIZATION_DETAILS = 'organization_details'
+    ORGANIZATION_MEMBERS = 'organization_members'
+    ORGANIZATION_PLAN_DETAILS = 'organization_plan_details'
+    ORGANIZATION_PAYMENT_DETAILS = 'organization_payment_details'
+    ORGANIZATION_PLAN_SELECTION = 'organization_plan_selection'
+    PROFILE = 'profile'
+  end
+
   class Client
     include FeatureFlags
     include Permissions
 
-    attr_accessor :kinde_api_client, :auto_refresh_tokens, :bearer_token, :tokens_hash, :expires_at
+    attr_accessor :kinde_api_client, :auto_refresh_tokens, :token_store
 
     def initialize(sdk_api_client, tokens_hash, auto_refresh_tokens)
       @kinde_api_client = sdk_api_client
       @auto_refresh_tokens = auto_refresh_tokens
-      set_hash_related_data(tokens_hash)
+      @token_store = TokenManager.create_store(tokens_hash)
+
+      # refresh the token if it's expired and auto_refresh_tokens is enabled
+      refresh_token if auto_refresh_tokens && TokenManager.token_expired?(@token_store)
+    end
+
+    # Returns the bearer token for backwards compatibility
+    # @return [String]
+    def bearer_token
+      @token_store.bearer_token
+    end
+
+    # Returns the tokens hash for backwards compatibility
+    # @return [Hash]
+    def tokens_hash
+      @token_store.tokens
+    end
+
+    # Returns the token expiration time for backwards compatibility
+    # @return [Integer]
+    def expires_at
+      @token_store.expires_at
     end
 
     def token_expired?
-      expires_at.to_i > 0 && (expires_at <= Time.now.to_i)
+      TokenManager.token_expired?(@token_store)
     end
 
     def refresh_token
-      new_tokens_hash = KindeSdk.refresh_token(tokens_hash)
-      set_hash_related_data(new_tokens_hash)
-      @kinde_api_client = KindeSdk.api_client(tokens_hash["access_token"])
+      new_tokens_hash = TokenManager.refresh_tokens(@token_store, Current.session)
+      return nil unless new_tokens_hash
+
+      @token_store.set_tokens(new_tokens_hash)
+      @kinde_api_client = KindeSdk.api_client(@token_store.bearer_token)
       new_tokens_hash
     end
 
@@ -29,10 +65,9 @@ module KindeSdk
     # @return [Hash]
     # @example {name: "scp", value: ["openid", "offline"]}
     def get_claim(claim, token_type = :access_token)
-      # Validate the token before attempting to decode it
-      KindeSdk.validate_jwt_token(tokens_hash)
+      refresh_token if auto_refresh_tokens && token_expired?
 
-      token = tokens_hash[token_type]
+      token = @token_store.tokens[token_type.to_sym]
       return unless token
 
       value = JWT.decode(token, nil, false)[0][claim]
@@ -41,6 +76,46 @@ module KindeSdk
       { name: claim, value: value }
     end
 
+    # Generate a URL to the user profile portal
+    #
+    # @param domain [String] The domain of the Kinde instance
+    # @param return_url [String] URL to redirect to after completing the profile flow
+    # @param sub_nav [String] Sub-navigation section to display
+    # @return [Hash] A hash containing the generated URL
+    # @raise [StandardError] If the request fails or returns invalid data
+    def generate_portal_url(domain:, return_url:, sub_nav: PortalPage::PROFILE)
+      refresh_token if auto_refresh_tokens && token_expired?
+
+      unless return_url.start_with?('http')
+        raise StandardError, 'generatePortalUrl: returnUrl must be an absolute URL'
+      end
+
+      params = {
+        'return_url' => return_url,
+        'sub_nav' => sub_nav
+      }
+
+      response = Faraday.get("#{domain}/account_api/v1/portal_link", params) do |req|
+        req.headers['Authorization'] = "Bearer #{@token_store.bearer_token}"
+      end
+
+      unless response.success?
+        raise StandardError, "Failed to fetch profile URL: #{response.status} #{response.reason_phrase}"
+      end
+
+      result = JSON.parse(response.body)
+      unless result['url'].is_a?(String)
+        raise StandardError, "Invalid URL received from API"
+      end
+
+      begin
+        { url: URI.parse(result['url']) }
+      rescue URI::InvalidURIError => e
+        Rails.logger.error(e)
+        raise StandardError, "Invalid URL format received from API: #{result['url']}"
+      end
+    end
+
     ::KindeApi.constants.filter { |klass| klass.to_s.end_with?("Api") }.each do |klass|
       api_klass = Kernel.const_get("KindeApi::#{klass}")
 
@@ -51,20 +126,14 @@ module KindeSdk
 
     private
 
-    def set_hash_related_data(tokens_hash)
-      # Validate tokens before setting them
-      KindeSdk.validate_jwt_token(tokens_hash)
-      
-      @tokens_hash = tokens_hash.transform_keys(&:to_sym)
-      @bearer_token = @tokens_hash[:access_token]
-      @expires_at = @tokens_hash[:expires_at]
-    end
-
-    # going from another side: prepending each api_client's public method to check token for expiration
     def init_instance_api(api_klass)
+      
       instance = api_klass.new(kinde_api_client)
+      
+      
       main_client = self
       methods_to_prepend = instance.public_methods(false).reject { |m| m.to_s.start_with?("api_client") }
+      
       methods_to_prepend.each do |method_name|
         original = instance.method(method_name)
         instance.define_singleton_method(method_name) do |*args, &block|

data/lib/kinde_sdk/current.rb

@@ -0,0 +1,16 @@
+module KindeSdk
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :session
+    attribute :token_store
+
+    def self.set_session(session)
+      self.session = session
+      self.token_store = TokenStore.from_session(session[:kinde_token_store]) if session[:kinde_token_store]
+    end
+
+    def self.clear_session
+      self.session = nil
+      self.token_store = nil
+    end
+  end
+end 

data/lib/kinde_sdk/engine.rb

@@ -1,5 +1,11 @@
+require "kinde_sdk/version"
+require "kinde_sdk/configuration"
+require "kinde_sdk/current"
+require "kinde_sdk/middleware"
+
 module KindeSdk
   class Engine < ::Rails::Engine
     isolate_namespace KindeSdk # Optional, for mountable engines
+    config.app_middleware.use KindeSdk::Middleware
   end
 end

data/lib/kinde_sdk/middleware.rb

@@ -0,0 +1,16 @@
+module KindeSdk
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request = ActionDispatch::Request.new(env)
+      Current.set_session(request.session)
+      
+      @app.call(env)
+    ensure
+      Current.clear_session
+    end
+  end
+end 

data/lib/kinde_sdk/token_manager.rb

@@ -0,0 +1,85 @@
+module KindeSdk
+  class TokenManager
+    attr_reader :tokens, :bearer_token, :expires_at
+
+    def initialize(tokens = nil)
+      set_tokens(tokens) if tokens
+    end
+
+    def set_tokens(tokens)
+      @tokens = tokens.transform_keys(&:to_sym).freeze
+      @bearer_token = @tokens[:access_token]
+      @expires_at = @tokens[:expires_at]
+      @tokens
+    end
+
+    def token_expired?
+      return true unless @tokens.present?
+      begin
+        KindeSdk.validate_jwt_token(@tokens)
+        @expires_at.to_i > 0 && (@expires_at <= Time.now.to_i)
+      rescue Exception => e
+        Rails.logger.error("Error checking token expiration: #{e.message}")
+        true
+      end
+    end
+
+    def clear_tokens
+      @tokens = nil
+      @bearer_token = nil
+      @expires_at = nil
+    end
+
+    class << self
+      def create_store(tokens = nil)
+        TokenStore.new(tokens)
+      end
+
+      def refresh_tokens(store, session = nil)
+        return nil unless store&.tokens
+        new_tokens = safe_refresh(store.tokens)
+        return nil unless new_tokens
+        store.set_tokens(new_tokens)
+        sync_session(store, session)
+        new_tokens
+      end
+
+      def validate_tokens(store)
+        return false unless store&.tokens
+        begin
+          KindeSdk.validate_jwt_token(store.tokens)
+          true
+        rescue JWT::DecodeError, StandardError
+          false
+        end
+      end
+
+      def token_expired?(store)
+        return true unless store&.tokens
+        return true unless validate_tokens(store)
+        store.expires_at.to_i > 0 && (store.expires_at <= Time.now.to_i)
+      end
+
+      def clear_tokens(store, session = nil)
+        store.set_tokens(nil)
+        target_session = session || Current.session
+        target_session&.delete(:kinde_token_store)
+      end
+
+      private
+
+      def safe_refresh(tokens)
+        KindeSdk.refresh_token(tokens)
+      rescue StandardError => e
+        Rails.logger.error("Token refresh failed: #{e.message}")
+        nil
+      end
+
+      def sync_session(store, session)
+        return unless (session || Current.session) && store.tokens
+        target_session = session || Current.session
+        target_session[:kinde_token_store] = store.to_session
+      end
+    end
+  end
+end 

data/lib/kinde_sdk/token_store.rb

@@ -0,0 +1,29 @@
+module KindeSdk
+  class TokenStore
+    attr_reader :tokens, :bearer_token, :expires_at
+
+    def initialize(tokens = nil)
+      set_tokens(tokens) if tokens
+    end
+
+    def set_tokens(tokens)
+      @tokens = (tokens || {}).transform_keys(&:to_sym)
+      @bearer_token = @tokens[:access_token]
+      @expires_at = @tokens[:expires_at]
+      @tokens
+    end
+
+    def to_session
+      {
+        access_token: @bearer_token,
+        refresh_token: @tokens[:refresh_token],
+        expires_at: @expires_at
+      }
+    end
+
+    def self.from_session(session_data)
+      return nil unless session_data
+      new(session_data)
+    end
+  end
+end 

data/lib/kinde_sdk/version.rb

@@ -1,3 +1,3 @@
 module KindeSdk
-  VERSION = "1.6.3"
+  VERSION = "1.6.5"
 end

data/lib/kinde_sdk.rb

@@ -5,6 +5,7 @@ require "kinde_sdk/configuration"
 require "kinde_sdk/client/feature_flags"
 require "kinde_sdk/client/permissions"
 require "kinde_sdk/client"
+require "kinde_sdk/current"
 require 'securerandom'
 require 'oauth2'
 require 'pkce_challenge'
@@ -109,11 +110,9 @@ module KindeSdk
     #  "token_type"=>"bearer"}
     #
     # @return [KindeSdk::Client]
-    def client(tokens_hash)
-      validate_jwt_token(tokens_hash)
-      
+    def client(tokens_hash, auto_refresh_tokens = @config.auto_refresh_tokens)
       sdk_api_client = api_client(tokens_hash[:access_token] || tokens_hash["access_token"])
-      KindeSdk::Client.new(sdk_api_client, tokens_hash, @config.auto_refresh_tokens)
+      KindeSdk::Client.new(sdk_api_client, tokens_hash, auto_refresh_tokens)
     end
 
     def logout_url(logout_url: @config.logout_url, domain: @config.domain)
@@ -145,12 +144,18 @@ module KindeSdk
       audience: "#{@config.domain}/api",
       domain: @config.domain
     )
-      OAuth2::AccessToken.from_hash(@config.oauth_client(
-        client_id: client_id, 
-        client_secret: client_secret,
-        domain: domain,
-        authorize_url: "#{domain}/oauth2/auth",
-        token_url: "#{domain}/oauth2/token"), hash).expired?
+      begin
+        validate_jwt_token(hash)
+        OAuth2::AccessToken.from_hash(@config.oauth_client(
+          client_id: client_id, 
+          client_secret: client_secret,
+          domain: domain,
+          authorize_url: "#{domain}/oauth2/auth",
+          token_url: "#{domain}/oauth2/token"), hash).expired?
+      rescue JWT::DecodeError, OAuth2::Error => e
+        Rails.logger.error("Error checking token expiration: #{e.message}")
+        true
+      end
     end
 
     # @return [Hash]
@@ -172,15 +177,18 @@ module KindeSdk
     #
     # @return [KindeApi::ApiClient]
     def api_client(bearer_token)
-      config = KindeApi::Configuration.default
+      config = KindeApi::Configuration.new  # Create a new instance instead of using default
       config.configure do |c|
         c.access_token = bearer_token
-        c.host = @config.domain
+        c.host = URI.parse(@config.domain).host
+        c.scheme = url_scheme(c.scheme)
+        c.base_path = ''  # Set empty base path since we're using the root
         c.debugging = @config.debugging
         c.logger = @config.logger
-        c.scheme = url_scheme(c.scheme)
+        # Set server configuration
+        c.server_index = nil  # Force direct URL construction
+        c.server_variables = { 'subdomain' => URI.parse(@config.domain).host.split('.').first }
       end
-
       KindeApi::ApiClient.new(config)
     end
 

data/spec/examples.txt

@@ -0,0 +1,24 @@
+example_id                            | status | run_time        |
+------------------------------------- | ------ | --------------- |
+./spec/kinde_sdk_spec.rb[1:1:1]       | passed | 0.08981 seconds |
+./spec/kinde_sdk_spec.rb[1:1:2]       | passed | 0.16283 seconds |
+./spec/kinde_sdk_spec.rb[1:2:1]       | passed | 0.04053 seconds |
+./spec/kinde_sdk_spec.rb[1:2:2:1]     | passed | 0.00692 seconds |
+./spec/kinde_sdk_spec.rb[1:3:1]       | passed | 0.20177 seconds |
+./spec/kinde_sdk_spec.rb[1:4:1]       | passed | 0.10943 seconds |
+./spec/kinde_sdk_spec.rb[1:4:2:1]     | passed | 0.0565 seconds  |
+./spec/kinde_sdk_spec.rb[1:5:1]       | passed | 0.03191 seconds |
+./spec/kinde_sdk_spec.rb[1:5:2:1]     | passed | 0.18111 seconds |
+./spec/kinde_sdk_spec.rb[1:6:1:1]     | passed | 0.04266 seconds |
+./spec/kinde_sdk_spec.rb[1:6:1:2]     | passed | 0.1197 seconds  |
+./spec/kinde_sdk_spec.rb[1:6:1:3]     | passed | 0.08009 seconds |
+./spec/kinde_sdk_spec.rb[1:6:2:1]     | passed | 0.02948 seconds |
+./spec/kinde_sdk_spec.rb[1:6:2:2:1:1] | passed | 0.04764 seconds |
+./spec/kinde_sdk_spec.rb[1:6:2:2:2:1] | passed | 0.03494 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:1]     | passed | 0.1131 seconds  |
+./spec/kinde_sdk_spec.rb[1:6:3:2]     | passed | 0.14076 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:3]     | passed | 0.03831 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:4]     | passed | 0.05261 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:5]     | passed | 0.04123 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:6]     | passed | 0.06887 seconds |
+./spec/kinde_sdk_spec.rb[1:6:4:1:1]   | passed | 0.07917 seconds |