authtown 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b75bcb24f21f87172f654d1d987c6fba611ffdd03b6a4bc65dc5e8aeed65324c
-  data.tar.gz: 62111ad44b4391e6a2300e38ede4e55638c4239a3d1f71fd74ce5a22613c9a53
+  metadata.gz: 5618c4b915887279ad6bfd3ba639756a63b92d1361fe3c5ef7d64fc1a9787f08
+  data.tar.gz: 488925cf2004d158d77893acfa68566469e19b29e03abfe48d6469b4a00ebbf8
 SHA512:
-  metadata.gz: f9bd62d8b2e309d9adf91d8751d5d7a8843f7306220052790f98baf97b1c929140fb3f4661ed724df83417cf196a7f4590803f354f7524903e2213de7c59bbdf
-  data.tar.gz: d34c203ead7a8ae36a0e064cc2c4764d186705d95addc83b1c7d9c3a0ed2896e16e162a2eb80e2784a9ea9a93ece6da075b6466e21266a95fc1e4fb2abf9ea89
+  metadata.gz: 89644f9c86b9202faa8616c868956aa59a1f668418737092cb27181ba2a4d147886b6566a24c7110f3d91176acb279b92999c2cdd07b476b16466a9d4cdca1ea
+  data.tar.gz: 7323afa6ab4142c31a4eaf5f3e22d64fa8a7b0a106075328b299413bf2e7569ddad1017c7b428ca00a44938fd1a703b722def67e258c772816f75b8b3118b9cb

data/CHANGELOG.md

@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- ...
+## [0.2.0] - 2024-04-03
+
+- Integration with new bridgetown_sequel gem tested
 
 ## [0.1.0] - YYYY-MM-DD
 

data/lib/authtown/routes/rodauth.rb

@@ -9,7 +9,11 @@ module Authtown
         rodauth.load_memory
 
         init_current_user
-        Lifeform::Form.rodauth = rodauth
+
+        # hook :authtown, :initialized do |rodauth|
+        #   Lifeform::Form.rodauth = rodauth
+        # end
+        Bridgetown::Hooks.trigger(:authtown, :initialized, rodauth)
 
         r.on "auth" do
           r.rodauth
@@ -20,7 +24,8 @@ module Authtown
         Authtown::Current.user =
           if rodauth.logged_in?
             account_id = rodauth.account_from_session[:id]
-            User.find(account_id)
+            user_class = bridgetown_site.config.authtown.user_class_resolver.()
+            user_class[account_id]
           end
       end
     end

data/lib/authtown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Authtown
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/authtown.rb

@@ -5,35 +5,50 @@ require "mail"
 require "authtown/builder"
 require "authtown/view_mixin"
 
-# REQUIRES:
-# init :"bridgetown-activerecord", sequel_support: :postgres
-
-# ActiveRecord schema:
+# rubocop:disable Layout/LineLength
+### Simple migration strategy:
 #
-# class CreateUsers < ActiveRecord::Migration[7.0]
-#   def change
-#     create_table :users do |t|
-#       t.string :email, null: false, index: { unique: true }
-#       t.string :first_name
-#       t.string :password_hash, null: false
-#       t.timestamps
+# Sequel.migration do
+#   change do
+#     extension :date_arithmetic
+
+#     create_table(:users) do
+#       primary_key :id, type: :Bignum
+#       citext :email, null: false
+#       constraint :valid_email, email: /^[^,;@ \r\n]+@[^,@; \r\n]+\.[^,@; \r\n]+$/
+#       String :first_name
+#       String :password_hash, null: false
+#       index :email, unique: true
 #     end
-#   end
-# end
-#
-# class CreateAccountRememberKeys < ActiveRecord::Migration[7.0]
-#   def change
-#     create_table :account_remember_keys do |t|
-#       t.foreign_key :users, column: :id
-#       t.string :key, null: false
-#       t.datetime :deadline, null: false
+
+#     # Used by the remember me feature
+#     create_table(:account_remember_keys) do
+#       foreign_key :id, :users, primary_key: true, type: :Bignum
+#       String :key, null: false
+#       DateTime :deadline, { null: false, default: Sequel.date_add(Sequel::CURRENT_TIMESTAMP, days: 30) }
+#     end
+
+#     create_table(:account_password_reset_keys) do
+#       foreign_key :id, :users, primary_key: true, type: :Bignum
+#       String :key, null: false
+#       DateTime :deadline, { null: false, default: Sequel.date_add(Sequel::CURRENT_TIMESTAMP, days: 1) }
+#       DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
 #     end
 #   end
 # end
+# rubocop:enable Layout/LineLength
 
-class Authtown::Current < ActiveSupport::CurrentAttributes
-  # @!parse def self.user = User.new
-  attribute :user
+Thread.attr_accessor :authtown_state
+class Authtown::Current
+  class << self
+    def thread_state = Thread.current.authtown_state ||= {}
+
+    def user=(new_user)
+      thread_state[:user] = new_user
+    end
+
+    def user = thread_state[:user]
+  end
 end
 
 # rubocop:disable Metrics/BlockLength
@@ -42,9 +57,13 @@ end
 Bridgetown.initializer :authtown do |
   config,
   rodauth_config: nil,
-  account_landing_page: "/account/profile"
+  account_landing_page: "/account/profile",
+  user_class_resolver: -> { User }
   |
 
+  config.authtown ||= {}
+  config.authtown.user_class_resolver ||= user_class_resolver
+
   config.only :server do
     require "authtown/routes/rodauth"
 
@@ -56,9 +75,11 @@ Bridgetown.initializer :authtown do |
       app.plugin(:sessions, secret:)
 
       app.plugin :rodauth do
-        enable :login, :logout, :create_account, :remember, :reset_password
+        enable :login, :logout, :create_account, :remember, :reset_password, :internal_request
         hmac_secret secret
 
+        base_url config.url
+
         prefix "/auth"
 
         login_redirect account_landing_page
@@ -92,7 +113,7 @@ Bridgetown.initializer :authtown do |
           # Make sure timestamps get saved
           account[:created_at] = account[:updated_at] = Time.now
 
-          account[:first_name] = param(:first_name)
+          account[:first_name] = param(:first_name) if param(:first_name)
         end
 
         after_login do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authtown
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-27 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rodauth integration for Bridgetown