kinde_sdk 1.6.4 → 1.6.6

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

@@ -4,6 +4,16 @@ 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
@@ -66,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}")
 
@@ -74,12 +124,42 @@ module KindeSdk
       end
     end
 
+    # Custom oauth method that provides backward compatibility
+    def oauth
+      oauth_api = init_instance_api(KindeApi::OAuthApi)
+      
+      # Add backward compatibility for get_user method
+      unless oauth_api.respond_to?(:get_user)
+        oauth_api.define_singleton_method(:get_user) do |opts = {}|
+          # Call the new method
+          user_profile_v2 = get_user_profile_v2(opts)
+          
+          # Convert UserProfileV2 to UserProfile format as a hash
+          # This provides backward compatibility without depending on the UserProfile class
+          {
+            id: user_profile_v2.id || user_profile_v2.sub,
+            preferred_email: user_profile_v2.email,
+            provided_id: user_profile_v2.provided_id,
+            last_name: user_profile_v2.family_name,
+            first_name: user_profile_v2.given_name,
+            picture: user_profile_v2.picture
+          }
+        end
+      end
+      
+      oauth_api
+    end
+
     private
 
     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/version.rb

@@ -1,3 +1,3 @@
 module KindeSdk
-  VERSION = "1.6.4"
+  VERSION = "1.6.6"
 end

data/lib/kinde_sdk.rb

@@ -177,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

@@ -1,24 +1,29 @@
 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 |
+./spec/kinde_sdk_spec.rb[1:1:1]       | passed | 0.04758 seconds |
+./spec/kinde_sdk_spec.rb[1:1:2]       | passed | 0.03488 seconds |
+./spec/kinde_sdk_spec.rb[1:2:1]       | passed | 0.0979 seconds  |
+./spec/kinde_sdk_spec.rb[1:2:2:1]     | passed | 0.08776 seconds |
+./spec/kinde_sdk_spec.rb[1:3:1]       | passed | 0.05409 seconds |
+./spec/kinde_sdk_spec.rb[1:4:1]       | passed | 0.05912 seconds |
+./spec/kinde_sdk_spec.rb[1:4:2:1]     | passed | 0.07198 seconds |
+./spec/kinde_sdk_spec.rb[1:5:1]       | passed | 0.05599 seconds |
+./spec/kinde_sdk_spec.rb[1:5:2:1]     | passed | 0.04142 seconds |
+./spec/kinde_sdk_spec.rb[1:6:1:1]     | passed | 0.03109 seconds |
+./spec/kinde_sdk_spec.rb[1:6:1:2]     | passed | 0.04813 seconds |
+./spec/kinde_sdk_spec.rb[1:6:1:3]     | passed | 0.05677 seconds |
+./spec/kinde_sdk_spec.rb[1:6:2:1]     | passed | 0.15193 seconds |
+./spec/kinde_sdk_spec.rb[1:6:2:2:1:1] | passed | 0.01475 seconds |
+./spec/kinde_sdk_spec.rb[1:6:2:2:2:1] | passed | 0.04081 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:1]     | passed | 0.03504 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:2]     | passed | 0.02938 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:3]     | passed | 0.09472 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:4]     | passed | 0.09361 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:5]     | passed | 0.11623 seconds |
+./spec/kinde_sdk_spec.rb[1:6:3:6]     | passed | 0.04303 seconds |
+./spec/kinde_sdk_spec.rb[1:6:4:1:1]   | passed | 0.09948 seconds |
+./spec/kinde_sdk_spec.rb[1:7]         | passed | 0.05798 seconds |
+./spec/kinde_sdk_spec.rb[1:8:1]       | passed | 0.11195 seconds |
+./spec/kinde_sdk_spec.rb[1:8:2]       | passed | 0.05606 seconds |
+./spec/kinde_sdk_spec.rb[1:8:3]       | passed | 0.0705 seconds  |
+./spec/kinde_sdk_spec.rb[1:8:4]       | passed | 0.08605 seconds |

data/spec/kinde_sdk_spec.rb

