authentication-zero 2.16.31 → 2.16.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bff3de0a9b6c8fb09557b580d1f7bc3b9be99f71aadeb4e84d080be2ae022da
-  data.tar.gz: f014555758b4bc5d8c5c4f3b7a7eeb3aef9790ef5d0726b56d20ed59e7c2a32c
+  metadata.gz: e0192b708d0a77022c0ebcca72d6a67cddf4037e5412b78692b14871d8055dc3
+  data.tar.gz: beadfc9974865abbc3a64783d863e7ecffd9ed61d8134cb3db219ef9ab73b4a9
 SHA512:
-  metadata.gz: d48574ced8a36ac0e2ddb342176558b084f5bf892cf2cce8d8d96ee7183d59850bd170154c76cd6b1092a52bf6184b85353b592c9c395e5139a3536ac5e38468
-  data.tar.gz: 83079c90bdee50d97ffb2f9c89dad298491363568784792ca1012683ccca5f4f3203e0eb424a92f61c8c18ffc7783bc252f5c93338fa931fbefc2015682bc323
+  metadata.gz: c1b8a91979fa37f3486241f6ff40b726809bc196433bc67d3cb509b4adfc2afaf73afc4037a931237d6d0757d9f05a9b7a0e32e82a99d89baedd2ffb808d8b74
+  data.tar.gz: 5c542b08d8a748b7b041849eb3bda327439ec9c07dd53d4eb62bafb4caf727f480b2a9c2e4001b6b26e7bb58d1a18e6deea3a2a7770b1d5f44cbd36ccf4b8913

data/Gemfile.lock

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

data/README.md

@@ -68,16 +68,13 @@ 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 using `rails g migration add_account_to_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 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 `Session.joins(:user).find_by_id` on `ApplicationController#authenticate`
-  - Use `redirect_to "/#{user.account_id}"` after sign-in.
-  - Override `Current#user=` to also set the account using `super; self.account = user.account`
-  - etc...
+- 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.
+
+#### Set Current.account through the URL. `http://myapp.com/:account_id`
+
+- Add `require_relative "../lib/account_middleware"` to `config/application.rb`.
+- Add `config.middleware.use AccountMiddleware` to your application class.
 
 ## Development
 

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.16.31"
+  VERSION = "2.16.33"
 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,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/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 :account, 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.31
+  version: 2.16.33
 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: