revise_auth-jets 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad5830138b573376c725bdd2f4cf927451b5ba9f561b45cd88b5235e438459d6
-  data.tar.gz: 6458c724a0afcd5164c6cb1a3d822fdcfc7da9f3d22234057a24b2e6e4d7d90a
+  metadata.gz: 4d7f8607296f85c60596d66ab6b170ed3013a7c576df2d3ce42e7a8f42d25e1e
+  data.tar.gz: c28a1cf711470e29022bbab31597d5ac108182cf81bf49b8c08f6a371683b68e
 SHA512:
-  metadata.gz: a1b995b99756a0626ac174ccbba43aa4444f2136c87f91482192799e9f53baf00702e9ce73534af5302050eb75a4fb2024dcab1ce94de030f1fe978ebe94fc78
-  data.tar.gz: 4d4503bbdd0025ae4a5a966bb82ea0740a251190d1e5b1514f287ae0704b9edc1ed683100a118e81eeed7d264782090572a69aa1bb76ebc9b4e6b0e1837c7b7f
+  metadata.gz: afa893fe4641ca6d245730c128fe2a9fdc6d564bc9d7ac3c5ae6d1b66bda242d2bd49f223b359517ae80d71c81c5c48b017291d3ffb3d923cee297f4e2e8a2c5
+  data.tar.gz: 7c466b2cf6849ce8336388931a3865d61ce4d0bc46abc8077f4d7da1d25e5a3e194d8b96a9b412ec520b8c684ddc9b25f40886e4b5f513642c4155ea4cf55a08

data/README.md

@@ -12,12 +12,17 @@ bundle add "revise_auth-jets"
 
 And then execute the following to generate a `User` model (optionally adding other fields such as `first_name` and `last_name`):
 ```bash
-$ jets g revise_auth:model User first_name last_name
+$ jets g revise_auth:model User
 $ jets db:migrate
 $ jets g revise_auth:views
 ```
 
-Add ActiveRecord::Base.signed_id_verifier_secret = "custom_verfifier_secret" in your initializers. Set this as an env var
+Add
+```
+require "active_record"
+ActiveRecord::Base.signed_id_verifier_secret = "custom_verfifier_secret"
+```
+in your initializers. Set this as an env var
 
 
 Create your app/mailer/application_mailer.rb
@@ -45,7 +50,7 @@ ex:
     password:             'YOUR_PASS',
     authentication:       'plain'}
 ```
-  To get your stmp pass follow these steps
+To get your stmp pass follow these steps
 
 You need to make a password for specific app
 

data/Rakefile

@@ -1,3 +1,6 @@
+require "jets"
+Jets.load_tasks
+
 require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"

data/app/config/routes.rb

@@ -4,7 +4,6 @@ Jets.application.routes.draw do
   get "authenticated", to: "main#authenticated", as: :authenticated
 
   scope module: :revise_auth do
-
     get "sign_up", to: "registrations#new", as: :sign_up
     post "sign_up", to: "registrations#create"
     get "login", to: "sessions#new", as: :login
@@ -23,6 +22,24 @@ Jets.application.routes.draw do
     delete "logout", to: "sessions#delete"
   end
 
+  # Admin Routes
+  namespace :admin do
+    # resource :users
+    get "users/:id", to: "users#show", as: :admin_users_show
+    patch "users", to: "users#update", as: :admin_users
+    delete "users/:id", to: "users#delete", as: :admin_users
+    get "users", to: "users#index", as: :admin_users
+    get "dashboard", to: "dashboard#show", as: :admin
+    root "dashboard#show"
+  end
+
+  # API routes
+  namespace :api do
+    namespace :v1 do
+      resource :me, only: :show
+    end
+  end
+
   # The jets/public#show controller can serve static utf8 content out of the public folder.
   # Note, as part of the deploy process Jets uploads files in the public folder to s3
   # and serves them out of s3 directly. S3 is well suited to serve static assets.

data/app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,5 @@
+class Admin::DashboardController < AdminController
+  def show
+    @users = User.all
+  end
+end

data/app/controllers/admin/users_controller.rb

@@ -0,0 +1,54 @@
+class Admin::UsersController < AdminController
+  before_action :set_user, only: [:show, :edit, :destroy, :switch]
+
+  def index
+    @users = User.all
+  end
+
+  # GET /accounts/1
+  def show
+    @tokens = @user.api_tokens
+  end
+
+  def create
+  end
+
+  def update
+    @user = User.find(params[:user][:id])
+    email = @user.email
+    @user.update(email_params)
+    if email != params[:user][:unconfirmed_email]
+      @user.confirmation_sent_at = Time.now
+      @user.save
+      @user.send_confirmation_instructions
+      # flash[:notice] = I18n.t("revise_auth.confirmation_email_sent", email: current_user.unconfirmed_email)
+    end
+    redirect_back(fallback_location: root_path)
+  end
+
+  # GET /accounts/new
+  def new
+    @user = User.new
+  end
+
+  # GET /accounts/1/edit
+  def edit
+  end
+
+  # DELETE /accounts/1
+  def delete
+    ApiToken.find_by(token: params[:id]).destroy
+    redirect_back(fallback_location: root_path)
+  end
+
+  private
+
+  def email_params
+    params.require(:user).permit(:first_name, :last_name, :unconfirmed_email)
+  end
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_user
+    @user = User.find(params[:id])
+  end
+end

data/app/controllers/admin_controller.rb

@@ -0,0 +1,16 @@
+class AdminController < ReviseAuthController
+  layout "admin_application"
+  before_action :authenticate_admin
+  before_action :gravatar_url
+
+  def authenticate_admin
+    redirect_to "/", alert: "Not authorized." unless current_user&.admin?
+  end
+
+  def gravatar_url
+    options = {}
+    hash = Digest::MD5.hexdigest(current_user.email&.downcase || "")
+    options.reverse_merge!(default: :mp, rating: :pg, size: 48)
+    @grav = "https://secure.gravatar.com/avatar/#{hash}.png?#{options.to_param}"
+  end
+end

data/app/controllers/api/base_controller.rb

@@ -0,0 +1,42 @@
+class Api::BaseController < ApplicationController
+  include ReviseAuth::Authentication
+  skip_before_action :verify_authenticity_token
+  prepend_before_action :authenticate_api_token!
+  rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
+  rescue_from ActionController::ParameterMissing, with: :handle_parameter_missing
+
+  private
+
+  def record_not_found
+    render json: {error: "Record Not Found"}, status: :not_found
+  end
+
+  def handle_parameter_missing(exception)
+    render json: {error: exception.message}, status: :bad_request
+  end
+
+  def authenticate_api_token!
+    if user_from_token
+      login(user_from_token)
+    else
+      render status: :unauthorized, json: {}
+    end
+  end
+
+  def token_from_header
+    request.headers.fetch("authorization", "").split(" ").last
+  end
+
+  def api_token
+    @_api_token ||= ApiToken.find_by(token: token_from_header)
+  end
+
+  # Only for use within authenticate_api_token! above
+  # Use current_user/Current.user or current_account/Current.account within app controllers
+  def user_from_token
+    if api_token.present?
+      api_token.touch(:last_used_at)
+      api_token.user
+    end
+  end
+end

data/app/controllers/api/v1/mes_controller.rb

@@ -0,0 +1,11 @@
+# Just a demo api controller you can remove this
+class Api::V1::MesController < Api::BaseController
+  def show
+    render json: current_user
+  end
+
+  def destroy
+    current_user.destroy
+    render json: {}
+  end
+end

data/app/controllers/revise_auth/email_controller.rb

@@ -4,7 +4,7 @@ class ReviseAuth::EmailController < ReviseAuthController
   # GET /profile/email?confirmation_token=abcdef
   def show
     if User.find_by(confirmation_token: params[:confirmation_token])&.confirm_email_change
-      #flash[:notice] = I18n.t("revise_auth.email_confirmed")
+      # flash[:notice] = I18n.t("revise_auth.email_confirmed")
       redirect_to(user_signed_in? ? profile_path : root_path)
     else
       redirect_to root_path, alert: I18n.t("revise_auth.email_confirm_failed")
@@ -12,9 +12,13 @@ class ReviseAuth::EmailController < ReviseAuthController
   end
 
   def update
-    if current_user.update(email_params)
+    email = current_user.email
+    current_user.update(email_params)
+    if email != params[:user][:unconfirmed_email]
+      current_user.confirmation_sent_at = Time.now
+      current_user.save
       current_user.send_confirmation_instructions
-      #flash[:notice] = I18n.t("revise_auth.confirmation_email_sent", email: current_user.unconfirmed_email)
+      # flash[:notice] = I18n.t("revise_auth.confirmation_email_sent", email: current_user.unconfirmed_email)
     end
 
     redirect_to profile_path
@@ -23,6 +27,6 @@ class ReviseAuth::EmailController < ReviseAuthController
   private
 
   def email_params
-    params.require(:user).permit(:unconfirmed_email)
+    params.require(:user).permit(:first_name, :last_name, :unconfirmed_email)
   end
 end

data/app/controllers/revise_auth/password_controller.rb

@@ -3,7 +3,7 @@ class ReviseAuth::PasswordController < ReviseAuthController
 
   def update
     if current_user.update(password_params)
-      #flash[:notice] = I18n.t("revise_auth.password_changed")
+      # flash[:notice] = I18n.t("revise_auth.password_changed")
     end
 
     redirect_to profile_path
@@ -17,7 +17,7 @@ class ReviseAuth::PasswordController < ReviseAuthController
 
   def validate_current_password
     unless current_user.authenticate(params[:current_password])
-      #flash[:alert] = I18n.t("revise_auth.incorrect_password")
+      # flash[:alert] = I18n.t("revise_auth.incorrect_password")
       render "revise_auth/registrations/edit", status: :unprocessable_entity
     end
   end

data/app/controllers/revise_auth/registrations_controller.rb

@@ -9,6 +9,7 @@ class ReviseAuth::RegistrationsController < ReviseAuthController
     @user = User.new(sign_up_params)
     if @user.save
       login(@user)
+      current_user.api_tokens.first_or_create(name: ApiToken::APP_NAME)
       redirect_to root_path
     else
       render :new, status: :unprocessable_entity
@@ -35,10 +36,10 @@ class ReviseAuth::RegistrationsController < ReviseAuthController
   private
 
   def sign_up_params
-    params.require(:user).permit(:name, :email, :password, :password_confirmation)
+    params.require(:user).permit(:first_name, :last_name, :email, :password, :password_confirmation)
   end
 
   def profile_params
-    params.require(:user).permit(:name)
+    params.require(:user).permit(:first_name, :last_name)
   end
 end

data/app/controllers/revise_auth/sessions_controller.rb

@@ -5,9 +5,10 @@ class ReviseAuth::SessionsController < ReviseAuthController
   def create
     if (user = User.authenticate_by(email: params[:email], password: params[:password]))
       login(user)
+      current_user.api_tokens.first_or_create(name: ApiToken::APP_NAME)
       redirect_to root_path
     else
-      #flash[:alert] = I18n.t("revise_auth.invalid_email_or_password")
+      # flash[:alert] = I18n.t("revise_auth.invalid_email_or_password")
       render :new, status: :unprocessable_entity
     end
   end

data/app/controllers/revise_auth_controller.rb

@@ -1,4 +1,4 @@
-require 'revise_auth-jets'
+require "revise_auth-jets"
 class ReviseAuthController < ApplicationController
   # Return true if it's a revise_auth_controller. false to all controllers unless
   # the controllers defined inside revise_auth. Useful if you want to apply a before

data/app/views/admin/dashboard/show.html.erb

@@ -0,0 +1,22 @@
+<main class="w-full flex-grow p-6">
+  <h1 class="text-3xl text-black pb-6">Dashboard</h1>
+
+  <div class="flex flex-wrap mt-6">
+    <div class="w-full lg:w-1/2 pr-0 lg:pr-2">
+      <p class="text-xl pb-3 flex items-center">
+      <i class="fas fa-plus mr-3"></i> Active Users
+      </p>
+      <div class="p-6 bg-white">
+        <%= @users.where('updated_at > ?', 1.month.ago).count %>
+      </div>
+    </div>
+    <div class="w-full lg:w-1/2 pl-0 lg:pl-2 mt-12 lg:mt-0">
+      <p class="text-xl pb-3 flex items-center">
+      <i class="fas fa-check mr-3"></i> All Users
+      </p>
+      <div class="p-6 bg-white">
+        <%= @users.count %>
+      </div>
+    </div>
+  </div>
+</main>

data/app/views/admin/shared/_desktop_header.html.erb

@@ -0,0 +1,15 @@
+<header class="w-full items-center bg-white py-2 px-6 hidden sm:flex">
+  <div class="w-1/2"></div>
+
+  <div class="relative w-1/2 flex justify-end">
+    <button onclick="hideMenu()" class="realtive z-10 w-12 h-12 rounded-full overflow-hidden border-4 border-gray-400 hover:border-gray-300 focus:border-gray-300 focus:outline-none">
+      <img src="<%= @grav %>">
+    </button>
+    <div id="menuBtn" class="absolute w-32 bg-white rounded-lg shadow-lg py-2 mt-16" style="display: none;">
+      <%= link_to "Profile", profile_path, class: "block px-4 py-2 account-link hover:text-white" %>
+      <%= link_to "Log out", '/logout', method: :delete, class: "block px-4 py-2 account-link hover:text-white" %>
+    </div>
+  </div>
+</header>
+
+

data/app/views/admin/shared/_mobile_header.html.erb

@@ -0,0 +1,16 @@
+<header class="w-full bg-sidebar py-5 px-6 sm:hidden">
+  <div class="flex items-center justify-between">
+    <%= link_to "Admin", admin_path, class: "text-white text-3xl font-semibold uppercase hover:text-gray-300"%>
+
+    <button onclick="hideMenuMobile()" class="text-white text-3xl focus:outline-none">
+      <i id="bars" class="fas fa-bars" style="display: block;"></i>
+      <i id="times" class="fas fa-times" style="display: none;"></i>
+    </button>
+  </div>
+
+  <!-- Dropdown Nav -->
+  <nav id="dropdownNav" class="flex flex-col pt-4" style="display: none;">
+    <%= render partial: "admin/shared/nav_links" %>
+  </nav>
+</header>
+

data/app/views/admin/shared/_nav_links.html.erb

@@ -0,0 +1,8 @@
+<%= link_to admin_path, class: "flex items-center text-white opacity-75 hover:opacity-100 py-4 pl-6 nav-item" do %>
+  <i class="fas fa-tachometer-alt mr-3"></i>
+  Dashboard
+<% end %>
+<%= link_to admin_users_path, class: "flex items-center text-white opacity-75 hover:opacity-100 py-4 pl-6 nav-item" do %>
+  <i class="fas fa-user mr-3"></i>
+  User
+<% end %>

data/app/views/admin/users/index.html.erb

@@ -0,0 +1,43 @@
+<main class="w-full flex-grow p-6">
+  <h1 class="text-3xl text-black pb-6">Users</h1>
+  <div class="w-full mt-6">
+    <p class="text-xl pb-3 flex items-center">
+    <i class="fas fa-list mr-3"></i> User Table
+    </p>
+    <div class="bg-white overflow-auto">
+      <table class="min-w-full bg-white">
+        <thead class="bg-gray-800 text-white">
+          <tr>
+            <th class="w-1/3 text-left py-3 px-4 uppercase font-semibold text-sm">Edit</th>
+            <th class="w-1/3 text-left py-3 px-4 uppercase font-semibold text-sm">Name</th>
+            <th class="w-1/3 text-left py-3 px-4 uppercase font-semibold text-sm">Last name</th>
+            <th class="text-left py-3 px-4 uppercase font-semibold text-sm">Email</td>
+          </tr>
+        </thead>
+        <tbody class="text-gray-700">
+          <% @users.each_with_index do |user, index| %>
+            <% if index.even? %>
+              <tr>
+                <td class="w-1/3 text-left py-3 px-4">
+                  <a class="btn btn-sm" href="/admin/users/<%=user.id%>">
+                    Edit
+                  </a>
+                </td>
+                <td class="w-1/3 text-left py-3 px-4"><%= user.first_name %></td>
+                <td class="w-1/3 text-left py-3 px-4"><%= user.last_name %></td>
+                <td class="text-left py-3 px-4"><a class="hover:text-blue-500" href="mailto:jonsmith@mail.com"><%= user.email %></a></td>
+              </tr>
+            <% else %>
+              <tr class="bg-gray-200">
+                <td class="w-1/3 text-left py-3 px-4"><%= link_to "Edit", admin_users_show_path(user.id)%></td>
+                <td class="w-1/3 text-left py-3 px-4"><%= user.first_name %></td>
+                <td class="w-1/3 text-left py-3 px-4"><%= user.last_name %></td>
+                <td class="text-left py-3 px-4"><a class="hover:text-blue-500" href="mailto:jonsmith@mail.com"><%= user.email %></a></td>
+              </tr>
+            <% end %>
+          <% end %>
+      </table>
+    </div>
+  </div>
+</main>
+

data/app/views/admin/users/show.html.erb

@@ -0,0 +1,73 @@
+<main class="w-full flex-grow p-6">
+<div class="w-full mt-12">
+    <p class="text-xl pb-3 flex items-center">
+    <i class="fas fa-list mr-3"></i> User
+    </p>
+    <div class="bg-white overflow-auto">
+
+  <%= form_with model: @user, local: true, url: admin_users_path do |form| %>
+      <table class="text-left w-full border-collapse">
+        <thead>
+          <tr>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Created At</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">First Name</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Last Name</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Email</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Submit</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr class="hover:bg-grey-lighter">
+             <%= form.hidden_field :id %>
+            <td class="py-4 px-6 border-b border-grey-light"><%= @user.created_at %></td>
+            <td class="py-4 px-6 border-b border-grey-light">
+              <%= form.text_field :first_name, autofocus: true, autocomplete: "name", placeholder: "Steve", class: "form-control" %>
+            </td>
+            <td class="py-4 px-6 border-b border-grey-light">
+              <%= form.text_field :last_name, autofocus: true, autocomplete: "name", placeholder: "Jobs", class: "form-control" %>
+            </td>
+            <td class="py-4 px-6 border-b border-grey-light">
+              <%= form.email_field :unconfirmed_email, autocomplete: "email", placeholder: "you@example.com", class: "form-control" %>
+            </td>
+            <td class="py-4 px-6 border-b border-grey-light">
+              <%= form.submit "Submit", class: "btn btn-primary btn-expanded" %>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+  <% end %>
+    </div>
+  </div>
+
+  <div class="w-full mt-12">
+    <p class="text-xl pb-3 flex items-center">
+    <i class="fas fa-list mr-3"></i> ApiTokens
+    </p>
+    <div class="bg-white overflow-auto">
+      <table class="text-left w-full border-collapse">
+        <thead>
+          <tr>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Created At</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Expires At</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Token</th>
+            <th class="py-4 px-6 bg-grey-lightest font-bold uppercase text-sm text-grey-dark border-b border-grey-light">Delete</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @tokens.each do |token| %>
+            <tr class="hover:bg-grey-lighter">
+              <td class="py-4 px-6 border-b border-grey-light"><%= token.created_at %></td>
+              <td class="py-4 px-6 border-b border-grey-light"><%= token.expires_at%></td>
+              <td class="py-4 px-6 border-b border-grey-light"><%= token.token %></td>
+              <td class="py-4 px-6 border-b border-grey-light">
+                <a data-confirm="Are you sure?" data-method="delete" class="btn btn-sm" href="/admin/users/<%=token.token%>">
+                  <i class="fa-regular fa-trash-can mr-3"></i>
+                </a>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</main>

data/app/views/layouts/admin_application.html.erb

@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="theme-color" content="#000000">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <%= csrf_meta_tags %>
+  <title>Jets App</title>
+  <%= javascript_pack_tag "application" %>
+  <%= stylesheet_pack_tag "theme" %>
+
+   <link rel="shortcut icon" href="<%= favicon_path %>">
+  <style>
+      @import url('https://fonts.googleapis.com/css?family=Karla:400,700&display=swap');
+      .font-family-karla { font-family: karla; }
+      .bg-sidebar { background: #3d68ff; }
+      .cta-btn { color: #3d68ff; }
+      .upgrade-btn { background: #1947ee; }
+      .upgrade-btn:hover { background: #0038fd; }
+      .active-nav-link { background: #1947ee; }
+      .nav-item:hover { background: #1947ee; }
+      .account-link:hover { background: #3d68ff; }
+  </style>
+
+</head>
+<body>
+  <div class="col-md-9 content-body">
+    <div class="bg-gray-100 font-family-karla flex">
+      <aside class="relative bg-sidebar h-screen w-64 hidden sm:block shadow-xl">
+        <div class="p-6">
+          <%= link_to "Admin", admin_path, class: "text-white text-3xl font-semibold uppercase hover:text-gray-300"%>
+        </div>
+        <nav class="text-white text-base font-semibold pt-3">
+          <%= render partial: "admin/shared/nav_links" %>
+      </aside>
+      <div class="w-full flex flex-col h-screen overflow-y-hidden">
+        <!-- Desktop Header -->
+        <%= render partial: "admin/shared/desktop_header" %>
+        <!-- Mobile Header & Nav -->
+        <%= render partial: "admin/shared/mobile_header" %>
+        <div class="w-full overflow-x-hidden border-t flex flex-col">
+          <%= yield %>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+<!-- Font Awesome -->
+<script defer src="https://kit.fontawesome.com/0e5ab6a736.js" crossorigin="anonymous"></script>
+
+<script>
+  function hideMenuMobile() {
+    var x = document.getElementById("bars");
+    var y = document.getElementById("times");
+    var z = document.getElementById("dropdownNav");
+    if (x.style.display === "none") {
+      x.style.display = "block";
+      y.style.display = "none";
+      z.style.display = "none";
+    } else {
+      y.style.display = "block";
+      z.style.display = "block";
+      x.style.display = "none";
+    }
+  }
+
+  function hideMenu() {
+    var x = document.getElementById("menuBtn");
+    if (x.style.display === "none") {
+      x.style.display = "block";
+    } else {
+      x.style.display = "none";
+    }
+  }
+</script>
+
+</html>

data/app/views/main/authenticated.html.erb

@@ -3,7 +3,7 @@
 
   <% if user_signed_in? %>
     <%= link_to "Profile", profile_path %>
-    <%= button_to "Log out", 'logout', method: :delete %>
+    <%= button_to "Log out", '/logout', method: :delete %>
   <% else %>
     <%= link_to "Sign Up", sign_up_path %>
     <%= link_to "Log in", login_path %>

data/app/views/revise_auth/registrations/edit.html.erb

@@ -2,18 +2,21 @@
   <div class="mb-4 text-center">
     <h2 class="mb-1">Profile</h2>
   </div>
-
-
   <%= form_with model: current_user, local: true, url: profile_email_path do |form| %>
     <%= render "shared/error_messages", resource: current_user  %>
     <div class="form-group">
-      <%= form.label :name, "Full name" %>
-      <%= form.text_field :name, autofocus: true, autocomplete: "name", placeholder: "Steve Jobs", class: "form-control" %>
+      <%= form.label :first_name, "First name" %>
+      <%= form.text_field :first_name, autofocus: true, autocomplete: "name", placeholder: "Steve", class: "form-control" %>
+    </div>
+
+    <div class="form-group">
+      <%= form.label :last_name, "Last name" %>
+      <%= form.text_field :last_name, autofocus: true, autocomplete: "name", placeholder: "Jobs", class: "form-control" %>
     </div>
 
     <div class="form-group">
       <%= form.label :email %>
-      <%= form.email_field :email, autocomplete: "email", placeholder: "you@example.com", class: "form-control" %>
+      <%= form.email_field :unconfirmed_email, autocomplete: "email", placeholder: "you@example.com", class: "form-control" %>
     </div>
 
     <div class="mt-2 form-group">

data/app/views/revise_auth/sessions/new.html.erb

@@ -21,7 +21,7 @@
       </div>
 
     <div class="form-group">
-      <%= f.submit "SIgn In", class: "btn btn-primary btn-expanded" %>
+      <%= f.submit "Sign In", class: "btn btn-primary btn-expanded" %>
     </div>
   <% end %>
 

data/lib/generators/revise_auth/model_generator.rb

@@ -11,20 +11,26 @@ module ReviseAuth
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def initialize(args, *options)
-        @original_attributes = args[1..] || []
         super
       end
 
       def generate_model
-        model_attributess = model_attributes.join(', ').gsub(':index', '').gsub(',', '')
+        model_attributess = model_attributes.join(", ").delete(",")
+        puts "Adding #{name}"
         puts "jets g model #{name} #{model_attributess}"
         system "jets g model #{name} #{model_attributess}"
-        #generate :model, name, *model_attributes
+        puts "Adding ApiToken"
+        system "jets g model ApiTokens #{name.downcase}:references token:string:uniq name:string metadata:jsonb transient:boolean last_used_at:datetime expires_at:datetime"
+        # generate :model, name, *model_attributes
       end
 
       def add_revise_auth_model
+        prepend_to_file "app/models/api_token.rb", "require 'revise_auth-jets'\n"
+        inject_into_class "app/models/api_token.rb", "ApiToken", "  include ReviseAuth::ApiModel\n"
+
         prepend_to_file model_path, "require 'revise_auth-jets'\n"
         inject_into_class model_path, class_name, "  include ReviseAuth::Model\n"
+        inject_into_class model_path, class_name, "  has_many :api_tokens, dependent: :destroy\n"
       end
 
       def add_uniq_to_email_index
@@ -51,13 +57,16 @@ module ReviseAuth
 
       def model_attributes
         [
-          "email:string:index",
+          "email:string:uniq",
           "password_digest:string",
+          "first_name:string",
+          "last_name:string",
+          "admin:boolean",
           "confirmation_token:string",
           "confirmed_at:datetime",
           "confirmation_sent_at:datetime",
           "unconfirmed_email:string"
-        ] + @original_attributes
+        ]
       end
     end
   end

data/lib/generators/revise_auth/templates/README

@@ -1,8 +1,7 @@
 🚚 Your Revise auth database model has been generated!
 
 Next step:
-  Add "add_index :users, :email, unique: true" at the bottom of the change method
+  Add t.jsonb :metadata, default: {}  and t.boolean :transient, default: false into your ApiToken migration
   Run "jets db:migrate"
-  Add ActiveRecord::Base.signed_id_verifier_secret = "custom_verfifier_secret" in your initializers/  Set this as an env var
   Add your stmp settings in your development.rb
   Run "jets g revise_auth:views"

data/lib/generators/revise_auth/views_generator.rb

@@ -12,11 +12,12 @@ module ReviseAuth
       end
 
       def copy_styles
-        template "app/stylesheet/theme.scss", "app/javascripts/packs"
+        template "app/stylesheet/theme.scss", "app/javascript/packs/theme.scss"
       end
 
       def copy_controllers
         template "app/controllers/main_controller.rb", "app/controllers/main_controller.rb"
+        template "app/controllers/admin_controller.rb", "app/controllers/admin_controller.rb"
         template "app/controllers/revise_auth_controller.rb", "app/controllers/revise_auth_controller.rb"
         if options[:controllers]
           options[:controllers].each do |directory|
@@ -24,6 +25,8 @@ module ReviseAuth
           end
         else
           directory "app/controllers/revise_auth"
+          directory "app/controllers/api"
+          directory "app/controllers/admin"
         end
       end
 
@@ -33,8 +36,11 @@ module ReviseAuth
             directory "app/views/revise_auth/#{directory}"
           end
         else
+          directory "app/views/layouts"
           directory "app/views/revise_auth"
+          directory "app/views/admin"
           directory "app/views/main"
+          directory "app/views/shared"
         end
       end
     end

data/lib/revise_auth/api_model.rb

@@ -0,0 +1,46 @@
+module ReviseAuth
+  module ApiModel
+    extend ActiveSupport::Concern
+
+    included do
+      DEFAULT_NAME = "api_token" # standard:disable Lint/ConstantDefinitionInBlock
+      APP_NAME = "my_app" # standard:disable Lint/ConstantDefinitionInBlock
+
+      belongs_to :user
+
+      scope :sorted, -> { order("last_used_at DESC NULLS LAST, created_at DESC") }
+
+      has_secure_token :token
+
+      validates :name, presence: true
+
+      def can?(permission)
+        Array.wrap(data("permissions")).include?(permission)
+      end
+
+      def cant?(permission)
+        !can?(permission)
+      end
+
+      def data(key, default: nil)
+        (metadata || {}).fetch(key, default)
+      end
+
+      def expired?
+        expires_at? && Time.current >= expires_at
+      end
+
+      def touch_last_used_at
+        return if transient?
+        update(last_used_at: Time.current)
+      end
+
+      def generate_token
+        loop do
+          self.token = SecureRandom.hex(16)
+          break unless ApiToken.where(token: token).exists?
+        end
+      end
+    end
+  end
+end

data/lib/revise_auth/authentication.rb

@@ -54,7 +54,7 @@ module ReviseAuth
     end
 
     def reset_session
-      if session && session.respond_to?(:destroy)
+      if session&.respond_to?(:destroy)
         session.destroy
       else
         self.session = {}

data/lib/revise_auth/engine.rb

@@ -1,3 +1,4 @@
+require "jets"
 module ReviseAuth
   class Turbine < ::Jets::Turbine
     initializer :revise_auth_controller do

data/lib/revise_auth/model.rb

@@ -5,7 +5,7 @@ module ReviseAuth
     included do
       include Backports
 
-      EMAIL_VERIFICATION_TOKEN_VALIDITY = 1.day
+      EMAIL_VERIFICATION_TOKEN_VALIDITY = 1.day # standard:disable Lint/ConstantDefinitionInBlock
 
       has_secure_password
       has_secure_token :confirmation_token
@@ -27,10 +27,10 @@ module ReviseAuth
     # Generates a confirmation token and send email to the user
     def send_confirmation_instructions
       # = breaks the query params
-      token = generate_token_for.gsub("=", '')
+      token = generate_token_for.delete("=")
       self.confirmation_token = token
-      self.save!
-      ReviseAuth::Mailer.with(user: self.unconfirmed_email, token: token).confirm_email.deliver_later
+      save!
+      ReviseAuth::Mailer.with(user: unconfirmed_email, token: token).confirm_email.deliver_later
     end
 
     def confirm_email_change

data/lib/revise_auth/routes.rb

@@ -1,49 +1,49 @@
-#module ActionDispatch::Routing
-#  class Mapper
-#    def revise_auth
-#      scope module: :revise_auth do
-#        revise_registration
-
-#        get "login", to: "sessions#new"
-#        post "login", to: "sessions#create"
-
-#        revise_profile
-
-#        patch "profile/email", to: "email#update"
-#        patch "profile/password", to: "password#update"
-
-#        # Email confirmation
-#        get "profile/email", to: "email#show"
-
-#        delete "logout", to: "sessions#destroy"
-#      end
-#    end
-
-#    # Adds helpers for config/routes.rb to constraint routes with authentication
-#    #
-#    def authenticated
-#      constraints ->(request) { ReviseAuth::RouteConstraint.new(request).user_signed_in? } do
-#        yield
-#      end
-#    end
-
-#    def unauthenticated
-#      constraints ->(request) { !ReviseAuth::RouteConstraint.new(request).user_signed_in? } do
-#        yield
-#      end
-#    end
-
-#    private
-
-#    def revise_registration
-#      get "sign_up", to: "registrations#new"
-#      post "sign_up", to: "registrations#create"
-#    end
-
-#    def revise_profile
-#      get "profile", to: "registrations#edit"
-#      patch "profile", to: "registrations#update"
-#      delete "profile", to: "registrations#destroy"
-#    end
-#  end
-#end
+# module ActionDispatch::Routing
+# class Mapper
+#   def revise_auth
+#     scope module: :revise_auth do
+#       revise_registration
+
+#       get "login", to: "sessions#new"
+#       post "login", to: "sessions#create"
+
+#       revise_profile
+
+#       patch "profile/email", to: "email#update"
+#       patch "profile/password", to: "password#update"
+
+#       # Email confirmation
+#       get "profile/email", to: "email#show"
+
+#       delete "logout", to: "sessions#destroy"
+#     end
+#   end
+
+#   # Adds helpers for config/routes.rb to constraint routes with authentication
+#   #
+#   def authenticated
+#     constraints ->(request) { ReviseAuth::RouteConstraint.new(request).user_signed_in? } do
+#       yield
+#     end
+#   end
+
+#   def unauthenticated
+#     constraints ->(request) { !ReviseAuth::RouteConstraint.new(request).user_signed_in? } do
+#       yield
+#     end
+#   end
+
+#   private
+
+#   def revise_registration
+#     get "sign_up", to: "registrations#new"
+#     post "sign_up", to: "registrations#create"
+#   end
+
+#   def revise_profile
+#     get "profile", to: "registrations#edit"
+#     patch "profile", to: "registrations#update"
+#     delete "profile", to: "registrations#destroy"
+#   end
+# end
+# end

data/lib/revise_auth/version.rb

@@ -1,3 +1,3 @@
 module ReviseAuth
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/revise_auth-jets.rb

@@ -7,5 +7,6 @@ module ReviseAuth
   autoload :Backports, "revise_auth/backports"
   autoload :Current, "revise_auth/current"
   autoload :Model, "revise_auth/model"
+  autoload :ApiModel, "revise_auth/api_model"
   autoload :RouteConstraint, "revise_auth/route_constraint"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revise_auth-jets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Jeremiah Parrack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -35,6 +35,11 @@ files:
 - README.md
 - Rakefile
 - app/config/routes.rb
+- app/controllers/admin/dashboard_controller.rb
+- app/controllers/admin/users_controller.rb
+- app/controllers/admin_controller.rb
+- app/controllers/api/base_controller.rb
+- app/controllers/api/v1/mes_controller.rb
 - app/controllers/main_controller.rb
 - app/controllers/revise_auth/email_controller.rb
 - app/controllers/revise_auth/password_controller.rb
@@ -43,6 +48,13 @@ files:
 - app/controllers/revise_auth_controller.rb
 - app/mailers/revise_auth/mailer.rb
 - app/stylesheet/theme.scss
+- app/views/admin/dashboard/show.html.erb
+- app/views/admin/shared/_desktop_header.html.erb
+- app/views/admin/shared/_mobile_header.html.erb
+- app/views/admin/shared/_nav_links.html.erb
+- app/views/admin/users/index.html.erb
+- app/views/admin/users/show.html.erb
+- app/views/layouts/admin_application.html.erb
 - app/views/main/authenticated.html.erb
 - app/views/main/index.html.erb
 - app/views/revise_auth/mailer/confirm_email.html.erb
@@ -62,6 +74,7 @@ files:
 - lib/generators/revise_auth/templates/README
 - lib/generators/revise_auth/views_generator.rb
 - lib/revise_auth-jets.rb
+- lib/revise_auth/api_model.rb
 - lib/revise_auth/authentication.rb
 - lib/revise_auth/backports.rb
 - lib/revise_auth/current.rb