@@ -351,6 +351,100 @@ RSpec.describe KindeSdk do
       end
     end
   end
+
+  it "has a version number" do
+    expect(KindeSdk::VERSION).not_to be nil
+  end
+
+  describe 'backward compatibility' do
+    let(:mock_user_profile_v2) do
+      double('UserProfileV2',
+        id: 'test_id',
+        sub: 'test_sub',
+        email: 'test@example.com',
+        provided_id: 'external_id',
+        family_name: 'Doe',
+        given_name: 'John',
+        picture: 'https://example.com/picture.jpg'
+      )
+    end
+
+    # Use a real Ruby class for the OAuthApi mock to allow dynamic method addition
+    let(:mock_oauth_api_class) do
+      Class.new do
+        attr_accessor :user_profile_v2
+        def initialize(user_profile_v2)
+          @user_profile_v2 = user_profile_v2
+        end
+        def get_user_profile_v2(*)
+          @user_profile_v2
+        end
+        def token_introspection(*); end
+        def token_revocation(*); end
+      end
+    end
+
+    let(:mock_oauth_api) { mock_oauth_api_class.new(mock_user_profile_v2) }
+    let(:mock_kinde_api_client) { double('KindeApiClient') }
+    let(:tokens_hash) { { access_token: 'test_token' } }
+
+    before do
+      allow(KindeApi::OAuthApi).to receive(:new) { mock_oauth_api_class.new(mock_user_profile_v2) }
+    end
+
+    it 'supports both get_user and get_user_profile_v2 methods' do
+      client = KindeSdk::Client.new(mock_kinde_api_client, tokens_hash, false)
+      user_profile = client.oauth.get_user
+      expect(user_profile).to be_a(Hash)
+      expect(user_profile[:id]).to eq('test_id')
+      expect(user_profile[:preferred_email]).to eq('test@example.com')
+      expect(user_profile[:first_name]).to eq('John')
+      expect(user_profile[:last_name]).to eq('Doe')
+      expect(user_profile[:picture]).to eq('https://example.com/picture.jpg')
+
+      user_profile_v2 = client.oauth.get_user_profile_v2
+      expect(user_profile_v2.id).to eq('test_id')
+      expect(user_profile_v2.email).to eq('test@example.com')
+      expect(user_profile_v2.given_name).to eq('John')
+      expect(user_profile_v2.family_name).to eq('Doe')
+      expect(user_profile_v2.picture).to eq('https://example.com/picture.jpg')
+    end
+
+    it 'handles missing id field by using sub field' do
+      mock_user_profile_v2_no_id = double('UserProfileV2',
+        id: nil,
+        sub: 'test_sub',
+        email: 'test@example.com',
+        provided_id: 'external_id',
+        family_name: 'Doe',
+        given_name: 'John',
+        picture: 'https://example.com/picture.jpg'
+      )
+      allow(KindeApi::OAuthApi).to receive(:new).and_return(
+        mock_oauth_api_class.new(mock_user_profile_v2_no_id)
+      )
+      client = KindeSdk::Client.new(mock_kinde_api_client, tokens_hash, false)
+      user_profile = client.oauth.get_user
+      expect(user_profile[:id]).to eq('test_sub')
+    end
+
+    it 'only adds get_user method once per oauth instance' do
+      client = KindeSdk::Client.new(mock_kinde_api_client, tokens_hash, false)
+      oauth1 = client.oauth
+      oauth2 = client.oauth
+      expect(oauth1.respond_to?(:get_user)).to be true
+      expect(oauth2.respond_to?(:get_user)).to be true
+    end
+
+    it 'preserves all original oauth methods' do
+      client = KindeSdk::Client.new(mock_kinde_api_client, tokens_hash, false)
+      oauth = client.oauth
+      expect(oauth.respond_to?(:get_user_profile_v2)).to be true
+      expect(oauth.respond_to?(:token_introspection)).to be true
+      expect(oauth.respond_to?(:token_revocation)).to be true
+      expect(oauth.respond_to?(:get_user)).to be true
+    end
+  end
 end