foobara-auth 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625eea5256db4cac1d98cb6b0483b8cbc9c47d91225f0f0736581df8a5a1636c
-  data.tar.gz: 0a51402e5ec2ce711ad7c62ef18aadbe23ff03f2ecb775516be35514e78ef89f
+  metadata.gz: 39a1c84b35482f06f620033be6d576030c4de3b6d440ecc8d4ecaba90c2cf126
+  data.tar.gz: daa37fb14dfcd8be6fc50e9f356f0209fb8a78ee73e741157507f4c700f464af
 SHA512:
-  metadata.gz: 922de34a2a3343f55152a5d754b0e6a0c1b7e97bc868891e607018f73dcb8aec5dbee9408e3886a100057764de42039676204b5ffac48d2377e2ad5af777695f
-  data.tar.gz: 056a01756020a541633ea7467792079f8841c4c8135f7d84054efbab62c0360888b61e9ddf817c8ad67af4ef7a61e9feefae60e348d7c95cbfd0087a2d31c35f
+  metadata.gz: 8b90d812a7a6f459a097ebd8602848ab81bab0dfc16f1dbaaa009c3be71aefa5f6c078f167b648333092ae8072f2d8545dd44937d40e12f81f70438a65df36da
+  data.tar.gz: 2e7ad097761cd1831bc58762e78e523bd8d50507758f922d34fb4ed2a0b8474fb3d4f77c4bd8993a8c7db6b05d0bc8e6b4f4fef9435fb25fb2a1ed84c6b8d649

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.11] - 2025-05-01
+
+- Add a runtime error when an api key doesn't exist
+
+## [0.0.10] - 2025-04-28
+
+- Add AuthenticateWithApiKey command
+
 ## [0.0.9] - 2025-04-22
 
 - Handle malformed jwt tokens

data/src/authenticate_with_api_key.rb

@@ -0,0 +1,66 @@
+require_relative "verify_token"
+
+module Foobara
+  module Auth
+    class AuthenticateWithApiKey < Foobara::Command
+      class InvalidApiKeyError < Foobara::RuntimeError
+        context({})
+        message "Invalid api key"
+      end
+
+      class ApiKeyDoesNotExistError < Foobara::RuntimeError
+        context({})
+        message "No such key"
+      end
+
+      depends_on VerifyToken
+      depends_on_entities Types::Token
+
+      inputs do
+        api_key :string, :required, :sensitive
+        access_token_ttl :integer, default: 30 * 60
+        api_key_ttl :integer, default: 7 * 24 * 60 * 60
+      end
+
+      result [Types::User, Types::Token]
+
+      def execute
+        determine_api_key_id_and_secret
+        load_api_key_record
+        verify_api_key
+
+        load_user
+
+        user_and_credential
+      end
+
+      attr_accessor :expires_at, :api_key_record, :api_key_id, :api_key_secret, :user
+
+      def determine_api_key_id_and_secret
+        self.api_key_id, self.api_key_secret = api_key.split("_")
+      end
+
+      def load_api_key_record
+        self.api_key_record = Types::Token.load(api_key_id)
+      rescue Foobara::Entity::NotFoundError
+        add_runtime_error(ApiKeyDoesNotExistError)
+      end
+
+      def verify_api_key
+        valid = run_subcommand!(VerifyToken, token_string: api_key)
+
+        unless valid[:verified]
+          add_runtime_error(InvalidApiKeyError)
+        end
+      end
+
+      def load_user
+        self.user ||= Types::User.that_owns(api_key_record, "api_keys")
+      end
+
+      def user_and_credential
+        [user, api_key_record]
+      end
+    end
+  end
+end

data/src/refresh_login.rb

@@ -6,11 +6,6 @@ module Foobara
         message "Invalid refresh token"
       end
 
-      class RefreshTokenNotOwnedByUser < Foobara::RuntimeError
-        context refresh_token_id: :string
-        message "This refresh token is not owned by this user"
-      end
-
       depends_on CreateRefreshToken, VerifyToken, BuildAccessToken
       depends_on_entities Types::Token
 
@@ -32,6 +27,8 @@ module Foobara
         # Delete it instead maybe?
         mark_refresh_token_as_used
 
+        load_user
+
         generate_access_token
         generate_new_refresh_token
 
@@ -39,7 +36,7 @@ module Foobara
       end
 
       attr_accessor :access_token, :new_refresh_token, :expires_at, :refresh_token_record,
-                    :refresh_token_id, :refresh_token_secret
+                    :refresh_token_id, :refresh_token_secret, :user
 
       def determine_refresh_token_id_and_secret
         self.refresh_token_id, self.refresh_token_secret = refresh_token.split("_")
@@ -65,8 +62,8 @@ module Foobara
         self.access_token = run_subcommand!(BuildAccessToken, user:, token_ttl: access_token_ttl)
       end
 
-      def user
-        @user ||= Types::User.that_owns(refresh_token_record, "refresh_tokens")
+      def load_user
+        self.user ||= Types::User.that_owns(refresh_token_record, "refresh_tokens")
       end
 
       def generate_new_refresh_token

data/src/register.rb

@@ -2,6 +2,7 @@ require_relative "types/user"
 
 module Foobara
   module Auth
+    # TODO: should raise error if username or email already in use!
     class Register < Foobara::Command
       depends_on CreateUser, SetPassword
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: argon2
@@ -64,6 +64,7 @@ files:
 - README.md
 - lib/foobara/auth.rb
 - src/approve_token.rb
+- src/authenticate_with_api_key.rb
 - src/build_access_token.rb
 - src/build_secret.rb
 - src/create_api_key.rb
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Provides various auth domain commands and models
 test_files: []