workos 9.0.0 → 9.1.0

data/test/workos/test_api_keys.rb

@@ -39,12 +39,20 @@ class ApiKeysTest < Minitest::Test
     assert_nil result
   end
 
+  def test_create_api_key_expire_returns_expected_result
+    stub_request(:post, %r{\Ahttps://api\.workos\.com/api_keys/stub/expire(\?|\z)})
+      .to_return(body: "{}", status: 200)
+    result = @client.api_keys.create_api_key_expire(id: "stub")
+    refute_nil result
+  end
+
   # Parameterized authentication error tests (one per endpoint).
   [
     {name: :list_organization_api_keys, verb: :get, url: %r{\Ahttps://api\.workos\.com/organizations/stub/api_keys(\?|\z)}, args: {organization_id: "stub"}},
     {name: :create_organization_api_key, verb: :post, url: %r{\Ahttps://api\.workos\.com/organizations/stub/api_keys(\?|\z)}, args: {organization_id: "stub", name: "stub"}},
     {name: :create_validation, verb: :post, url: %r{\Ahttps://api\.workos\.com/api_keys/validations(\?|\z)}, args: {value: "stub"}},
-    {name: :delete_api_key, verb: :delete, url: %r{\Ahttps://api\.workos\.com/api_keys/stub(\?|\z)}, args: {id: "stub"}}
+    {name: :delete_api_key, verb: :delete, url: %r{\Ahttps://api\.workos\.com/api_keys/stub(\?|\z)}, args: {id: "stub"}},
+    {name: :create_api_key_expire, verb: :post, url: %r{\Ahttps://api\.workos\.com/api_keys/stub/expire(\?|\z)}, args: {id: "stub"}}
   ].each do |spec|
     define_method("test_#{spec[:name]}_raises_authentication_error_on_401") do
       stub_request(spec[:verb], spec[:url])

data/test/workos/test_base_client.rb

@@ -86,6 +86,14 @@ class BaseClientTest < Minitest::Test
     @client = WorkOS::BaseClient.new(api_key: "sk_test_123", max_retries: 1)
   end
 
+  def teardown
+    super
+    # Close any open connections and clear the thread-local cache to avoid
+    # leaking sockets between tests.
+    @client.shutdown
+    Thread.current[:workos_connections] = nil
+  end
+
   def test_request_dispatches_known_methods
     client = RecordingClient.new(api_key: "sk_test_123")
 
@@ -171,6 +179,62 @@ class BaseClientTest < Minitest::Test
     refute keep.finished
   end
 
+  # Regression test for https://github.com/workos/workos-ruby/issues/496
+  #
+  # The connection cache must be isolated per thread. A previous version
+  # keyed it on Fiber[] (inheritable fiber storage), which is inherited *by
+  # reference* by child threads — so a Net::HTTP socket warmed in a parent
+  # thread leaked into every worker thread spawned afterward (Solid Queue,
+  # Puma, etc.) and got driven concurrently, corrupting the stream.
+  def test_connection_cache_is_not_shared_with_threads_spawned_after_warming
+    # Warm a connection in the "parent" thread before spawning workers.
+    parent_cache = @client.send(:thread_connections)
+    warm = FakeConnection.new
+    parent_cache["https:api.workos.com:443:30"] = warm
+
+    results = Array.new(4) do
+      Thread.new do
+        cache = @client.send(:thread_connections)
+        {cache_id: cache.object_id, leaked: cache.value?(warm), size: cache.size}
+      end
+    end.map(&:value)
+
+    results.each do |r|
+      refute_equal parent_cache.object_id, r[:cache_id],
+        "worker thread must not share the parent thread's connection cache"
+      refute r[:leaked],
+        "parent thread's warmed connection leaked into a worker thread"
+      assert_equal 0, r[:size],
+        "worker thread should start with an empty, isolated cache"
+    end
+
+    # The parent's own cache is left intact.
+    assert_same warm, parent_cache["https:api.workos.com:443:30"]
+  end
+
+  # Exercises the connection_for path (not just the storage helper):
+  # each thread must open and cache its *own* Net::HTTP connection rather
+  # than reusing one established on another thread.
+  #
+  # Net::HTTP#start is stubbed to avoid real TCP+TLS connections.
+  def test_connection_for_opens_a_distinct_connection_per_thread
+    original_start = Net::HTTP.instance_method(:start)
+    Net::HTTP.define_method(:start) { self }
+
+    parent_conn = @client.send(:connection_for, "https://api.workos.com", 30)
+
+    worker_conns = Array.new(4) do
+      Thread.new { @client.send(:connection_for, "https://api.workos.com", 30).object_id }
+    end.map(&:value)
+
+    refute_includes worker_conns, parent_conn.object_id,
+      "a worker thread reused a connection opened on another thread"
+    assert_equal worker_conns.length, worker_conns.uniq.length,
+      "worker threads must each get a distinct connection"
+  ensure
+    Net::HTTP.define_method(:start, original_start)
+  end
+
   def test_redact_path_strips_invitation_token_segment
     redacted = @client.send(:redact_path, "/user_management/invitations/by_token/invtoken_secret123")
     assert_equal "/user_management/invitations/by_token/[REDACTED]", redacted

data/test/workos/test_model_round_trip.rb

@@ -11,6 +11,7 @@ class ModelRoundTripTest < Minitest::Test
       "email" => "stub",
       "first_name" => "stub",
       "last_name" => "stub",
+      "name" => "stub",
       "metadata" => {}
     }
     model = WorkOS::UserObject.new(fixture.to_json)
@@ -60,6 +61,16 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
+  def test_expire_api_key_round_trip
+    fixture = {
+      "expires_at" => nil
+    }
+    model = WorkOS::ExpireApiKey.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
   def test_redirect_uri_input_round_trip
     fixture = {
       "uri" => "stub",
@@ -730,6 +741,7 @@ class ModelRoundTripTest < Minitest::Test
       "email" => "stub",
       "first_name" => nil,
       "last_name" => nil,
+      "name" => nil,
       "email_verified" => nil,
       "metadata" => nil,
       "external_id" => nil,
@@ -749,6 +761,7 @@ class ModelRoundTripTest < Minitest::Test
       "email" => "stub",
       "first_name" => "stub",
       "last_name" => "stub",
+      "name" => "stub",
       "email_verified" => true,
       "metadata" => nil,
       "external_id" => nil,
@@ -822,8 +835,7 @@ class ModelRoundTripTest < Minitest::Test
 
   def test_revoke_session_round_trip
     fixture = {
-      "session_id" => "stub",
-      "return_to" => "stub"
+      "session_id" => "stub"
     }
     model = WorkOS::RevokeSession.new(fixture.to_json)
     json = model.to_h
@@ -986,14 +998,14 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_object_round_trip
+  def test_vault_object_round_trip
     fixture = {
       "id" => "stub",
       "metadata" => {},
       "name" => "stub",
       "value" => "stub"
     }
-    model = WorkOS::ObjectModel.new(fixture.to_json)
+    model = WorkOS::VaultObject.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
@@ -1540,6 +1552,7 @@ class ModelRoundTripTest < Minitest::Test
       "id" => "stub",
       "first_name" => nil,
       "last_name" => nil,
+      "name" => nil,
       "profile_picture_url" => nil,
       "email" => "stub",
       "email_verified" => true,
@@ -1965,6 +1978,7 @@ class ModelRoundTripTest < Minitest::Test
     assert_equal fixture["name"], json[:name]
     assert_equal fixture["obfuscated_value"], json[:obfuscated_value]
     assert_nil json[:last_used_at]
+    assert_nil json[:expires_at]
     assert_equal fixture["created_at"], json[:created_at]
     assert_equal fixture["updated_at"], json[:updated_at]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
@@ -2033,6 +2047,7 @@ class ModelRoundTripTest < Minitest::Test
     assert_equal fixture["name"], json[:name]
     assert_equal fixture["obfuscated_value"], json[:obfuscated_value]
     assert_nil json[:last_used_at]
+    assert_nil json[:expires_at]
     assert_equal fixture["created_at"], json[:created_at]
     assert_equal fixture["updated_at"], json[:updated_at]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
@@ -2064,6 +2079,87 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
+  def test_api_key_updated_round_trip
+    fixture = {
+      "object" => "event",
+      "id" => "stub",
+      "event" => "api_key.updated",
+      "data" => {},
+      "created_at" => "stub",
+      "context" => {}
+    }
+    model = WorkOS::ApiKeyUpdated.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    assert_equal fixture["id"], json[:id]
+    assert_equal fixture["created_at"], json[:created_at]
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
+  def test_api_key_updated_data_round_trip
+    fixture = {
+      "object" => "api_key",
+      "id" => "stub",
+      "owner" => {},
+      "name" => "stub",
+      "obfuscated_value" => "stub",
+      "last_used_at" => nil,
+      "expires_at" => nil,
+      "permissions" => [],
+      "created_at" => "stub",
+      "updated_at" => "stub",
+      "previous_attributes" => {}
+    }
+    model = WorkOS::ApiKeyUpdatedData.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    assert_equal fixture["id"], json[:id]
+    assert_equal fixture["name"], json[:name]
+    assert_equal fixture["obfuscated_value"], json[:obfuscated_value]
+    assert_nil json[:last_used_at]
+    assert_nil json[:expires_at]
+    assert_equal fixture["created_at"], json[:created_at]
+    assert_equal fixture["updated_at"], json[:updated_at]
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
+  def test_api_key_updated_data_owner_round_trip
+    fixture = {
+      "type" => "organization",
+      "id" => "stub"
+    }
+    model = WorkOS::ApiKeyUpdatedDataOwner.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    assert_equal fixture["id"], json[:id]
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
+  def test_user_api_key_updated_data_owner_round_trip
+    fixture = {
+      "type" => "user",
+      "id" => "stub",
+      "organization_id" => "stub"
+    }
+    model = WorkOS::UserApiKeyUpdatedDataOwner.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    assert_equal fixture["id"], json[:id]
+    assert_equal fixture["organization_id"], json[:organization_id]
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
+  def test_api_key_updated_data_previous_attribute_round_trip
+    fixture = {
+      "expires_at" => nil
+    }
+    model = WorkOS::ApiKeyUpdatedDataPreviousAttribute.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    assert_nil json[:expires_at]
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
   def test_authentication_email_verification_failed_round_trip
     fixture = {
       "object" => "event",
@@ -3172,16 +3268,16 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_deactivated_round_trip
+  def test_dsync_deleted_round_trip
     fixture = {
       "object" => "event",
       "id" => "stub",
-      "event" => "dsync.deactivated",
+      "event" => "dsync.deleted",
       "data" => {},
       "created_at" => "stub",
       "context" => {}
     }
-    model = WorkOS::DsyncDeactivated.new(fixture.to_json)
+    model = WorkOS::DsyncDeleted.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
@@ -3189,7 +3285,7 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_deactivated_data_round_trip
+  def test_dsync_deleted_data_round_trip
     fixture = {
       "object" => "directory",
       "id" => "stub",
@@ -3198,45 +3294,45 @@ class ModelRoundTripTest < Minitest::Test
       "state" => "stub",
       "name" => "stub",
       "created_at" => "stub",
-      "updated_at" => "stub",
-      "external_key" => "stub",
-      "domains" => []
+      "updated_at" => "stub"
     }
-    model = WorkOS::DsyncDeactivatedData.new(fixture.to_json)
+    model = WorkOS::DsyncDeletedData.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
     assert_equal fixture["name"], json[:name]
     assert_equal fixture["created_at"], json[:created_at]
     assert_equal fixture["updated_at"], json[:updated_at]
-    assert_equal fixture["external_key"], json[:external_key]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_deactivated_data_domain_round_trip
+  def test_dsync_group_created_round_trip
     fixture = {
-      "object" => "organization_domain",
+      "object" => "event",
       "id" => "stub",
-      "domain" => "stub"
+      "event" => "dsync.group.created",
+      "data" => {},
+      "created_at" => "stub",
+      "context" => {}
     }
-    model = WorkOS::DsyncDeactivatedDataDomain.new(fixture.to_json)
+    model = WorkOS::DsyncGroupCreated.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
-    assert_equal fixture["domain"], json[:domain]
+    assert_equal fixture["created_at"], json[:created_at]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_deleted_round_trip
+  def test_dsync_group_deleted_round_trip
     fixture = {
       "object" => "event",
       "id" => "stub",
-      "event" => "dsync.deleted",
+      "event" => "dsync.group.deleted",
       "data" => {},
       "created_at" => "stub",
       "context" => {}
     }
-    model = WorkOS::DsyncDeleted.new(fixture.to_json)
+    model = WorkOS::DsyncGroupDeleted.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
@@ -3244,37 +3340,59 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_deleted_data_round_trip
+  def test_dsync_group_updated_round_trip
     fixture = {
-      "object" => "directory",
+      "object" => "event",
+      "id" => "stub",
+      "event" => "dsync.group.updated",
+      "data" => {},
+      "created_at" => "stub",
+      "context" => {}
+    }
+    model = WorkOS::DsyncGroupUpdated.new(fixture.to_json)
+    json = model.to_h
+    assert_kind_of Hash, json
+    assert_equal fixture["id"], json[:id]
+    assert_equal fixture["created_at"], json[:created_at]
+    fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
+  end
+
+  def test_dsync_group_updated_data_round_trip
+    fixture = {
+      "object" => "directory_group",
       "id" => "stub",
+      "idp_id" => "stub",
+      "directory_id" => "stub",
       "organization_id" => "stub",
-      "type" => "stub",
-      "state" => "stub",
       "name" => "stub",
+      "raw_attributes" => {},
       "created_at" => "stub",
-      "updated_at" => "stub"
+      "updated_at" => "stub",
+      "previous_attributes" => {}
     }
-    model = WorkOS::DsyncDeletedData.new(fixture.to_json)
+    model = WorkOS::DsyncGroupUpdatedData.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
+    assert_equal fixture["idp_id"], json[:idp_id]
+    assert_equal fixture["directory_id"], json[:directory_id]
+    assert_equal fixture["organization_id"], json[:organization_id]
     assert_equal fixture["name"], json[:name]
     assert_equal fixture["created_at"], json[:created_at]
     assert_equal fixture["updated_at"], json[:updated_at]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_group_created_round_trip
+  def test_dsync_token_created_round_trip
     fixture = {
       "object" => "event",
       "id" => "stub",
-      "event" => "dsync.group.created",
+      "event" => "dsync.token.created",
       "data" => {},
       "created_at" => "stub",
       "context" => {}
     }
-    model = WorkOS::DsyncGroupCreated.new(fixture.to_json)
+    model = WorkOS::DsyncTokenCreated.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
@@ -3282,33 +3400,35 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_group_deleted_round_trip
+  def test_dsync_token_created_data_round_trip
     fixture = {
-      "object" => "event",
+      "object" => "directory_token",
       "id" => "stub",
-      "event" => "dsync.group.deleted",
-      "data" => {},
-      "created_at" => "stub",
-      "context" => {}
+      "directory_id" => "stub",
+      "organization_id" => "stub",
+      "token_suffix" => "stub",
+      "created_at" => "stub"
     }
-    model = WorkOS::DsyncGroupDeleted.new(fixture.to_json)
+    model = WorkOS::DsyncTokenCreatedData.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
+    assert_equal fixture["directory_id"], json[:directory_id]
+    assert_equal fixture["token_suffix"], json[:token_suffix]
     assert_equal fixture["created_at"], json[:created_at]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_group_updated_round_trip
+  def test_dsync_token_revoked_round_trip
     fixture = {
       "object" => "event",
       "id" => "stub",
-      "event" => "dsync.group.updated",
+      "event" => "dsync.token.revoked",
       "data" => {},
       "created_at" => "stub",
       "context" => {}
     }
-    model = WorkOS::DsyncGroupUpdated.new(fixture.to_json)
+    model = WorkOS::DsyncTokenRevoked.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
@@ -3316,29 +3436,22 @@ class ModelRoundTripTest < Minitest::Test
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
-  def test_dsync_group_updated_data_round_trip
+  def test_dsync_token_revoked_data_round_trip
     fixture = {
-      "object" => "directory_group",
+      "object" => "directory_token",
       "id" => "stub",
-      "idp_id" => "stub",
       "directory_id" => "stub",
       "organization_id" => "stub",
-      "name" => "stub",
-      "raw_attributes" => {},
-      "created_at" => "stub",
-      "updated_at" => "stub",
-      "previous_attributes" => {}
+      "token_suffix" => "stub",
+      "created_at" => "stub"
     }
-    model = WorkOS::DsyncGroupUpdatedData.new(fixture.to_json)
+    model = WorkOS::DsyncTokenRevokedData.new(fixture.to_json)
     json = model.to_h
     assert_kind_of Hash, json
     assert_equal fixture["id"], json[:id]
-    assert_equal fixture["idp_id"], json[:idp_id]
     assert_equal fixture["directory_id"], json[:directory_id]
-    assert_equal fixture["organization_id"], json[:organization_id]
-    assert_equal fixture["name"], json[:name]
+    assert_equal fixture["token_suffix"], json[:token_suffix]
     assert_equal fixture["created_at"], json[:created_at]
-    assert_equal fixture["updated_at"], json[:updated_at]
     fixture.each_key { |k| assert json.key?(k.to_sym) || json.key?(k), "Expected to_h to include key #{k}" }
   end
 
@@ -7581,6 +7694,7 @@ class ModelRoundTripTest < Minitest::Test
       "id" => "stub",
       "first_name" => nil,
       "last_name" => nil,
+      "name" => nil,
       "profile_picture_url" => nil,
       "email" => "stub",
       "email_verified" => true,

data/test/workos/test_vault.rb

@@ -3,7 +3,6 @@
 # This file is auto-generated by oagen. Do not edit.
 
 require "test_helper"
-require "base64"
 
 class VaultTest < Minitest::Test
   include FixtureHelper