foobara-auth 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29222c9e1b4418b49c88107de989af8ad1f082e26416cb9ce0e51de8f1625b17
-  data.tar.gz: a729451915a9baf22f982f2488677b3695cf7d08b2184a42d11ffaaaafc4b75d
+  metadata.gz: 2294ad68967bcfb48ae829b39b3926d163c6652c918d9fc2b68e5df2f4b74cff
+  data.tar.gz: a0203c7d78f6720fb988779fa0ce7a8d72102a8dea69d91347b7b2eead8c6c6e
 SHA512:
-  metadata.gz: 30b806538de1cd5202fd979cbb10dc235841bb8c9cf358ffacdafcee8f7f3b2f9db5857ff4c54efd70e8002a1b73ccfefc8e1e7876e9327a79113c744240160a
-  data.tar.gz: f17ef76c86bd23b76019b90bcbad937e98719deb896b2e2499e4aa86fc6737cbd8f07240b81018074f75b90e403629aff75ec22bdb15b192e3917725e5ce8435
+  metadata.gz: 11827d66647dc3ccc4c8ed5a9aa77b4d6ffeb92d17d43cf286c2bcc3b5ddcb1bb85b287621e44f761b5aa95e765dc3f0e4f6c32299099ea8cab9ccdda55a5bee
+  data.tar.gz: d006943c733372ddbed6cd7d5714dc7f968c4bb69ccd376691d9f260575813ff70c503beedfdb0e0d310606c8c113b107fd4f29c4e553dd1307e23f9f18037a3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.4] - 2025-03-29
+
+- Do not pass user into RefreshLogin
+
+## [0.0.3] - 2025-03-28
+
+- Allow not having an email
+
 ## [0.0.2] - 2025-03-21
 
 - Implement/test lots of basic auth behavior such as

data/src/refresh_login.rb

@@ -18,10 +18,10 @@ module Foobara
       end
 
       depends_on CreateToken, VerifyToken
+      depends_on_entities Types::Token
 
       inputs do
-        user Types::User, :required
-        refresh_token_text :string, :required, :sensitive
+        refresh_token :string, :required, :sensitive
         # Can we get these TTLs off of the refresh token?
         token_ttl :integer, default: 30 * 60
         refresh_token_ttl :integer, default: 7 * 24 * 60 * 60
@@ -34,8 +34,7 @@ module Foobara
 
       def execute
         determine_refresh_token_id_and_secret
-        load_refresh_token
-        validate_refresh_token_belongs_to_user
+        load_refresh_token_record
         verify_refresh_token
         # Delete it instead maybe?
         mark_refresh_token_as_used
@@ -49,25 +48,19 @@ module Foobara
         tokens
       end
 
-      attr_accessor :access_token, :new_refresh_token, :now, :expires_at, :refresh_token,
+      attr_accessor :access_token, :new_refresh_token, :now, :expires_at, :refresh_token_record,
                     :refresh_token_id, :refresh_token_secret, :token_group
 
       def determine_refresh_token_id_and_secret
-        self.refresh_token_id, self.refresh_token_secret = refresh_token_text.split("_")
+        self.refresh_token_id, self.refresh_token_secret = refresh_token.split("_")
       end
 
-      def load_refresh_token
-        self.refresh_token = Types::Token.load(refresh_token_id)
-      end
-
-      def validate_refresh_token_belongs_to_user
-        unless user.refresh_tokens.any? { |token| token.id == refresh_token_id }
-          add_runtime_error(RefreshTokenNotOwnedByUser.new(context: { refresh_token_id: }))
-        end
+      def load_refresh_token_record
+        self.refresh_token_record = Types::Token.load(refresh_token_id)
       end
 
       def verify_refresh_token
-        valid = run_subcommand!(VerifyToken, token_string: refresh_token_text)
+        valid = run_subcommand!(VerifyToken, token_string: refresh_token)
 
         unless valid[:verified]
           add_runtime_error(InvalidRefreshTokenError.new(context: { refresh_token_id: }))
@@ -75,7 +68,7 @@ module Foobara
       end
 
       def mark_refresh_token_as_used
-        refresh_token.use_up!
+        refresh_token_record.use_up!
       end
 
       def determine_timestamps
@@ -93,6 +86,10 @@ module Foobara
         self.access_token = JWT.encode(payload, jwt_secret, "HS256")
       end
 
+      def user
+        @user ||= Types::User.that_owns(refresh_token_record, "refresh_tokens")
+      end
+
       def jwt_secret
         jwt_secret_text = ENV.fetch("JWT_SECRET", nil)
 
@@ -106,7 +103,7 @@ module Foobara
       end
 
       def determine_token_group
-        self.token_group = refresh_token&.token_group || SecureRandom.uuid
+        self.token_group = refresh_token_record&.token_group || SecureRandom.uuid
       end
 
       def generate_new_refresh_token

data/src/register.rb

@@ -7,7 +7,7 @@ module Foobara
 
       inputs do
         username :string, :required
-        email :email, :required
+        email :email, :allow_nil
         plaintext_password :string, :allow_nil, :sensitive_exposed
       end
 
@@ -15,6 +15,7 @@ module Foobara
 
       def execute
         create_user
+
         if password?
           set_password
         end

data/src/types/user.rb

@@ -8,7 +8,7 @@ module Foobara
         attributes do
           id :integer
           username :string, :required
-          email :email, :required
+          email :email, :allow_nil
           roles [Types::Role], default: []
           api_keys [Types::Token], :sensitive, default: []
           refresh_tokens [Types::Token], :sensitive, default: []

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: argon2
@@ -41,16 +41,16 @@ dependencies:
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 email:
 - azimux@gmail.com
 executables: []