Its been a while

db/migrate/20250613174349_devise_create_users.rb

@@ -7,6 +7,12 @@ class DeviseCreateUsers < ActiveRecord::Migration[7.2]
       t.string :email,              null: false, default: ""
       t.string :encrypted_password, null: false, default: ""
 
+      t.string :name, default: ""
+      t.integer :role, null: false
+      t.integer :role_id, null: false
+
+      t.string :jti, null: false
+
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
@@ -37,7 +43,8 @@ class DeviseCreateUsers < ActiveRecord::Migration[7.2]
     end
 
     add_index :users, :email,                unique: true
-    add_index :users, :reset_password_token, unique: true
+    add_index :users, :reset_password_token, unique: false
+    add_index :users, :jti,                  unique: true
     # add_index :users, :confirmation_token,   unique: true
     # add_index :users, :unlock_token,         unique: true
   end

db/migrate/20260128000001_create_blacklisted_tokens.rb

@@ -1,14 +0,0 @@
-class CreateBlacklistedTokens < ActiveRecord::Migration[7.2]
-  def change
-    create_table :blacklisted_tokens do |t|
-      t.string :jti, null: false
-      t.references :user, null: false, foreign_key: true
-      t.datetime :exp, null: false
-
-      t.timestamps
-    end
-
-    add_index :blacklisted_tokens, :jti, unique: true
-    add_index :blacklisted_tokens, :exp
-  end
-end

db/migrate/20260128000003_add_role_to_users.rb

@@ -1,6 +0,0 @@
-class AddRoleToUsers < ActiveRecord::Migration[7.2]
-  def change
-    add_column :users, :role, :integer, default: 0, null: false
-    add_index :users, :role
-  end
-end

db/old/20260128000001_create_retired_tokens.rb

@@ -0,0 +1,14 @@
+class CreateRetiredTokens < ActiveRecord::Migration[7.2]
+  def change
+    create_table :retired_tokens do |t|
+      t.string :jti, null: false
+      t.references :user, null: false, foreign_key: true
+      t.datetime :exp, null: false
+
+      t.timestamps
+    end
+
+    add_index :retired_tokens, :jti, unique: true
+    add_index :retired_tokens, :exp
+  end
+end

db/old/20260128000003_add_role_and_name_to_users.rb

@@ -0,0 +1,9 @@
+class AddRoleAndNameToUsers < ActiveRecord::Migration[7.2]
+  def change
+    # add_column :users, :role, :integer, default: 0, null: false
+    # add_column :users, :role_id, :integer, null: false
+    # add_column :users, :name, :string, null: false
+
+    # add_index :users, :role
+  end
+end

db/schema.rb

@@ -10,47 +10,21 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_01_28_000003) do
-  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
-
-  create_table "blacklisted_tokens", force: :cascade do |t|
-    t.string "jti", null: false
-    t.bigint "user_id", null: false
-    t.datetime "exp", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["exp"], name: "index_blacklisted_tokens_on_exp"
-    t.index ["jti"], name: "index_blacklisted_tokens_on_jti", unique: true
-    t.index ["user_id"], name: "index_blacklisted_tokens_on_user_id"
-  end
-
-  create_table "refresh_tokens", force: :cascade do |t|
-    t.string "token", null: false
-    t.bigint "user_id", null: false
-    t.datetime "expires_at", null: false
-    t.boolean "revoked", default: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["token"], name: "index_refresh_tokens_on_token", unique: true
-    t.index ["user_id", "revoked"], name: "index_refresh_tokens_on_user_id_and_revoked"
-    t.index ["user_id"], name: "index_refresh_tokens_on_user_id"
-  end
-
+ActiveRecord::Schema[7.2].define(version: 2025_06_13_174349) do
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
+    t.string "name", default: ""
+    t.integer "role", null: false
+    t.integer "role_id", null: false
+    t.string "jti", null: false
     t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer "role", default: 0, null: false
     t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-    t.index ["role"], name: "index_users_on_role"
+    t.index ["jti"], name: "index_users_on_jti", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token"
   end
-
-  add_foreign_key "blacklisted_tokens", "users"
-  add_foreign_key "refresh_tokens", "users"
 end