authentication-zero 2.16.30 → 2.16.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d24c61ab47e57ff3f4e61f6871063cc0eddd0bae159bad0a6033c13b6d11d27
-  data.tar.gz: 5603c75ec12c501b2e4de8165c79fa98011a1509ad9728911a71a2ea5f1ed823
+  metadata.gz: c282c63840e3d6072f86c899f4a477296f2d5145317b715c00e2a434a2c2a565
+  data.tar.gz: 6f45065151e320e21a01c58a6daf2cf4101780428d6fd6d14341722aaec1bbd1
 SHA512:
-  metadata.gz: ef99f6854ac55716a68f6439c14f33d9ad073c87374a2aa5434377d0fdefda107e6311692362c00e0ca9cb6a9b6b304f10a0ffd33b2373b27af0e3a1d32d8584
-  data.tar.gz: d0d7a47777f70acb660bf9c8865967d6eda63147f764ab15abd3e0f41d119a31ed51553fe2ce132a56c7b3abf0221e82d7f22b4814d54214aae90db332fc71ea
+  metadata.gz: 25ff1fc4f8822b6edaad54cd754b1b14ecfe89bfd6afb195942fce0974e3907852aea9a6fef643cffcd01351f992eaf3524bf0a92e773ff7ed97669de11ff0d6
+  data.tar.gz: c1d3fa6bc16f41f0826edd2121910ead50c01137cdbf42a7140dd1625eaadab5606678986022d28a9972ca1aef0669e7bb4ab2f1fa5dacdf2b130365963cd6f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (2.16.30)
+    authentication-zero (2.16.32)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -68,13 +68,16 @@ Use `before_action :require_sudo` in controllers with sensitive information, it
 
 Some artifacts are generated in the application, which makes it possible to implement row-level multitenancy applications. You should follow some steps to make it work.
 
-- Add `account_id` to each scoped table, ex. `rails g migration projects account:references`.
-- Add `include AccountScoped` to scoped models. It set up the relationship with the account and default scope using the current account.
-- The `Current.account` is set according to the url ex: `http://mywebsite.com/1234/projects`.
-- You should customize the sign-in flow yourself, it means:
-  - Add the `account_id` column and scope your user model.
-  - Assign the account when the user is created.
-  - After sign-in redirect to the correct url, including the `account_id`.
+- Add `account_id` to each scoped table using `rails g migration add_account_to_projects account:references`.
+- Add `include AccountScoped` to scoped models. It set up the account relationship and default scope using the current account.
+- The `Current.account` is set according to the url. `http://mywebsite.com/1234/projects`.
+- You should customize the authentication flow yourself, it means:
+  - Add `account_id` to your users table using `rails g migration add_account_to_users account:references`.
+  - Add `include AccountScoped` to your user model.
+  - Use `joins(:user).find_by_id...` in the `authenticate` method.
+  - Use `redirect_to "/#{user.account_id}"` after sign-in.
+  - Override `Current#user=` to also set the account, `super; self.account = user.account`.
+  - etc...
 
 ## Development
 

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.16.30"
+  VERSION = "2.16.32"
 end

data/lib/generators/authentication/templates/lib/account_middleware.rb

@@ -8,9 +8,9 @@ class AccountMiddleware
 
     _, account_id, request_path = request.path.split("/", 3)
 
-    if is_number?(account_id)
+    if identifier?(account_id)
       set_current_account(account_id)
-      
+
       request.script_name = "/#{account_id}"
       request.path_info   = "/#{request_path}"
       @app.call(request.env)
@@ -20,11 +20,11 @@ class AccountMiddleware
   end
 
   private
-    def is_number?(value)
-      Integer(value, exception: false)
+    def identifier?(value)
+      Integer(value, exception: false) != nil
     end
 
     def set_current_account(account_id)
-      Current.account = Account.find(account_id)
+      Current.account = Account.find_by_id(account_id)
     end
 end

data/lib/generators/authentication/templates/models/concerns/account_scoped.rb

@@ -2,10 +2,7 @@ module AccountScoped
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :account
-
-    default_scope do
-      where(account: Current.account || raise("You must set an account"))
-    end
+    belongs_to :account    
+    default_scope { where account: Current.account }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 2.16.30
+  version: 2.16.32
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies: []
 description:
 email: