descope 1.0.6 → 1.0.7

data/spec/lib.descope/mixins/http_spec.rb

@@ -0,0 +1,218 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Descope::Mixins::HTTP do
+  before(:all) do
+    dummy_instance = DummyClass.new
+    dummy_instance.extend(Descope::Mixins::HTTP)
+    @instance = dummy_instance
+  end
+
+  describe '#parse_cookie_value' do
+    it 'extracts cookie value from Set-Cookie header' do
+      cookie_header = 'DS=jwt_token_value; Path=/; Domain=example.com; HttpOnly; Secure'
+      result = @instance.parse_cookie_value(cookie_header, 'DS')
+      expect(result).to eq('jwt_token_value')
+    end
+
+    it 'extracts cookie value with complex JWT token' do
+      jwt_token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL2FwaS5kZXNjb3BlLmNvbS9QMmFiY2RlMTIzNDUifQ.signature'
+      cookie_header = "DSR=#{jwt_token}; Path=/; Domain=dev.example.com; HttpOnly; Secure; Max-Age=2592000"
+      result = @instance.parse_cookie_value(cookie_header, 'DSR')
+      expect(result).to eq(jwt_token)
+    end
+
+    it 'returns nil when cookie name is not found' do
+      cookie_header = 'OTHER=value; Path=/; Domain=example.com'
+      result = @instance.parse_cookie_value(cookie_header, 'DS')
+      expect(result).to be_nil
+    end
+
+    it 'handles cookie value with special characters' do
+      cookie_header = 'DS=token.with-special_chars123; Path=/; Domain=example.com'
+      result = @instance.parse_cookie_value(cookie_header, 'DS')
+      expect(result).to eq('token.with-special_chars123')
+    end
+
+    it 'handles cookie header with spaces around value' do
+      cookie_header = 'DS= spaced_token ; Path=/; Domain=example.com'
+      result = @instance.parse_cookie_value(cookie_header, 'DS')
+      expect(result).to eq('spaced_token')
+    end
+  end
+
+  describe '#safe_parse_json with cookie handling' do
+    let(:mock_body) do
+      {
+        'userId' => 'test123',
+        'cookieExpiration' => 1640704758,
+        'cookieDomain' => 'dev.example.com'
+      }.to_json
+    end
+
+    context 'when RestClient cookies are available (same domain)' do
+      it 'uses RestClient cookies when available' do
+        mock_cookies = {
+          'DS' => 'session_token_from_restclient',
+          'DSR' => 'refresh_token_from_restclient'
+        }
+
+        result = @instance.safe_parse_json(mock_body, cookies: mock_cookies, headers: {})
+        
+        expect(result['cookies']).to eq(mock_cookies)
+        expect(result['cookies']['DS']).to eq('session_token_from_restclient')
+        expect(result['cookies']['DSR']).to eq('refresh_token_from_restclient')
+      end
+
+      it 'handles only refresh token in RestClient cookies' do
+        mock_cookies = { 'DSR' => 'refresh_token_only' }
+
+        result = @instance.safe_parse_json(mock_body, cookies: mock_cookies, headers: {})
+        
+        expect(result['cookies']).to eq(mock_cookies)
+        expect(result['cookies']['DSR']).to eq('refresh_token_only')
+        expect(result['cookies']['DS']).to be_nil
+      end
+    end
+
+    context 'when RestClient cookies are empty (custom domain)' do
+      let(:set_cookie_headers) do
+        [
+          'DS=session_jwt_token; Path=/; Domain=dev.example.com; HttpOnly; Secure; SameSite=None',
+          'DSR=refresh_jwt_token; Path=/; Domain=dev.example.com; HttpOnly; Secure; SameSite=None; Max-Age=2592000'
+        ]
+      end
+
+      it 'parses cookies from Set-Cookie headers when RestClient cookies are empty' do
+        mock_headers = { 'set-cookie' => set_cookie_headers }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        expect(result['cookies']).to_not be_nil
+        expect(result['cookies']['DS']).to eq('session_jwt_token')
+        expect(result['cookies']['DSR']).to eq('refresh_jwt_token')
+      end
+
+      it 'parses cookies from Set-Cookie header when headers is a string' do
+        mock_headers = { 'Set-Cookie' => set_cookie_headers.first }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        expect(result['cookies']).to_not be_nil
+        expect(result['cookies']['DS']).to eq('session_jwt_token')
+      end
+
+      it 'handles case-insensitive Set-Cookie header names' do
+        mock_headers = { 'Set-Cookie' => set_cookie_headers }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        expect(result['cookies']['DS']).to eq('session_jwt_token')
+        expect(result['cookies']['DSR']).to eq('refresh_jwt_token')
+      end
+
+      it 'handles complex JWT tokens in Set-Cookie headers' do
+        jwt_session = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL2FwaS5kZXNjb3BlLmNvbSJ9.session_sig'
+        jwt_refresh = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL2FwaS5kZXNjb3BlLmNvbSJ9.refresh_sig'
+        
+        complex_headers = [
+          "DS=#{jwt_session}; Path=/; Domain=custom.example.com; HttpOnly; Secure; SameSite=None",
+          "DSR=#{jwt_refresh}; Path=/; Domain=custom.example.com; HttpOnly; Secure; SameSite=None; Max-Age=2592000"
+        ]
+        mock_headers = { 'set-cookie' => complex_headers }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        expect(result['cookies']['DS']).to eq(jwt_session)
+        expect(result['cookies']['DSR']).to eq(jwt_refresh)
+      end
+
+      it 'ignores non-Descope cookies in Set-Cookie headers' do
+        mixed_headers = [
+          'DS=session_token; Path=/; Domain=dev.example.com; HttpOnly',
+          'CLOUDFLARE_SESSION=cf_token; Path=/; Domain=.example.com; HttpOnly',
+          'DSR=refresh_token; Path=/; Domain=dev.example.com; HttpOnly'
+        ]
+        mock_headers = { 'set-cookie' => mixed_headers }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        expect(result['cookies']['DS']).to eq('session_token')
+        expect(result['cookies']['DSR']).to eq('refresh_token')
+        expect(result['cookies']['CLOUDFLARE_SESSION']).to be_nil
+      end
+    end
+
+    context 'when no cookies are available anywhere' do
+      it 'does not add cookies key to response' do
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: {})
+        
+        expect(result).not_to have_key('cookies')
+      end
+
+      it 'handles missing Set-Cookie headers gracefully' do
+        mock_headers = { 'content-type' => 'application/json' }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        expect(result).not_to have_key('cookies')
+        expect(result['userId']).to eq('test123')
+      end
+
+      it 'handles nil headers gracefully' do
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: nil)
+        
+        expect(result).not_to have_key('cookies')
+        expect(result['userId']).to eq('test123')
+      end
+    end
+
+    context 'edge cases' do
+      it 'handles malformed Set-Cookie headers' do
+        malformed_headers = [
+          'MALFORMED_COOKIE_NO_EQUALS',
+          'DS=; Path=/; Domain=example.com',  # Empty value
+          '=value_without_name; Path=/',       # No name
+        ]
+        mock_headers = { 'set-cookie' => malformed_headers }
+
+        result = @instance.safe_parse_json(mock_body, cookies: {}, headers: mock_headers)
+        
+        # Should handle gracefully and not crash
+        expect(result['userId']).to eq('test123')
+      end
+
+      it 'prefers RestClient cookies over Set-Cookie headers when both available' do
+        mock_cookies = { 'DS' => 'restclient_token' }
+        set_cookie_headers = ['DS=header_token; Path=/; Domain=example.com']
+        mock_headers = { 'set-cookie' => set_cookie_headers }
+
+        result = @instance.safe_parse_json(mock_body, cookies: mock_cookies, headers: mock_headers)
+        
+        # Should prefer RestClient cookies
+        expect(result['cookies']['DS']).to eq('restclient_token')
+      end
+    end
+  end
+
+  describe 'integration with request method' do
+    it 'passes headers parameter to safe_parse_json' do
+      # Mock RestClient response with custom domain cookies
+      mock_response = double('response')
+      allow(mock_response).to receive(:code).and_return(200)
+      allow(mock_response).to receive(:body).and_return('{"success": true}')
+      allow(mock_response).to receive(:cookies).and_return({})
+      allow(mock_response).to receive(:headers).and_return({
+        'set-cookie' => ['DS=test_token; Domain=custom.example.com']
+      })
+
+      allow(@instance).to receive(:call).and_return(mock_response)
+
+      result = @instance.request(:get, '/test', {}, {})
+      
+      expect(result['cookies']).to_not be_nil
+      expect(result['cookies']['DS']).to eq('test_token')
+    end
+  end
+end

data/spec/support/client_config.rb

@@ -5,7 +5,6 @@ module Configuration
   module_function
 
   def config
-    raise 'DESCOPE_MANAGEMENT_KEY is not set' if ENV['DESCOPE_MANAGEMENT_KEY'].nil?
     raise 'DESCOPE_PROJECT_ID is not set' if ENV['DESCOPE_PROJECT_ID'].nil?
 
     {

data/spec/support/utils.rb

@@ -29,4 +29,10 @@ module SpecUtils
       value.each { |v| deep_stringify_keys(v) if v.is_a? Hash } if value.is_a? Array
     end
   end
+
+  def build_prefix
+    # Use GITHUB_RUN_NUMBER as the primary identifier, fall back to a timestamp if not available
+    prefix = ENV['GITHUB_RUN_NUMBER'] || ENV['GITHUB_RUN_ID']
+    prefix ? "build#{prefix}-" : "local-#{Time.now.to_i}-"
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: descope
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Descope Inc.
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -277,6 +276,7 @@ files:
 - lib/descope/api/v1/management/project.rb
 - lib/descope/api/v1/management/role.rb
 - lib/descope/api/v1/management/scim.rb
+- lib/descope/api/v1/management/sso_application.rb
 - lib/descope/api/v1/management/sso_settings.rb
 - lib/descope/api/v1/management/tenant.rb
 - lib/descope/api/v1/management/user.rb
@@ -294,11 +294,15 @@ files:
 - lib/descope_client.rb
 - release-please-config.json
 - renovate.json
+- spec/descope/api/v1/auth_spec.rb
+- spec/descope/api/v1/auth_token_extraction_spec.rb
+- spec/descope/api/v1/session_refresh_spec.rb
 - spec/factories/user.rb
 - spec/integration/lib.descope/api/v1/auth/enchantedlink_spec.rb
 - spec/integration/lib.descope/api/v1/auth/magiclink_spec.rb
 - spec/integration/lib.descope/api/v1/auth/otp_spec.rb
 - spec/integration/lib.descope/api/v1/auth/password_spec.rb
+- spec/integration/lib.descope/api/v1/auth/session_spec.rb
 - spec/integration/lib.descope/api/v1/auth/totp_spec.rb
 - spec/integration/lib.descope/api/v1/management/access_key_spec.rb
 - spec/integration/lib.descope/api/v1/management/audit_spec.rb
@@ -316,6 +320,7 @@ files:
 - spec/lib.descope/api/v1/auth/saml_spec.rb
 - spec/lib.descope/api/v1/auth/totp_spec.rb
 - spec/lib.descope/api/v1/auth_spec.rb
+- spec/lib.descope/api/v1/cookie_domain_fix_integration_spec.rb
 - spec/lib.descope/api/v1/management/access_key_spec.rb
 - spec/lib.descope/api/v1/management/audit_spec.rb
 - spec/lib.descope/api/v1/management/authz_spec.rb
@@ -325,11 +330,13 @@ files:
 - spec/lib.descope/api/v1/management/project_spec.rb
 - spec/lib.descope/api/v1/management/role_spec.rb
 - spec/lib.descope/api/v1/management/scim_spec.rb
+- spec/lib.descope/api/v1/management/sso_application_spec.rb
 - spec/lib.descope/api/v1/management/sso_settings_spec.rb
 - spec/lib.descope/api/v1/management/tenant_spec.rb
 - spec/lib.descope/api/v1/management/user_spec.rb
 - spec/lib.descope/api/v1/session_spec.rb
 - spec/lib.descope/client_spec.rb
+- spec/lib.descope/mixins/http_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_config.rb
 - spec/support/dummy_class.rb
@@ -339,10 +346,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/descope/descope-ruby-sdk/issues
-  changelog_uri: https://github.com/descope/descope-ruby-sdk/releases/tag/1.0.6
+  changelog_uri: https://github.com/descope/descope-ruby-sdk/releases/tag/1.0.7
   documentation_uri: https://docs.descope.com
-  source_code_uri: https://github.com/descope/descope-ruby-sdk/tree/1.0.6
-post_install_message: 
+  source_code_uri: https://github.com/descope/descope-ruby-sdk/tree/1.0.7
 rdoc_options: []
 require_paths:
 - lib
@@ -357,8 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.5'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Descope Ruby API Client
 test_files: []