authentication-zero 2.16.32 → 2.16.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c282c63840e3d6072f86c899f4a477296f2d5145317b715c00e2a434a2c2a565
-  data.tar.gz: 6f45065151e320e21a01c58a6daf2cf4101780428d6fd6d14341722aaec1bbd1
+  metadata.gz: a7a21585c929c9c8eee8d33a9709add052a69019db2d1cdec5dce194afc36c67
+  data.tar.gz: f4424c1a4166d1394fb1dc573edc0e8d90893d7e91347a9d6340de88d73f5d37
 SHA512:
-  metadata.gz: 25ff1fc4f8822b6edaad54cd754b1b14ecfe89bfd6afb195942fce0974e3907852aea9a6fef643cffcd01351f992eaf3524bf0a92e773ff7ed97669de11ff0d6
-  data.tar.gz: c1d3fa6bc16f41f0826edd2121910ead50c01137cdbf42a7140dd1625eaadab5606678986022d28a9972ca1aef0669e7bb4ab2f1fa5dacdf2b130365963cd6f2
+  metadata.gz: 45a0d2d68c6debd1c161a9c42d31263b0da1ac91ecf754f4675032e26abe208dc571f74a65b8a2a2109be3a6d66aa964a385ffd5d71c94de7c1d895b5a15e899
+  data.tar.gz: 131dbe9839a99f982cbb271474c93ac7b10f398f770bc4827a4deb22c1ec615d8a5d1869e8ef8eccad522a17b3736708d7fef3e907c98b1caaf8be27a966cebc

data/Gemfile.lock

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

data/README.md

@@ -66,18 +66,18 @@ Use `before_action :require_sudo` in controllers with sensitive information, it
 
 ### Tenantable
 
-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.
+Some artifacts are generated in the application, which makes it possible to implement row-level multitenancy applications. The `Current.account` is set using the current user account.
 
-- Add `account_id` to each scoped table using `rails g migration add_account_to_projects account:references`.
+You should follow some steps to make it work:
+
+- Add `account_id` to each scoped table. ex: `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...
+
+Set `Current.account` through the URL. `http://myapp.com/:account_id`. (optional)
+
+- Add `require_relative "../lib/account_middleware"` to `config/application.rb`.
+- Add `config.middleware.use AccountMiddleware` to your application class.
+- More customization is required...
 
 ## Development
 

data/lib/authentication_zero/version.rb

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

data/lib/generators/authentication/authentication_generator.rb

@@ -54,11 +54,6 @@ class AuthenticationGenerator < Rails::Generators::Base
     application "config.action_mailer.default_url_options = { host: \"localhost\", port: 3000 }", env: "development"
     application "config.action_mailer.default_url_options = { host: \"localhost\", port: 3000 }", env: "test"
     environment ratelimit_block, env: "production" if options.ratelimit?
-
-    if options.tenantable?
-      prepend_to_file "config/application.rb", "require_relative \"../lib/account_middleware\"\n"
-      application "config.middleware.use AccountMiddleware"
-    end
   end
 
   def create_configuration_files

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

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

data/lib/generators/authentication/templates/migrations/create_users_migration.rb.tt

@@ -16,6 +16,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.string :provider
       t.string :uid
       <%- end -%>
+      <%- if options.tenantable? %>
+      t.references :account, null: false, foreign_key: true
+      <%- end -%>
 
       t.timestamps
     end

data/lib/generators/authentication/templates/models/account.rb.tt

@@ -1,2 +1,3 @@
 class Account < ApplicationRecord
+  has_one :user, dependent: :destroy
 end

data/lib/generators/authentication/templates/models/current.rb.tt

@@ -8,4 +8,9 @@ class Current < ActiveSupport::CurrentAttributes
   def session=(session)
     super; self.user = session.user
   end
+  <%- if options.tenantable? %>
+  def user=(user)
+    super; self.account = user.account
+  end
+  <%- end -%>
 end

data/lib/generators/authentication/templates/models/user.rb.tt

@@ -1,5 +1,8 @@
 class User < ApplicationRecord
   has_secure_password
+  <%- if options.tenantable? %>
+  belongs_to :account
+  <%- end -%>
 
   has_many :email_verification_tokens, dependent: :destroy
   has_many :password_reset_tokens, dependent: :destroy
@@ -31,15 +34,20 @@ class User < ApplicationRecord
     self.verified = false
   end
   <%- if two_factor? %>
-  before_create do
+  before_validation on: :create do
     self.otp_secret = ROTP::Base32.random
   end
   <%- end -%>
   <%- if webauthn? %>
-  before_create do
+  before_validation on: :create do
     self.webauthn_id = WebAuthn.generate_user_id
   end
   <%- end -%>
+  <%- if options.tenantable? %>
+  before_validation on: :create do
+    self.account = Account.new
+  end
+  <%- end -%>
 
   after_update if: :password_digest_previously_changed? do
     sessions.where.not(id: Current.session).delete_all

metadata

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