better_auth-api-key 0.2.0 → 0.5.0

data/lib/better_auth/plugins/api_key.rb

@@ -3,740 +3,204 @@
 require "json"
 require "securerandom"
 require "time"
+require_relative "../api_key/error_codes"
+require_relative "../api_key/types"
+require_relative "../api_key/utils"
+require_relative "../api_key/rate_limit"
+require_relative "../api_key/keys"
+require_relative "../api_key/adapter"
+require_relative "../api_key/schema"
+require_relative "../api_key/org_authorization"
+require_relative "../api_key/validation"
+require_relative "../api_key/configuration"
+require_relative "../api_key/session"
+require_relative "../api_key/plugin_factory"
+require_relative "../api_key/routes/index"
+require_relative "../api_key/routes/create_api_key"
+require_relative "../api_key/routes/verify_api_key"
+require_relative "../api_key/routes/get_api_key"
+require_relative "../api_key/routes/update_api_key"
+require_relative "../api_key/routes/delete_api_key"
+require_relative "../api_key/routes/list_api_keys"
+require_relative "../api_key/routes/delete_all_expired_api_keys"
 
 module BetterAuth
   module Plugins
     singleton_class.remove_method(:api_key) if singleton_class.method_defined?(:api_key)
     remove_method(:api_key) if method_defined?(:api_key) || private_method_defined?(:api_key)
 
-    API_KEY_ERROR_CODES = {
-      "INVALID_METADATA_TYPE" => "metadata must be an object or undefined",
-      "REFILL_AMOUNT_AND_INTERVAL_REQUIRED" => "refillAmount is required when refillInterval is provided",
-      "REFILL_INTERVAL_AND_AMOUNT_REQUIRED" => "refillInterval is required when refillAmount is provided",
-      "USER_BANNED" => "User is banned",
-      "UNAUTHORIZED_SESSION" => "Unauthorized or invalid session",
-      "KEY_NOT_FOUND" => "API Key not found",
-      "KEY_DISABLED" => "API Key is disabled",
-      "KEY_EXPIRED" => "API Key has expired",
-      "USAGE_EXCEEDED" => "API Key has reached its usage limit",
-      "KEY_NOT_RECOVERABLE" => "API Key is not recoverable",
-      "EXPIRES_IN_IS_TOO_SMALL" => "The expiresIn is smaller than the predefined minimum value.",
-      "EXPIRES_IN_IS_TOO_LARGE" => "The expiresIn is larger than the predefined maximum value.",
-      "INVALID_REMAINING" => "The remaining count is either too large or too small.",
-      "INVALID_PREFIX_LENGTH" => "The prefix length is either too large or too small.",
-      "INVALID_NAME_LENGTH" => "The name length is either too large or too small.",
-      "METADATA_DISABLED" => "Metadata is disabled.",
-      "RATE_LIMIT_EXCEEDED" => "Rate limit exceeded.",
-      "NO_VALUES_TO_UPDATE" => "No values to update.",
-      "KEY_DISABLED_EXPIRATION" => "Custom key expiration values are disabled.",
-      "INVALID_API_KEY" => "Invalid API key.",
-      "INVALID_USER_ID_FROM_API_KEY" => "The user id from the API key is invalid.",
-      "INVALID_REFERENCE_ID_FROM_API_KEY" => "The reference id from the API key is invalid.",
-      "INVALID_API_KEY_GETTER_RETURN_TYPE" => "API Key getter returned an invalid key type. Expected string.",
-      "SERVER_ONLY_PROPERTY" => "The property you're trying to set can only be set from the server auth instance only.",
-      "FAILED_TO_UPDATE_API_KEY" => "Failed to update API key",
-      "NAME_REQUIRED" => "API Key name is required.",
-      "ORGANIZATION_ID_REQUIRED" => "Organization ID is required for organization-owned API keys.",
-      "USER_NOT_MEMBER_OF_ORGANIZATION" => "You are not a member of the organization that owns this API key.",
-      "INSUFFICIENT_API_KEY_PERMISSIONS" => "You do not have permission to perform this action on organization API keys.",
-      "NO_DEFAULT_API_KEY_CONFIGURATION_FOUND" => "No default api-key configuration found.",
-      "ORGANIZATION_PLUGIN_REQUIRED" => "Organization plugin is required for organization-owned API keys. Please install and configure the organization plugin."
-    }.freeze
-
-    API_KEY_TABLE_NAME = "apikey"
+    API_KEY_ERROR_CODES = BetterAuth::APIKey::ERROR_CODES
+
+    API_KEY_TABLE_NAME = BetterAuth::APIKey::Types::API_KEY_TABLE_NAME
 
     module_function
 
     def default_api_key_hasher(key)
-      Crypto.sha256(key.to_s, encoding: :base64url)
+      BetterAuth::APIKey::Keys.default_hasher(key)
     end
 
     def api_key(configurations = {}, options = nil)
-      config = api_key_config(configurations, options)
-      Plugin.new(
-        id: "api-key",
-        version: BetterAuth::APIKey::VERSION,
-        hooks: {
-          before: [
-            {
-              matcher: ->(ctx) { !!api_key_session_header_config(ctx, config) },
-              handler: ->(ctx) { api_key_session_hook(ctx, config) }
-            }
-          ]
-        },
-        endpoints: {
-          create_api_key: api_key_create_endpoint(config),
-          verify_api_key: api_key_verify_endpoint(config),
-          get_api_key: api_key_get_endpoint(config),
-          update_api_key: api_key_update_endpoint(config),
-          delete_api_key: api_key_delete_endpoint(config),
-          list_api_keys: api_key_list_endpoint(config),
-          delete_all_expired_api_keys: api_key_delete_expired_endpoint(config)
-        },
-        schema: api_key_schema(config, config[:schema]),
-        error_codes: API_KEY_ERROR_CODES,
-        options: config
-      )
+      BetterAuth::APIKey::PluginFactory.build(configurations, options)
     end
 
     def api_key_config(configurations, options = nil)
-      if configurations.is_a?(Array)
-        normalized_configs = configurations.map { |config| api_key_single_config(config) }
-        if normalized_configs.any? { |config| config[:config_id].to_s.empty? }
-          raise Error, "configId is required for each API key configuration in the api-key plugin."
-        end
-        config_ids = normalized_configs.map { |config| config[:config_id] }
-        raise Error, "configId must be unique for each API key configuration in the api-key plugin." if config_ids.uniq.length != config_ids.length
-
-        plugin_options = normalize_hash(options || {})
-        default_config = normalized_configs.find { |config| api_key_default_config_id?(config[:config_id]) }
-        default_config ||= normalized_configs.first
-        default_config.merge(
-          configurations: normalized_configs,
-          schema: plugin_options[:schema] || default_config[:schema]
-        )
-      else
-        config = api_key_single_config(configurations)
-        config[:config_id] ||= "default"
-        config.merge(configurations: [config])
-      end
+      BetterAuth::APIKey::Configuration.normalize(configurations, options)
     end
 
     def api_key_single_config(options)
-      data = normalize_hash(options || {})
-      rate_limit_options = data[:rate_limit] || {}
-      starting_characters_options = data[:starting_characters_config] || {}
-      {
-        config_id: data[:config_id],
-        api_key_headers: data[:api_key_headers] || "x-api-key",
-        default_key_length: data[:default_key_length] || 64,
-        default_prefix: data[:default_prefix],
-        maximum_prefix_length: data.key?(:maximum_prefix_length) ? data[:maximum_prefix_length] : 32,
-        minimum_prefix_length: data.key?(:minimum_prefix_length) ? data[:minimum_prefix_length] : 1,
-        maximum_name_length: data.key?(:maximum_name_length) ? data[:maximum_name_length] : 32,
-        minimum_name_length: data.key?(:minimum_name_length) ? data[:minimum_name_length] : 1,
-        enable_metadata: data[:enable_metadata] || false,
-        disable_key_hashing: data[:disable_key_hashing] || false,
-        require_name: data[:require_name] || false,
-        storage: data[:storage] || "database",
-        rate_limit: {
-          enabled: rate_limit_options.fetch(:enabled, true),
-          time_window: rate_limit_options[:time_window] || 86_400_000,
-          max_requests: rate_limit_options[:max_requests] || 10
-        },
-        key_expiration: {
-          default_expires_in: data.dig(:key_expiration, :default_expires_in),
-          disable_custom_expires_time: data.dig(:key_expiration, :disable_custom_expires_time) || false,
-          max_expires_in: data.dig(:key_expiration, :max_expires_in) || 365,
-          min_expires_in: data.dig(:key_expiration, :min_expires_in) || 1
-        },
-        starting_characters_config: {
-          should_store: starting_characters_options.fetch(:should_store, true),
-          characters_length: starting_characters_options[:characters_length] || 6
-        },
-        enable_session_for_api_keys: data[:enable_session_for_api_keys] || false,
-        fallback_to_database: data[:fallback_to_database] || false,
-        custom_storage: data[:custom_storage],
-        custom_key_generator: data[:custom_key_generator],
-        custom_api_key_getter: data[:custom_api_key_getter],
-        custom_api_key_validator: data[:custom_api_key_validator],
-        default_permissions: data[:default_permissions],
-        permissions: data[:permissions] || {},
-        references: data[:references] || "user",
-        defer_updates: data[:defer_updates] || false,
-        schema: data[:schema]
-      }
+      BetterAuth::APIKey::Configuration.single(options)
     end
 
     def api_key_schema(config, custom_schema = nil)
-      base = {
-        apikey: {
-          fields: {
-            configId: {type: "string", required: true, default_value: "default", index: true},
-            name: {type: "string", required: false},
-            start: {type: "string", required: false},
-            prefix: {type: "string", required: false},
-            key: {type: "string", required: true, index: true},
-            referenceId: {type: "string", required: true, index: true},
-            refillInterval: {type: "number", required: false},
-            refillAmount: {type: "number", required: false},
-            lastRefillAt: {type: "date", required: false},
-            enabled: {type: "boolean", required: false, default_value: true},
-            rateLimitEnabled: {type: "boolean", required: false, default_value: true},
-            rateLimitTimeWindow: {type: "number", required: false, default_value: config[:rate_limit][:time_window]},
-            rateLimitMax: {type: "number", required: false, default_value: config[:rate_limit][:max_requests]},
-            requestCount: {type: "number", required: false, default_value: 0},
-            remaining: {type: "number", required: false},
-            lastRequest: {type: "date", required: false},
-            expiresAt: {type: "date", required: false},
-            createdAt: {type: "date", required: true},
-            updatedAt: {type: "date", required: true},
-            permissions: {type: "string", required: false},
-            metadata: {type: "string", required: false}
-          }
-        }
-      }
-      deep_merge_hashes(base, normalize_hash(custom_schema || {}))
+      BetterAuth::APIKey::SchemaDefinition.schema(config, custom_schema)
     end
 
     def api_key_create_endpoint(config)
-      Endpoint.new(path: "/api-key/create", method: "POST") do |ctx|
-        body = normalize_hash(ctx.body)
-        resolved_config = api_key_resolve_config(ctx.context, config, body[:config_id])
-        session = Routes.current_session(ctx, allow_nil: true)
-        reference_id = api_key_create_reference_id!(ctx, body, session, resolved_config)
-
-        api_key_validate_create_update!(body, resolved_config, create: true, client: !ctx.headers.empty?)
-        key_prefix = body.key?(:prefix) ? body[:prefix] : resolved_config[:default_prefix]
-        key = api_key_generate_key(resolved_config, key_prefix)
-        now = Time.now
-        hashed = api_key_hash(key, resolved_config)
-        data = {
-          configId: resolved_config[:config_id] || "default",
-          name: body[:name],
-          start: resolved_config[:starting_characters_config][:should_store] ? key[0, resolved_config[:starting_characters_config][:characters_length].to_i] : nil,
-          prefix: key_prefix,
-          key: hashed,
-          referenceId: reference_id,
-          enabled: true,
-          rateLimitEnabled: body.key?(:rate_limit_enabled) ? body[:rate_limit_enabled] : resolved_config[:rate_limit][:enabled],
-          rateLimitTimeWindow: body[:rate_limit_time_window] || resolved_config[:rate_limit][:time_window],
-          rateLimitMax: body[:rate_limit_max] || resolved_config[:rate_limit][:max_requests],
-          requestCount: 0,
-          remaining: body.key?(:remaining) ? body[:remaining] : nil,
-          refillAmount: body[:refill_amount],
-          refillInterval: body[:refill_interval],
-          lastRefillAt: nil,
-          expiresAt: api_key_expires_at(body, resolved_config),
-          createdAt: now,
-          updatedAt: now,
-          permissions: api_key_encode_json(body[:permissions] || api_key_default_permissions(resolved_config, reference_id, ctx)),
-          metadata: body.key?(:metadata) ? api_key_encode_json(body[:metadata]) : nil
-        }
-        record = api_key_store(ctx, data, resolved_config)
-        api_key_public(record, reveal_key: key, include_key_field: true)
-      end
+      BetterAuth::APIKey::Routes::CreateAPIKey.endpoint(config)
     end
 
     def api_key_verify_endpoint(config)
-      Endpoint.new(path: "/api-key/verify", method: "POST") do |ctx|
-        body = normalize_hash(ctx.body)
-        resolved_config = api_key_resolve_config(ctx.context, config, body[:config_id])
-        key = body[:key]
-        raise APIError.new("FORBIDDEN", message: API_KEY_ERROR_CODES["INVALID_API_KEY"], code: "INVALID_API_KEY") if key.to_s.empty?
-
-        if resolved_config[:custom_api_key_validator].respond_to?(:call) && !resolved_config[:custom_api_key_validator].call({ctx: ctx, key: key})
-          ctx.json({valid: false, error: {message: API_KEY_ERROR_CODES["INVALID_API_KEY"], code: "KEY_NOT_FOUND"}, key: nil})
-        else
-          record = api_key_validate!(ctx, key, resolved_config, permissions: body[:permissions])
-          record_config = api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))
-          api_key_schedule_cleanup(ctx, record_config)
-          ctx.json({valid: true, error: nil, key: api_key_public(record, include_key_field: false)})
-        end
-      rescue APIError => error
-        ctx.context.logger.error("Failed to validate API key: #{error.message}") if ctx.context.logger.respond_to?(:error)
-        ctx.json({valid: false, error: api_key_error_payload(error), key: nil})
-      rescue => error
-        ctx.context.logger.error("Failed to validate API key: #{error.message}") if ctx.context.logger.respond_to?(:error)
-        ctx.json({valid: false, error: {message: API_KEY_ERROR_CODES["INVALID_API_KEY"], code: "INVALID_API_KEY"}, key: nil})
-      end
+      BetterAuth::APIKey::Routes::VerifyAPIKey.endpoint(config)
     end
 
     def api_key_get_endpoint(config)
-      Endpoint.new(path: "/api-key/get", method: "GET") do |ctx|
-        session = Routes.current_session(ctx)
-        query = normalize_hash(ctx.query)
-        resolved_config = api_key_resolve_config(ctx.context, config, query[:config_id])
-        id = query[:id]
-        record = api_key_find_by_id(ctx, id, resolved_config)
-        raise APIError.new("NOT_FOUND", message: API_KEY_ERROR_CODES["KEY_NOT_FOUND"]) unless record && api_key_config_id_matches?(api_key_record_config_id(record), resolved_config[:config_id])
-
-        record_config = api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))
-        api_key_authorize_reference!(ctx, record_config, session[:user]["id"], api_key_record_reference_id(record), "read")
-
-        record = api_key_migrate_legacy_metadata(ctx, record, record_config)
-        api_key_delete_expired(ctx.context, record_config)
-        ctx.json(api_key_public(record, include_key_field: false))
-      end
+      BetterAuth::APIKey::Routes::GetAPIKey.endpoint(config)
     end
 
     def api_key_update_endpoint(config)
-      Endpoint.new(path: "/api-key/update", method: "POST") do |ctx|
-        body = normalize_hash(ctx.body)
-        resolved_config = api_key_resolve_config(ctx.context, config, body[:config_id])
-        session = Routes.current_session(ctx, allow_nil: true)
-        user_id = session&.dig(:user, "id") || body[:user_id]
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["UNAUTHORIZED_SESSION"]) unless user_id
-        if session && body[:user_id] && body[:user_id] != session[:user]["id"]
-          raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["UNAUTHORIZED_SESSION"])
-        end
-
-        key_id = body[:key_id]
-        record = api_key_find_by_id(ctx, key_id, resolved_config)
-        raise APIError.new("NOT_FOUND", message: API_KEY_ERROR_CODES["KEY_NOT_FOUND"]) unless record
-        raise APIError.new("NOT_FOUND", message: API_KEY_ERROR_CODES["KEY_NOT_FOUND"]) unless api_key_config_id_matches?(api_key_record_config_id(record), resolved_config[:config_id])
-
-        record_config = api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))
-        api_key_authorize_reference!(ctx, record_config, user_id, api_key_record_reference_id(record), "update")
-
-        api_key_validate_create_update!(body, record_config, create: false, client: api_key_auth_required?(ctx))
-        update = api_key_update_payload(body, record_config)
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["NO_VALUES_TO_UPDATE"]) if update.empty?
-
-        updated = api_key_update_record(ctx, record, update.merge(updatedAt: Time.now), record_config)
-        updated = api_key_migrate_legacy_metadata(ctx, updated, record_config)
-        api_key_delete_expired(ctx.context, record_config)
-        ctx.json(api_key_public(updated, include_key_field: false))
-      end
+      BetterAuth::APIKey::Routes::UpdateAPIKey.endpoint(config)
     end
 
     def api_key_delete_endpoint(config)
-      Endpoint.new(path: "/api-key/delete", method: "POST") do |ctx|
-        session = Routes.current_session(ctx)
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["USER_BANNED"]) if session[:user]["banned"] == true
-
-        body = normalize_hash(ctx.body)
-        resolved_config = api_key_resolve_config(ctx.context, config, body[:config_id])
-        key_id = body[:key_id]
-        record = api_key_find_by_id(ctx, key_id, resolved_config)
-        raise APIError.new("NOT_FOUND", message: API_KEY_ERROR_CODES["KEY_NOT_FOUND"]) unless record && api_key_config_id_matches?(api_key_record_config_id(record), resolved_config[:config_id])
-
-        record_config = api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))
-        api_key_authorize_reference!(ctx, record_config, session[:user]["id"], api_key_record_reference_id(record), "delete")
-
-        api_key_delete_record(ctx, record, record_config)
-        api_key_delete_expired(ctx.context, record_config)
-        ctx.json({success: true})
-      end
+      BetterAuth::APIKey::Routes::DeleteAPIKey.endpoint(config)
     end
 
     def api_key_list_endpoint(config)
-      Endpoint.new(path: "/api-key/list", method: "GET") do |ctx|
-        session = Routes.current_session(ctx)
-        query = normalize_hash(ctx.query)
-        api_key_validate_list_query!(query)
-        configs = query[:config_id] ? [api_key_resolve_config(ctx.context, config, query[:config_id])] : config.fetch(:configurations, [config])
-        reference_id = query[:organization_id] || session[:user]["id"]
-        expected_reference = query[:organization_id] ? "organization" : "user"
-        api_key_check_org_permission!(ctx, session[:user]["id"], reference_id, "read") if query[:organization_id]
-        records = configs.flat_map { |entry| api_key_list_for_reference(ctx, reference_id, entry) }.uniq { |record| record["id"] }
-        records = records.select do |record|
-          record_config = api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))
-          record_config[:references].to_s == expected_reference &&
-            api_key_record_reference_id(record) == reference_id &&
-            (!query[:config_id] || api_key_config_id_matches?(api_key_record_config_id(record), query[:config_id]))
-        end
-        total = records.length
-        records = api_key_sort_records(records, query[:sort_by], query[:sort_direction])
-        offset = query.key?(:offset) ? query[:offset].to_i : nil
-        limit = query.key?(:limit) ? query[:limit].to_i : nil
-        records = records.drop(offset) if offset
-        records = records.first(limit) if limit
-        records.each { |record| api_key_delete_expired(ctx.context, api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))) }
-        api_keys = records.map do |record|
-          record_config = api_key_resolve_config(ctx.context, config, api_key_record_config_id(record))
-          api_key_public(api_key_migrate_legacy_metadata(ctx, record, record_config), include_key_field: false)
-        end
-        ctx.json({apiKeys: api_keys, total: total, limit: limit, offset: offset})
-      end
+      BetterAuth::APIKey::Routes::ListAPIKeys.endpoint(config)
     end
 
     def api_key_delete_expired_endpoint(config)
-      Endpoint.new(path: "/api-key/delete-all-expired-api-keys", method: "POST") do |ctx|
-        api_key_delete_expired(ctx.context, config, bypass_last_check: true)
-        ctx.json({success: true, error: nil})
-      rescue => error
-        ctx.context.logger.error("[API KEY PLUGIN] Failed to delete expired API keys: #{error.message}") if ctx.context.logger.respond_to?(:error)
-        ctx.json({success: false, error: error})
-      end
+      BetterAuth::APIKey::Routes::DeleteAllExpiredAPIKeys.endpoint(config)
     end
 
     def api_key_resolve_config(context, config, config_id = nil)
-      configurations = config.fetch(:configurations, [config])
-      return configurations.find { |entry| api_key_default_config_id?(entry[:config_id]) } || configurations.first if config_id.to_s.empty?
-
-      configurations.find { |entry| entry[:config_id].to_s == config_id.to_s } ||
-        begin
-          default = configurations.find { |entry| api_key_default_config_id?(entry[:config_id]) }
-          unless default
-            context.logger.error(API_KEY_ERROR_CODES["NO_DEFAULT_API_KEY_CONFIGURATION_FOUND"]) if context.respond_to?(:logger) && context.logger.respond_to?(:error)
-            raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["NO_DEFAULT_API_KEY_CONFIGURATION_FOUND"])
-          end
-          default
-        end
+      BetterAuth::APIKey::Routes.resolve_config(context, config, config_id)
     end
 
     def api_key_default_config_id?(value)
-      value.nil? || value.to_s.empty? || value.to_s == "default"
+      BetterAuth::APIKey::Routes.default_config_id?(value)
     end
 
     def api_key_config_id_matches?(record_config_id, expected_config_id)
-      return true if api_key_default_config_id?(record_config_id) && api_key_default_config_id?(expected_config_id)
-
-      record_config_id.to_s == expected_config_id.to_s
+      BetterAuth::APIKey::Routes.config_id_matches?(record_config_id, expected_config_id)
     end
 
     def api_key_create_reference_id!(ctx, body, session, config)
-      if config[:references].to_s == "organization"
-        organization_id = body[:organization_id]
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["ORGANIZATION_ID_REQUIRED"]) if organization_id.to_s.empty?
-
-        user_id = session&.dig(:user, "id") || body[:user_id]
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["UNAUTHORIZED_SESSION"]) if user_id.to_s.empty?
-
-        api_key_check_org_permission!(ctx, user_id, organization_id, "create")
-        organization_id
-      elsif session && body[:user_id] && body[:user_id] != session[:user]["id"]
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["UNAUTHORIZED_SESSION"])
-      elsif session
-
-        session[:user]["id"]
-      else
-        user_id = body[:user_id]
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["UNAUTHORIZED_SESSION"]) if user_id.to_s.empty?
-
-        user_id
-      end
+      BetterAuth::APIKey::OrgAuthorization.create_reference_id!(ctx, body, session, config)
     end
 
     def api_key_record_reference_id(record)
-      record["referenceId"] || record[:referenceId] || record["userId"] || record[:userId]
+      BetterAuth::APIKey::Types.record_reference_id(record)
     end
 
     def api_key_record_user_id(record)
-      record["userId"] || record[:userId] || (api_key_default_config_id?(record["configId"] || record[:configId]) && (record["referenceId"] || record[:referenceId]))
+      BetterAuth::APIKey::Types.record_user_id(record)
     end
 
     def api_key_record_config_id(record)
-      record["configId"] || record[:configId] || "default"
+      BetterAuth::APIKey::Types.record_config_id(record)
     end
 
     def api_key_default_permissions(config, reference_id, ctx)
-      permissions = config.dig(:permissions, :default_permissions) || config[:default_permissions]
-      return permissions.call(reference_id, ctx) if permissions.respond_to?(:call)
-
-      permissions
+      BetterAuth::APIKey::Types.default_permissions(config, reference_id, ctx)
     end
 
     def api_key_authorize_reference!(ctx, config, user_id, reference_id, action)
-      if config[:references].to_s == "organization"
-        api_key_check_org_permission!(ctx, user_id, reference_id, action)
-      elsif reference_id != user_id
-        raise APIError.new("NOT_FOUND", message: API_KEY_ERROR_CODES["KEY_NOT_FOUND"])
-      end
+      BetterAuth::APIKey::OrgAuthorization.authorize_reference!(ctx, config, user_id, reference_id, action)
     end
 
     def api_key_check_org_permission!(ctx, user_id, organization_id, action)
-      org_plugin = ctx.context.options.plugins.find { |plugin| plugin.id == "organization" }
-      unless org_plugin
-        raise APIError.new(
-          "INTERNAL_SERVER_ERROR",
-          message: API_KEY_ERROR_CODES["ORGANIZATION_PLUGIN_REQUIRED"],
-          code: "ORGANIZATION_PLUGIN_REQUIRED"
-        )
-      end
-
-      member = ctx.context.adapter.find_one(model: "member", where: [{field: "userId", value: user_id}, {field: "organizationId", value: organization_id}])
-      unless member
-        raise APIError.new(
-          "FORBIDDEN",
-          message: API_KEY_ERROR_CODES["USER_NOT_MEMBER_OF_ORGANIZATION"],
-          code: "USER_NOT_MEMBER_OF_ORGANIZATION"
-        )
-      end
-
-      return member if member["role"].to_s == (org_plugin.options[:creator_role] || "owner").to_s
-
-      permissions = {"apiKey" => [action]}
-      return member if BetterAuth::Plugins.organization_permission?(ctx, org_plugin.options, member["role"], permissions, organization_id)
-
-      raise APIError.new(
-        "FORBIDDEN",
-        message: API_KEY_ERROR_CODES["INSUFFICIENT_API_KEY_PERMISSIONS"],
-        code: "INSUFFICIENT_API_KEY_PERMISSIONS"
-      )
+      BetterAuth::APIKey::OrgAuthorization.check_permission!(ctx, user_id, organization_id, action)
     end
 
     def api_key_sort_records(records, sort_by, direction)
-      return records unless sort_by
-
-      key = Schema.storage_key(sort_by)
-      sorted = records.sort_by { |record| record[key] || record[key.to_sym] || "" }
-      if direction.to_s.downcase == "desc"
-        sorted.reverse
-      else
-        sorted
-      end
+      BetterAuth::APIKey::Utils.sort_records(records, sort_by, direction)
     end
 
     def api_key_validate_list_query!(query)
