From da6ddb765d114bf3420d2539c437022584efb858 Mon Sep 17 00:00:00 2001
From: Jared White <jared@jaredwhite.com>
Date: Wed, 3 Apr 2024 13:44:13 -0700
Subject: [PATCH] Integration with new bridgetown_sequel gem tested

---
 CHANGELOG.md    |  4 +++-
 lib/authtown.rb | 49 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551e8f1..83ef214 100644
--- a/CHANGELOG.md
+++ b/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
 
diff --git a/lib/authtown.rb b/lib/authtown.rb
index ded7ce4..ca3998e 100644
--- a/lib/authtown.rb
+++ b/lib/authtown.rb
@@ -5,25 +5,33 @@
 require "authtown/builder"
 require "authtown/view_mixin"
 
-# ActiveRecord schema:
+### 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
@@ -65,9 +73,12 @@ def user = thread_state[:user]
       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
@@ -101,7 +112,7 @@ def user = thread_state[:user]
           # 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