revise_auth-jets 0.3.0 → 0.3.2

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

@@ -1,71 +1,62 @@
-<h1>Profile</h1>
+<% content_for :form_block do %>
+  <div class="mb-4 text-center">
+    <h2 class="mb-1">Profile</h2>
+  </div>
 
-<%= form_with model: current_user, url: profile_email_path do |form| %>
-  <fieldset>
-    <legend>Change Email Address</legend>
 
-    <% if current_user.unconfirmed_email? %>
-      <p>Waiting for confirmation of <%= current_user.unconfirmed_email %></p>
-    <% end %>
-
-    <% if form.object.errors.any? %>
-      <ul>
-        <% form.object.errors.full_messages.each do |message| %>
-          <li><%= message %></li>
-        <% end %>
-      </ul>
-    <% end %>
-
-    <p>Your email address is: <%= current_user.email %>
-    <p>To change your email, we will send a confirmation email to your new address to complete the change.</p>
-
-    <div>
-      <%= form.label :unconfirmed_email, "Email address" %>
-      <%= form.email_field :unconfirmed_email, required: true %>
+  <%= 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" %>
     </div>
 
-    <div>
-      <%= form.button "Save Changes" %>
+    <div class="form-group">
+      <%= form.label :email %>
+      <%= form.email_field :email, autocomplete: "email", placeholder: "you@example.com", class: "form-control" %>
     </div>
-  </fieldset>
-<% end %>
 
-<%= form_with model: current_user, url: profile_password_path do |form| %>
-  <fieldset>
-    <legend>Change Password</legend>
+    <div class="mt-2 form-group">
+      <%= form.button "Update", disable_with: "Saving", class: "btn btn-primary" %>
+    </div>
+  <% end %>
 
-    <% if form.object.errors.any? %>
-      <ul>
-        <% form.object.errors.full_messages.each do |message| %>
-          <li><%= message %></li>
-        <% end %>
-      </ul>
-    <% end %>
 
-    <div>
+  <%= form_with model: current_user, local: true, url: profile_password_path do |form| %>
+    <%= render "shared/error_messages", resource: current_user  %>
+    <div class="form-group">
       <%= label_tag :current_password %>
-      <%= password_field_tag :current_password, nil, required: true %>
+      <%= password_field_tag :current_password, nil, required: true,  class: "form-control" %>
     </div>
 
-    <div>
+    <div class="form-group">
       <%= form.label :password, "New password" %>
-      <%= form.password_field :password, required: true %>
+      <%= form.password_field :password, required: true,  class: "form-control" %>
     </div>
 
-    <div>
+    <div class="form-group">
       <%= form.label :password_confirmation %>
-      <%= form.password_field :password_confirmation, required: true %>
+      <%= form.password_field :password_confirmation, required: true,  class: "form-control" %>
     </div>
-
-    <div>
-      <%= form.button "Save Changes" %>
+    <div class="mt-2 form-group">
+      <%= form.button "Update Password", disable_with: "Saving", class: "btn btn-primary" %>
     </div>
-  </fieldset>
-<% end %>
+  <% end %>
+
+  <div class="flex flex-wrap flex-end">
+    <div class="flex-1">
+      <h3 class="mb-4">Cancel my account</h3>
+      <div class="mt-2">
+        <%= form_with url: profile_path, local: true, method: :delete do |form| %>
+          <fieldset>
+            <%= form.button "Delete account", class: "btn btn-danger btn-outline primary" %>
+          </fieldset>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+
 
-<%= form_with url: profile_path, method: :delete do |form| %>
-  <fieldset>
-    <legend>Delete my account</legend>
-    <%= form.button "Delete account", data: { turbo_confirm: "Are you sure?" } %>
-  </fieldset>
 <% end %>
+<%= render "revise_auth/shared/form_block" %>

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

@@ -1,30 +1,34 @@
-<h1>Sign Up</h1>
-
-<%= form_with local: true, model: @user, url: sign_up_path do |form| %>
-  <% if form.object.errors.any? %>
-    <ul>
-      <% form.object.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-    </ul>
-  <% end %>
-
-  <div>
-    <%= form.label :email %>
-    <%= form.email_field :email, required: true, autofocus: true %>
+<% content_for :form_block do %>
+  <div class="mb-4 text-center">
+    <h2 class="mb-1">Sign Up</h2>
+    <%= link_to "Log in", login_path, class: "font-semibold" %>
   </div>
 
-  <div>
-    <%= form.label :password %>
-    <%= form.password_field :password, required: true %>
-  </div>
+  <%= form_with local: true, model: @user, url: sign_up_path do |f| %>
+    <%= render "shared/error_messages", resource: @user %>
 
-  <div>
-    <%= form.label :password_confirmation %>
-    <%= form.password_field :password_confirmation, required: true %>
-  </div>
+    <div class="form-group">
+      <%= f.label :email %>
+      <%= f.email_field :email, autocomplete: "email", placeholder: true, class: "form-control" %>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :password %>
+      <%= f.password_field :password, autocomplete: "new-password", placeholder: true, class: "form-control" %>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :password_confirmation%>
+      <%= f.password_field :password_confirmation, autocomplete: "new-password", placeholder: true,  required: true, class: "form-control" %>
+    </div>
+
+
+    <div class="form-group">
+      <%= f.button "Sign Up", disable_with: "Submitting", class: "btn btn-primary btn-expanded" %>
+    </div>
+  <% end %>
 
-  <div>
-    <%= form.button "Sign Up" %>
-  </div>
 <% end %>
+
+<%= render "revise_auth/shared/form_block" %>
+

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

@@ -1,17 +1,32 @@
-<h1>Log in</h1>
-
-<%= form_with(url: login_path, local: true) do |form| %>
-  <div>
-    <%= form.label :email %>
-    <%= form.email_field :email, required: true, autofocus: true %>
+<% content_for :form_block do %>
+  <div class="mb-4 text-center">
+    <h2 class="mb-px">Log In</h2>
+    <%= link_to "Sign Up", sign_up_path, class: "font-semibold" %>
   </div>
 
-  <div>
-    <%= form.label :password %>
-    <%= form.password_field :password, required: true %>
-  </div>
+  <%= form_with(url: login_path, local: true) do |f| %>
+    <div class="form-group">
+      <%= f.label :email %>
+      <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: true, class: "form-control" %>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :password %>
+      <%= f.password_field :password, autocomplete: "current-password", placeholder: true, class: "form-control" %>
+    </div>
+
+      <div class="form-group">
+        <%= f.check_box :remember_me, class: "form-checkbox" %>
+        <%= f.label :remember_me, class: "inline-block" %>
+      </div>
+
+    <div class="form-group">
+      <%= f.submit "SIgn In", class: "btn btn-primary btn-expanded" %>
+    </div>
+  <% end %>
 
-  <div>
-    <%= form.button "Login" %>
-  </div>
 <% end %>
+
+<%= render "revise_auth/shared/form_block" %>
+
+

data/app/views/revise_auth/shared/_form_block.html.erb

@@ -0,0 +1,7 @@
+<div class="container px-4 mx-auto my-10 lg:px-0">
+  <div class="w-full m-auto lg:w-1/2">
+    <div class="p-4 bg-white border border-gray-200 dark:bg-gray-900 dark:border-gray-700 rounded-lg shadow-sm lg:p-10">
+      <%= yield :form_block %>
+    </div>
+  </div>
+</div>

data/app/views/shared/_error_messages.html.erb

@@ -0,0 +1,18 @@
+<% if resource.errors.any? %>
+  <div class="alert alert-error mb-6 bg-red-500 text-white dark:bg-red-700 dark:text-red-200" role="alert">
+    <div class="flex items-start justify-start">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="fill-current icon mr-4 mt-1 flex-no-shrink text-white dark:text-red-200" role="img" aria-labelledby="f1yx75u7nv0lvn6ck4z10w7lksjmk2f">
+        <title id="f1yx75u7nv0lvn6ck4z10w7lksjmk2f">Icons/close outline</title>
+        <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm1.41-1.41A8 8 0 1 0 15.66 4.34 8 8 0 0 0 4.34 15.66zm9.9-8.49L11.41 10l2.83 2.83-1.41 1.41L10 11.41l-2.83 2.83-1.41-1.41L8.59 10 5.76 7.17l1.41-1.41L10 8.59l2.83-2.83 1.41 1.41z"></path>
+      </svg>
+
+      <div>
+        <ul class="dark:text-red-200">
+          <% resource.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    </div>
+  </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(', ').gsub(',', '')
+        puts "Adding #{name}"
         puts "jets g model #{name} #{model_attributess}"
         system "jets g model #{name} #{model_attributess}"
+        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

@@ -11,6 +11,10 @@ module ReviseAuth
         template "app/config/routes.rb", "config/routes.rb"
       end
 
+      def copy_styles
+        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/revise_auth_controller.rb", "app/controllers/revise_auth_controller.rb"
@@ -20,6 +24,7 @@ module ReviseAuth
           end
         else
           directory "app/controllers/revise_auth"
+          directory "app/controllers/api"
         end
       end
 
@@ -31,6 +36,7 @@ module ReviseAuth
         else
           directory "app/views/revise_auth"
           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"
+      APP_NAME = "my_app"
+
+      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/version.rb

@@ -1,3 +1,3 @@
 module ReviseAuth
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 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.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Jeremiah Parrack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -35,6 +35,8 @@ files:
 - README.md
 - Rakefile
 - app/config/routes.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
@@ -42,12 +44,15 @@ files:
 - app/controllers/revise_auth/sessions_controller.rb
 - app/controllers/revise_auth_controller.rb
 - app/mailers/revise_auth/mailer.rb
+- app/stylesheet/theme.scss
 - app/views/main/authenticated.html.erb
 - app/views/main/index.html.erb
 - app/views/revise_auth/mailer/confirm_email.html.erb
 - app/views/revise_auth/registrations/edit.html.erb
 - app/views/revise_auth/registrations/new.html.erb
 - app/views/revise_auth/sessions/new.html.erb
+- app/views/revise_auth/shared/_form_block.html.erb
+- app/views/shared/_error_messages.html.erb
 - config/locales/de.yml
 - config/locales/el.yml
 - config/locales/en.yml
@@ -59,6 +64,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