-      %i[limit offset].each do |key|
-        next unless query.key?(key)
-
-        value = query[key]
-        raise APIError.new("BAD_REQUEST", message: "Invalid #{key}") unless value.to_s.match?(/\A\d+\z/)
-      end
-
-      direction = query[:sort_direction]
-      return if direction.nil? || %w[asc desc].include?(direction.to_s.downcase)
-
-      raise APIError.new("BAD_REQUEST", message: "Invalid sortDirection")
+      BetterAuth::APIKey::Utils.validate_list_query!(query)
     end
 
     def api_key_error_code(error)
-      API_KEY_ERROR_CODES.key(error.message) || error.code.to_s
+      BetterAuth::APIKey::Utils.error_code(error)
     end
 
     def api_key_error_payload(error)
-      payload = error.to_h
-      return payload if payload.is_a?(Hash) && payload.key?(:details)
-
-      {message: error.message, code: api_key_error_code(error)}
+      BetterAuth::APIKey::Utils.error_payload(error)
     end
 
     def api_key_session_header_config(ctx, config)
-      config.fetch(:configurations, [config]).find do |entry|
-        entry[:enable_session_for_api_keys] && api_key_get_from_headers(ctx, entry)
-      end
+      BetterAuth::APIKey::Session.header_config(ctx, config)
     end
 
     def api_key_session_hook(ctx, config)
-      config = api_key_session_header_config(ctx, config) || config
-      key = api_key_get_from_headers(ctx, config)
-      unless key.is_a?(String)
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["INVALID_API_KEY_GETTER_RETURN_TYPE"])
-      end
-      raise APIError.new("FORBIDDEN", message: API_KEY_ERROR_CODES["INVALID_API_KEY"]) if key.length < config[:default_key_length].to_i
-
-      if config[:custom_api_key_validator].respond_to?(:call) && !config[:custom_api_key_validator].call({ctx: ctx, key: key})
-        raise APIError.new("FORBIDDEN", message: API_KEY_ERROR_CODES["INVALID_API_KEY"])
-      end
-
-      record = api_key_validate!(ctx, key, config)
-      api_key_schedule_cleanup(ctx, config)
-      if config[:references].to_s != "user"
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["INVALID_REFERENCE_ID_FROM_API_KEY"])
-      end
-      reference_id = api_key_record_reference_id(record)
-      user = ctx.context.internal_adapter.find_user_by_id(reference_id)
-      raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["INVALID_REFERENCE_ID_FROM_API_KEY"]) unless user
-
-      session = {
-        user: user,
-        session: {
-          "id" => record["id"],
-          "token" => key,
-          "userId" => reference_id,
-          "userAgent" => ctx.headers["user-agent"],
-          "ipAddress" => RequestIP.client_ip(ctx.request || ctx.headers, ctx.context.options),
-          "createdAt" => Time.now,
-          "updatedAt" => Time.now,
-          "expiresAt" => record["expiresAt"] || (Time.now + ctx.context.options.session[:expires_in].to_i)
-        }
-      }
-      ctx.context.set_current_session(session)
-      nil
+      BetterAuth::APIKey::Session.hook(ctx, config)
     end
 
     def api_key_validate!(ctx, key, config, permissions: nil)
-      hashed = api_key_hash(key, config)
-      record = api_key_find_by_hash(ctx, hashed, config)
-      raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["INVALID_API_KEY"]) unless record
-      raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["INVALID_API_KEY"]) unless api_key_config_id_matches?(api_key_record_config_id(record), config[:config_id])
-      raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["KEY_DISABLED"]) if record["enabled"] == false
-      if record["expiresAt"] && record["expiresAt"] <= Time.now
-        api_key_schedule_record_delete(ctx, record, config)
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["KEY_EXPIRED"])
-      end
-      if record["remaining"].to_i <= 0 && !record["remaining"].nil? && record["refillAmount"].nil?
-        api_key_schedule_record_delete(ctx, record, config)
-        raise APIError.new("TOO_MANY_REQUESTS", message: API_KEY_ERROR_CODES["USAGE_EXCEEDED"])
-      end
-
-      api_key_check_permissions!(record, permissions)
-      update = api_key_usage_update(record, config)
-      updated = api_key_update_record(ctx, record, update, config, defer: true)
-      api_key_migrate_legacy_metadata(ctx, updated || record.merge(update.transform_keys { |key_name| Schema.storage_key(key_name) }), config)
+      BetterAuth::APIKey::Validation.validate_api_key!(ctx, key, config, permissions: permissions)
     end
 
     def api_key_usage_update(record, config)
-      now = Time.now
-      update = {lastRequest: now, updatedAt: now}
-
-      if (try_again_in = api_key_rate_limit_try_again_in(record, config, now))
-        raise APIError.new(
-          "UNAUTHORIZED",
-          message: API_KEY_ERROR_CODES["RATE_LIMIT_EXCEEDED"],
-          code: "RATE_LIMITED",
-          body: {
-            message: API_KEY_ERROR_CODES["RATE_LIMIT_EXCEEDED"],
-            code: "RATE_LIMITED",
-            details: {tryAgainIn: try_again_in}
-          }
-        )
-      end
-      update[:requestCount] = api_key_next_request_count(record, now) if api_key_rate_limit_counts_requests?(record, config)
-
-      remaining = record["remaining"]
-      if !remaining.nil?
-        if remaining.to_i <= 0 && record["refillAmount"] && record["refillInterval"]
-          last_refill = api_key_normalize_time(record["lastRefillAt"] || record["createdAt"])
-          if !last_refill || ((now - last_refill) * 1000) > record["refillInterval"].to_i
-            remaining = record["refillAmount"].to_i
-            update[:lastRefillAt] = now
-          end
-        end
-        raise APIError.new("TOO_MANY_REQUESTS", message: API_KEY_ERROR_CODES["USAGE_EXCEEDED"]) if remaining.to_i <= 0
-
-        update[:remaining] = remaining.to_i - 1
-      end
-      update
+      BetterAuth::APIKey::Validation.usage_update(record, config)
     end
 
     def api_key_rate_limit_try_again_in(record, config, now)
-      return nil if config[:rate_limit][:enabled] == false || record["rateLimitEnabled"] == false
-
-      window = record["rateLimitTimeWindow"]
-      max = record["rateLimitMax"]
-      return nil if window.nil? || max.nil?
-
-      last = api_key_normalize_time(record["lastRequest"])
-      return nil unless last
-
-      elapsed = (now - last) * 1000
-      return nil if elapsed > window.to_i
-      return nil unless record["requestCount"].to_i >= max.to_i
-
-      (window.to_i - elapsed).ceil
+      BetterAuth::APIKey::RateLimit.try_again_in(record, config, now)
     end
 
     def api_key_rate_limit_counts_requests?(record, config)
-      return false if config[:rate_limit][:enabled] == false || record["rateLimitEnabled"] == false
-
-      !record["rateLimitTimeWindow"].nil? && !record["rateLimitMax"].nil?
+      BetterAuth::APIKey::RateLimit.counts_requests?(record, config)
     end
 
     def api_key_next_request_count(record, now)
-      last = api_key_normalize_time(record["lastRequest"])
-      window = record["rateLimitTimeWindow"].to_i
-      if last && window.positive? && ((now - last) * 1000) <= window
-        record["requestCount"].to_i + 1
-      else
-        1
-      end
+      BetterAuth::APIKey::RateLimit.next_request_count(record, now)
     end
 
     def api_key_validate_create_update!(body, config, create:, client:)
-      name = body[:name]
-      if create && config[:require_name] && name.to_s.empty?
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["NAME_REQUIRED"])
-      end
-      if name && !name.to_s.length.between?(config[:minimum_name_length].to_i, config[:maximum_name_length].to_i)
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["INVALID_NAME_LENGTH"])
-      end
-      prefix = body[:prefix]
-      if prefix && !prefix.to_s.length.between?(config[:minimum_prefix_length].to_i, config[:maximum_prefix_length].to_i)
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["INVALID_PREFIX_LENGTH"])
-      end
-      if prefix && !prefix.to_s.match?(/\A[a-zA-Z0-9_-]+\z/)
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["INVALID_PREFIX_LENGTH"])
-      end
-      if body.key?(:remaining) && !body[:remaining].nil?
-        minimum = create ? 0 : 1
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["INVALID_REMAINING"]) if body[:remaining].to_i < minimum
-      end
-      if body[:metadata] && (create || config[:enable_metadata])
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["METADATA_DISABLED"]) unless config[:enable_metadata]
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["INVALID_METADATA_TYPE"]) unless body[:metadata].nil? || body[:metadata].is_a?(Hash)
-      end
-      server_only_keys = %i[refill_amount refill_interval rate_limit_max rate_limit_time_window rate_limit_enabled remaining permissions]
-      if client && server_only_keys.any? { |key| (create && key == :remaining) ? !body[:remaining].nil? : body.key?(key) }
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["SERVER_ONLY_PROPERTY"])
-      end
-      amount_present = body.key?(:refill_amount)
-      interval_present = body.key?(:refill_interval)
-      if amount_present && !interval_present
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["REFILL_AMOUNT_AND_INTERVAL_REQUIRED"])
-      end
-      if interval_present && !amount_present
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["REFILL_INTERVAL_AND_AMOUNT_REQUIRED"])
-      end
-      if body.key?(:expires_in)
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["KEY_DISABLED_EXPIRATION"]) if config[:key_expiration][:disable_custom_expires_time]
-        return if body[:expires_in].nil?
-
-        days = body[:expires_in].to_f / 86_400
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["EXPIRES_IN_IS_TOO_SMALL"]) if days < config[:key_expiration][:min_expires_in].to_f
-        raise APIError.new("BAD_REQUEST", message: API_KEY_ERROR_CODES["EXPIRES_IN_IS_TOO_LARGE"]) if days > config[:key_expiration][:max_expires_in].to_f
-      end
+      BetterAuth::APIKey::Validation.validate_create_update!(body, config, create: create, client: client)
     end
 
     def api_key_update_payload(body, config)
-      update = {}
-      update[:name] = body[:name] if body.key?(:name)
-      update[:enabled] = body[:enabled] unless body[:enabled].nil?
-      update[:remaining] = body[:remaining] if body.key?(:remaining)
-      update[:refillAmount] = body[:refill_amount] if body.key?(:refill_amount)
-      update[:refillInterval] = body[:refill_interval] if body.key?(:refill_interval)
-      update[:rateLimitEnabled] = body[:rate_limit_enabled] if body.key?(:rate_limit_enabled)
-      update[:rateLimitTimeWindow] = body[:rate_limit_time_window] if body.key?(:rate_limit_time_window)
-      update[:rateLimitMax] = body[:rate_limit_max] if body.key?(:rate_limit_max)
-      update[:expiresAt] = body[:expires_in].nil? ? nil : Time.now + body[:expires_in].to_i if body.key?(:expires_in)
-      update[:metadata] = api_key_encode_json(body[:metadata]) if body.key?(:metadata) && config[:enable_metadata]
-      update[:permissions] = api_key_encode_json(body[:permissions]) if body.key?(:permissions)
-      update
+      BetterAuth::APIKey::Validation.update_payload(body, config)
     end
 
     def api_key_generate_key(config, prefix)
-      generator = config[:custom_key_generator]
-      return generator.call({length: config[:default_key_length], prefix: prefix}) if generator.respond_to?(:call)
-
-      alphabet = [*("a".."z"), *("A".."Z")]
-      "#{prefix}#{Array.new(config[:default_key_length].to_i) { alphabet[SecureRandom.random_number(alphabet.length)] }.join}"
+      BetterAuth::APIKey::Keys.generate(config, prefix)
     end
 
     def api_key_hash(key, config)
-      config[:disable_key_hashing] ? key.to_s : default_api_key_hasher(key)
+      BetterAuth::APIKey::Keys.hash(key, config)
+    end
+
+    def api_key_normalize_body(raw)
+      BetterAuth::APIKey::Keys.normalize_body(raw)
     end
 
     def api_key_expires_at(body, config)
-      if body.key?(:expires_in)
-        Time.now + body[:expires_in].to_i unless body[:expires_in].nil?
-      elsif config[:key_expiration][:default_expires_in]
-        Time.now + config[:key_expiration][:default_expires_in].to_i
-      end
+      BetterAuth::APIKey::Keys.expires_at(body, config)
     end
 
     def api_key_store(ctx, data, config)
-      record = nil
-      if config[:storage] == "database" || config[:fallback_to_database]
-        record = ctx.context.adapter.create(model: API_KEY_TABLE_NAME, data: data)
-      end
-      record ||= data.transform_keys { |key| Schema.storage_key(key) }.merge("id" => SecureRandom.hex(16))
-      api_key_storage_set(ctx, record, config) if config[:storage] == "secondary-storage"
-      record
+      BetterAuth::APIKey::Adapter.store(ctx, data, config)
     end
 
     def api_key_find_by_hash(ctx, hashed, config)
-      if config[:storage] == "secondary-storage"
-        record = api_key_storage_get(ctx, "api-key:#{hashed}", config) || api_key_storage_get(ctx, "api-key:key:#{hashed}", config)
-        return record if record
-        return nil unless config[:fallback_to_database]
-      end
-      record = ctx.context.adapter.find_one(model: API_KEY_TABLE_NAME, where: [{field: "key", value: hashed}])
-      api_key_storage_set(ctx, record, config) if record && config[:storage] == "secondary-storage" && config[:fallback_to_database]
-      record
+      BetterAuth::APIKey::Adapter.find_by_hash(ctx, hashed, config)
     end
 
     def api_key_find_by_id(ctx, id, config)
-      if config[:storage] == "secondary-storage"
-        record = api_key_storage_get(ctx, "api-key:by-id:#{id}", config) || api_key_storage_get(ctx, "api-key:id:#{id}", config)
-        return record if record
-        return nil unless config[:fallback_to_database]
-      end
-      record = ctx.context.adapter.find_one(model: API_KEY_TABLE_NAME, where: [{field: "id", value: id}])
-      api_key_storage_set(ctx, record, config) if record && config[:storage] == "secondary-storage" && config[:fallback_to_database]
-      record
+      BetterAuth::APIKey::Adapter.find_by_id(ctx, id, config)
     end
 
     def api_key_list_for_user(ctx, user_id, config)
@@ -744,279 +208,107 @@ module BetterAuth
     end
 
     def api_key_list_for_reference(ctx, reference_id, config)
-      if config[:storage] == "secondary-storage"
-        begin
-          storage = api_key_storage(config, ctx.context)
-          ids = JSON.parse((storage&.get("api-key:by-ref:#{reference_id}") || storage&.get("api-key:user:#{reference_id}")).to_s)
-          records = ids.filter_map { |id| api_key_find_by_id(ctx, id, config) }
-          return records unless records.empty? && config[:fallback_to_database]
-        rescue JSON::ParserError, NoMethodError
-          return [] unless config[:fallback_to_database]
-        end
-      end
-      records = ctx.context.adapter.find_many(model: API_KEY_TABLE_NAME, where: [{field: "referenceId", value: reference_id}])
-      legacy = ctx.context.adapter.find_many(model: API_KEY_TABLE_NAME, where: [{field: "userId", value: reference_id}])
-      combined = (records + legacy).uniq { |record| record["id"] }
-      api_key_storage_populate_reference(ctx, reference_id, combined, config) if config[:storage] == "secondary-storage" && config[:fallback_to_database]
-      combined
+      BetterAuth::APIKey::Adapter.list_for_reference(ctx, reference_id, config)
     end
 
     def api_key_update_record(ctx, record, update, config, defer: false)
-      performer = lambda do
-        updated = nil
-        if config[:storage] == "database" || config[:fallback_to_database]
-          updated = ctx.context.adapter.update(model: API_KEY_TABLE_NAME, where: [{field: "id", value: record["id"]}], update: update)
-        end
-        updated ||= record.merge(update.transform_keys { |key| Schema.storage_key(key) })
-        api_key_storage_set(ctx, updated, config) if config[:storage] == "secondary-storage"
-        updated
-      end
-
-      if defer && config[:defer_updates] && api_key_background_tasks?(ctx)
-        scheduled = record.merge(update.transform_keys { |key| Schema.storage_key(key) })
-        ctx.context.run_in_background(performer)
-        scheduled
-      else
-        performer.call
-      end
+      BetterAuth::APIKey::Adapter.update_record(ctx, record, update, config, defer: defer)
     end
 
     def api_key_delete_record(ctx, record, config)
-      ctx.context.adapter.delete(model: API_KEY_TABLE_NAME, where: [{field: "id", value: record["id"]}]) if config[:storage] == "database" || config[:fallback_to_database]
-      api_key_storage_delete(ctx, record, config) if config[:storage] == "secondary-storage"
+      BetterAuth::APIKey::Adapter.delete_record(ctx, record, config)
     end
 
     def api_key_schedule_record_delete(ctx, record, config)
-      task = -> { api_key_delete_record(ctx, record, config) }
-      if config[:defer_updates] && api_key_background_tasks?(ctx)
-        ctx.context.run_in_background(task)
-      else
-        task.call
-      end
+      BetterAuth::APIKey::Adapter.schedule_record_delete(ctx, record, config)
     end
 
     def api_key_schedule_cleanup(ctx, config)
-      task = -> { api_key_delete_expired(ctx.context, config) }
-      if config[:defer_updates] && api_key_background_tasks?(ctx)
-        ctx.context.run_in_background(task)
-      else
-        task.call
-      end
+      BetterAuth::APIKey::Routes.schedule_cleanup(ctx, config)
     end
 
-    @api_key_last_expired_check = nil
-
     def api_key_delete_expired(context, config, bypass_last_check: false)
-      return unless config[:storage] == "database" || config[:fallback_to_database]
-      unless bypass_last_check
-        now = Time.now
-        return if @api_key_last_expired_check && ((now - @api_key_last_expired_check) * 1000) < 10_000
-
-        @api_key_last_expired_check = now
-      end
-
-      expired = context.adapter.find_many(model: API_KEY_TABLE_NAME).select do |record|
-        record["expiresAt"] && record["expiresAt"] < Time.now
-      end
-      expired.each do |record|
-        context.adapter.delete(model: API_KEY_TABLE_NAME, where: [{field: "id", value: record["id"]}])
-      end
+      BetterAuth::APIKey::Routes.delete_expired(context, config, bypass_last_check: bypass_last_check)
     end
 
     def api_key_storage(config, context = nil)
-      config[:custom_storage] || context&.options&.secondary_storage
+      BetterAuth::APIKey::Adapter.storage(config, context)
     end
 
     def api_key_storage_get(ctx, key, config)
-      raw = api_key_storage(config, ctx.context)&.get(key)
-      raw && api_key_deserialize_storage_record(JSON.parse(raw))
-    rescue JSON::ParserError
-      nil
+      BetterAuth::APIKey::Adapter.get(ctx, key, config)
     end
 
     def api_key_storage_set(ctx, record, config)
-      storage = api_key_storage(config, ctx.context)
-      unless storage
-        raise APIError.new("INTERNAL_SERVER_ERROR", message: "Secondary storage is required when storage mode is 'secondary-storage'")
-      end
-
-      serialized = JSON.generate(api_key_storage_record(record))
-      expires_at = api_key_normalize_time(record["expiresAt"])
-      ttl = expires_at ? [(expires_at - Time.now).to_i, 0].max : nil
-      reference_id = api_key_record_reference_id(record)
-      user_key = "api-key:by-ref:#{reference_id}"
-
-      api_key_storage_batch(storage) do
-        operations = [
-          -> { storage.set("api-key:#{record["key"]}", serialized, ttl) },
-          -> { storage.set("api-key:by-id:#{record["id"]}", serialized, ttl) }
-        ]
-        operations << if config[:fallback_to_database]
-          # In fallback mode the ref list is a cache invalidated on writes
-          # to avoid races with concurrent writers of the same reference.
-          -> { storage.delete(user_key) }
-        else
-          -> { api_key_ref_list_add(storage, user_key, record["id"]) }
-        end
-        operations.each(&:call)
-      end
+      BetterAuth::APIKey::Adapter.set(ctx, record, config)
     end
 
     def api_key_storage_delete(ctx, record, config)
-      storage = api_key_storage(config, ctx.context)
-      return unless storage
-
-      reference_id = api_key_record_reference_id(record)
-      user_key = "api-key:by-ref:#{reference_id}"
-
-      api_key_storage_batch(storage) do
-        operations = [
-          -> { storage.delete("api-key:#{record["key"]}") },
-          -> { storage.delete("api-key:by-id:#{record["id"]}") },
-          # Ruby-only legacy storage layout cleanup; upstream never wrote here.
-          -> { storage.delete("api-key:key:#{record["key"]}") },
-          -> { storage.delete("api-key:id:#{record["id"]}") }
-        ]
-        operations << if config[:fallback_to_database]
-          -> { storage.delete(user_key) }
-        else
-          -> { api_key_ref_list_remove(storage, user_key, record["id"]) }
-        end
-        operations.each(&:call)
-      end
+      BetterAuth::APIKey::Adapter.delete(ctx, record, config)
     end
 
     def api_key_ref_list_add(storage, user_key, id)
-      ids = api_key_safe_parse_id_list(storage.get(user_key))
-      ids << id unless ids.include?(id)
-      storage.set(user_key, JSON.generate(ids))
+      BetterAuth::APIKey::Adapter.ref_list_add(storage, user_key, id)
     end
 
     def api_key_ref_list_remove(storage, user_key, id)
-      ids = api_key_safe_parse_id_list(storage.get(user_key)).reject { |existing| existing == id }
-      ids.empty? ? storage.delete(user_key) : storage.set(user_key, JSON.generate(ids))
+      BetterAuth::APIKey::Adapter.ref_list_remove(storage, user_key, id)
     end
 
     def api_key_safe_parse_id_list(raw)
-      return [] if raw.nil?
-
-      parsed = JSON.parse(raw.to_s)
-      parsed.is_a?(Array) ? parsed : []
-    rescue JSON::ParserError
-      []
+      BetterAuth::APIKey::Adapter.safe_parse_id_list(raw)
     end
 
     def api_key_storage_batch(storage, &block)
-      if storage.respond_to?(:batch)
-        storage.batch(&block)
-      else
-        block.call
-      end
+      BetterAuth::APIKey::Adapter.batch(storage, &block)
     end
 
     def api_key_storage_populate_reference(ctx, reference_id, records, config)
-      storage = api_key_storage(config, ctx.context)
-      return unless storage
-
-      ids = []
-      records.each do |record|
-        serialized = JSON.generate(api_key_storage_record(record))
-        expires_at = api_key_normalize_time(record["expiresAt"])
-        ttl = expires_at ? [(expires_at - Time.now).to_i, 0].max : nil
-        storage.set("api-key:#{record["key"]}", serialized, ttl)
-        storage.set("api-key:by-id:#{record["id"]}", serialized, ttl)
-        ids << record["id"]
-      end
-      ids.empty? ? storage.delete("api-key:by-ref:#{reference_id}") : storage.set("api-key:by-ref:#{reference_id}", JSON.generate(ids))
+      BetterAuth::APIKey::Adapter.populate_reference(ctx, reference_id, records, config)
     end
 
     def api_key_storage_record(record)
-      record.transform_values { |value| value.is_a?(Time) ? value.iso8601 : value }
+      BetterAuth::APIKey::Adapter.storage_record(record)
     end
 
     def api_key_deserialize_storage_record(record)
-      %w[createdAt updatedAt expiresAt lastRefillAt lastRequest].each do |field|
-        record[field] = api_key_normalize_time(record[field]) if record[field]
-      end
-      record
+      BetterAuth::APIKey::Adapter.deserialize_record(record)
     end
 
     def api_key_public(record, reveal_key: nil, include_key_field: false)
-      data = record.transform_keys(&:to_sym)
-      output = data.except(:key)
-      output[:configId] ||= api_key_record_config_id(record)
-      output[:referenceId] ||= api_key_record_reference_id(record)
-      output[:key] = reveal_key if include_key_field && reveal_key
-      output[:metadata] = api_key_decode_json(data[:metadata])
-      output[:permissions] = api_key_decode_json(data[:permissions])
-      output
+      BetterAuth::APIKey::Utils.public_record(record, reveal_key: reveal_key, include_key_field: include_key_field)
     end
 
     def api_key_migrate_legacy_metadata(ctx, record, config)
-      parsed = api_key_decode_json(record["metadata"])
-      return record unless parsed.is_a?(Hash)
-
-      encoded = api_key_encode_json(parsed)
-      return record.merge("metadata" => encoded) if record["metadata"] == encoded
-
-      updated = record.merge("metadata" => encoded)
-      if config[:storage] == "database" || config[:fallback_to_database]
-        ctx.context.adapter.update(model: API_KEY_TABLE_NAME, where: [{field: "id", value: record["id"]}], update: {metadata: encoded})
-      end
-      api_key_storage_set(ctx, updated, config) if config[:storage] == "secondary-storage"
-      updated
+      BetterAuth::APIKey::Adapter.migrate_legacy_metadata(ctx, record, config)
     end
 
     def api_key_background_tasks?(ctx)
-      ctx.context.options.advanced.dig(:background_tasks, :handler).respond_to?(:call)
+      BetterAuth::APIKey::Utils.background_tasks?(ctx)
     end
 
     def api_key_auth_required?(ctx)
-      !!(ctx.request || (ctx.headers && !ctx.headers.empty?))
+      BetterAuth::APIKey::Utils.auth_required?(ctx)
     end
 
     def api_key_get_from_headers(ctx, config)
-      getter = config[:custom_api_key_getter]
-      return getter.call(ctx) if getter.respond_to?(:call)
-
-      Array(config[:api_key_headers]).each do |header|
-        value = ctx.headers[header.to_s.downcase]
-        return value if value
-      end
-      nil
+      BetterAuth::APIKey::Keys.from_headers(ctx, config)
     end
 
     def api_key_check_permissions!(record, required)
-      return if required.nil? || required == {}
-
-      actual = api_key_decode_json(record["permissions"]) || {}
-      result = Role.new(actual).authorize(required)
-      unless result[:success]
-        raise APIError.new("UNAUTHORIZED", message: API_KEY_ERROR_CODES["KEY_NOT_FOUND"], code: "KEY_NOT_FOUND")
-      end
+      BetterAuth::APIKey::Validation.check_permissions!(record, required)
     end
 
     def api_key_encode_json(value)
-      return nil if value.nil?
-
-      JSON.generate(value)
+      BetterAuth::APIKey::Utils.encode_json(value)
     end
 
     def api_key_decode_json(value)
-      return nil if value.nil?
-      return value if value.is_a?(Hash)
-
-      parsed = JSON.parse(value.to_s)
-      parsed.is_a?(String) ? api_key_decode_json(parsed) : parsed
-    rescue JSON::ParserError
-      nil
+      BetterAuth::APIKey::Utils.decode_json(value)
     end
 
     def api_key_normalize_time(value)
-      return value if value.is_a?(Time)
-      return nil if value.nil?
-
-      Time.parse(value.to_s)
+      BetterAuth::APIKey::Utils.normalize_time(value)
     end
   end
 end