trestle-auth 0.2.5 → 0.4.3

data/frontend/_layout.scss

@@ -0,0 +1,35 @@
+.auth-body {
+  display: flex;
+  color: white;
+
+  .container {
+    margin: auto;
+    width: 320px;
+  }
+}
+
+.auth-header {
+  text-align: center;
+  margin-bottom: 20px;
+
+  h1 {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 1.75rem;
+    font-weight: 500;
+    text-shadow: rgba(black, 0.5) 0 1px 1px;
+
+    padding: 0.75rem 1rem;
+  }
+
+  img {
+    max-width: 80%;
+    max-height: 100%;
+  }
+
+  span {
+    margin-left: 10px;
+  }
+}

data/{app/assets/stylesheets/trestle/auth/_defaults.scss → frontend/_variables.scss}

@@ -1,13 +1,9 @@
-$auth-bg: $theme-bg !default;
-
 $auth-form-control-color: white !default;
 $auth-form-control-placeholder: rgba(white, 0.5) !default;
 $auth-form-control-bg: rgba(white, 0.1) !default;
 $auth-form-control-border: 0 !default;
 
+$auth-form-control-icon-color: rgba(white, 0.5) !default;
+
 $auth-remember-me-color: rgba(white, 0.75) !default;
 $auth-remember-me-bg: rgba(black, 0.075) !default;
-
-$auth-login-btn-color: $btn-primary-color !default;
-$auth-login-btn-border: $btn-primary-border !default;
-$auth-login-btn-bg: $btn-primary-bg !default;

data/frontend/index.scss

@@ -0,0 +1,5 @@
+@import "~trestle/frontend/css/support";
+
+@import "variables";
+@import "layout";
+@import "form";

data/{app/assets/stylesheets/trestle/auth → frontend}/userbox.scss

@@ -1,16 +1,18 @@
-@import "trestle/support";
+@import "~trestle/frontend/css/support";
 
 .userbox {
-  margin-top: 2px;
-  margin-bottom: 2px;
+  order: 99;
+  padding: 2px 0;
+
+  display: flex;
+  align-items: center;
 
   > a {
-    color: $text-color;
+    color: $body-color;
 
     display: block;
     padding: 2px 0;
 
-    font-size: 14px;
     font-weight: normal;
     line-height: 40px;
 
@@ -24,26 +26,26 @@
     margin-left: 6px;
   }
 
-  .name {
-    color: $text-color;
+  .dropdown-toggle {
+    &::after {
+      vertical-align: middle;
+    }
   }
 }
 
-@include mobile {
+@include media-breakpoint-down(sm) {
   .userbox {
+    display: block;
     position: relative;
     z-index: 5;
 
-    > a, .name {
-      color: white;
-    }
-
     .name {
       display: none;
     }
 
     .avatar {
       border: 1px solid rgba(white, 0.25);
+      margin-left: 0;
     }
   }
 }

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 4.2.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 5.0.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.1.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 5.1.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.2.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+  gem "devise"
+end
+
+gem "rails", "~> 5.2.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-6.0.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+
+  gem "capybara"
+  gem "sqlite3", "~> 1.4"
+  gem "devise"
+end
+
+gem "rails", "~> 6.0.0"
+gem "sassc-rails"
+
+gem "rake", "~> 12.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/lib/generators/trestle/auth/account/account_generator.rb

@@ -0,0 +1,32 @@
+module Trestle
+  module Auth
+    module Generators
+      class AccountGenerator < ::Rails::Generators::Base
+        desc "Creates a Trestle admin for managing the logged in user"
+
+        argument :model, type: :string, default: "Administrator"
+
+        class_option :devise, type: :boolean, default: false, desc: "Create admin for a Devise user model"
+
+        source_root File.expand_path("../templates", __FILE__)
+
+        def create_admin
+          template "admin.rb.erb", "app/admin/auth/account_admin.rb"
+        end
+
+        def devise?
+          options[:devise]
+        end
+
+      protected
+        def parameter_name
+          singular_name
+        end
+
+        def singular_name
+          model.demodulize.underscore
+        end
+      end
+    end
+  end
+end

data/lib/generators/trestle/auth/account/templates/admin.rb.erb

@@ -0,0 +1,47 @@
+Trestle.resource(:account, model: <%= model %>, scope: Auth, singular: true) do
+  instance do
+    current_user
+  end
+
+  remove_action :new, :edit, :destroy
+
+  form do |<%= parameter_name %>|
+    text_field :email
+
+    <%- unless devise? -%>
+    row do
+      col(sm: 6) { text_field :first_name }
+      col(sm: 6) { text_field :last_name }
+    end
+
+    <%- end -%>
+    row do
+      col(sm: 6) { password_field :password }
+      col(sm: 6) { password_field :password_confirmation }
+    end
+  end
+  <%- if devise? -%>
+
+  # Ignore the password parameters if they are blank
+  update_instance do |instance, attrs|
+    if attrs[:password].blank?
+      attrs.delete(:password)
+      attrs.delete(:password_confirmation) if attrs[:password_confirmation].blank?
+    end
+
+    instance.assign_attributes(attrs)
+  end
+
+  # Log the current user back in if their password was changed
+  after_action on: :update do
+    if instance.encrypted_password_previously_changed?
+      login!(instance)
+    end
+  end if Devise.sign_in_after_reset_password
+  <%- end -%>
+
+  # Limit the parameters that are permitted to be updated by the user
+  params do |params|
+    params.require(:account).permit(:email, <% unless devise? %>:first_name, :last_name, <% end %>:password, :password_confirmation)
+  end
+end

data/lib/generators/trestle/auth/admin/admin_generator.rb

@@ -6,15 +6,29 @@ module Trestle
 
         argument :model, type: :string, default: "Administrator"
 
+        class_option :devise, type: :boolean, default: false, desc: "Create admin for a Devise user model"
+
         source_root File.expand_path("../templates", __FILE__)
 
         def create_admin
           template "admin.rb.erb", File.join('app/admin/auth', "#{model.underscore.pluralize}_admin.rb")
         end
 
+        def devise?
+          options[:devise]
+        end
+
       protected
+        def parameter_name
+          singular_name
+        end
+
         def plural_name
-          model.demodulize.underscore.pluralize
+          singular_name.pluralize
+        end
+
+        def singular_name
+          model.demodulize.underscore
         end
       end
     end

data/lib/generators/trestle/auth/admin/templates/admin.rb.erb

@@ -1,33 +1,56 @@
-Trestle.resource(:<%= plural_name %>, model: Trestle.config.auth.user_class, scope: Auth) do
+Trestle.resource(:<%= plural_name %>, model: <%= model %>, scope: Auth) do
   menu do
     group :configuration, priority: :last do
-      item :<%= plural_name %>, icon: "fa fa-users"
+      item :<%= plural_name %>, icon: "fas fa-users"
     end
   end
 
   table do
-    column :avatar, header: false do |administrator|
-      avatar_for(administrator)
+    column :avatar, header: false do |<%= parameter_name %>|
+      avatar_for(<%= parameter_name %>)
     end
     column :email, link: true
+    <%- unless devise? -%>
     column :first_name
     column :last_name
+    <%- end -%>
     actions do |a|
       a.delete unless a.instance == current_user
     end
   end
 
-  form do |administrator|
+  form do |<%= parameter_name %>|
     text_field :email
 
+    <%- unless devise? -%>
     row do
       col(sm: 6) { text_field :first_name }
       col(sm: 6) { text_field :last_name }
     end
 
+    <%- end -%>
     row do
       col(sm: 6) { password_field :password }
       col(sm: 6) { password_field :password_confirmation }
     end
   end
+  <%- if devise? -%>
+
+  # Ignore the password parameters if they are blank
+  update_instance do |instance, attrs|
+    if attrs[:password].blank?
+      attrs.delete(:password)
+      attrs.delete(:password_confirmation) if attrs[:password_confirmation].blank?
+    end
+
+    instance.assign_attributes(attrs)
+  end
+
+  # Log the current user back in if their password was changed
+  after_action on: :update do
+    if instance == current_user && instance.encrypted_password_previously_changed?
+      login!(instance)
+    end
+  end if Devise.sign_in_after_reset_password
+  <%- end -%>
 end

data/lib/generators/trestle/auth/install/install_generator.rb

@@ -6,6 +6,11 @@ module Trestle
 
         argument :model, type: :string, default: "Administrator"
 
+        class_option :devise, type: :boolean, default: false, desc: "Setup trestle-auth with Devise integration"
+        class_option :skip_account, type: :boolean, default: false, desc: "Skip creation of the current account admin"
+
+        source_root File.expand_path("../templates", __FILE__)
+
         def check_trestle_installed
           unless ::File.exist?("config/initializers/trestle.rb")
             raise Thor::Error, "The file config/initializers/trestle.rb does not appear to exist. Please run `trestle:install` first."
@@ -14,126 +19,52 @@ module Trestle
 
         def insert_configuration
           inject_into_file "config/initializers/trestle.rb", before: /^end/ do
-            <<-RUBY.strip_heredoc.indent(2)
-
-              # == Authentication Options
-              #
-              # Specify the user class to be used by trestle-auth.
-              #
-              config.auth.user_class = -> { #{model} }
-
-              # Specify the scope for valid admin users.
-              # Defaults to config.auth.user_class (unscoped).
-              #
-              # config.auth.user_scope = -> { User.where(admin: true) }
-
-              # Specify the Trestle admin for managing administrator users.
-              #
-              config.auth.user_admin = -> { :"auth/#{model.underscore.pluralize}" }
-
-              # Specify the parameter (along with a password) to be used to
-              # authenticate an administrator. Defaults to :email.
-              #
-              # config.auth.authenticate_with = :login
-
-              # Customize the method for authenticating a user given login parameters.
-              # The block should return an instance of the auth user class, or nil.
-              #
-              # config.auth.authenticate = ->(params) {
-              #   User.authenticate(params[:login], params[:password])
-              # }
-
-              # Customize the method for finding a user given an ID from the session.
-              # The block should return an instance of the auth user class, or nil.
-              #
-              # config.auth.find_user = ->(id) {
-              #   User.find_by(id: id)
-              # }
-
-              # Customize the rendering of user avatars. Can be disabled by setting to false.
-              # Defaults to the Gravatar based on the user's email address.
-              #
-              # config.auth.avatar = ->(user) {
-              #   avatar(fallback: user.initials) do
-              #     image_tag(user.avatar_url, alt: user.name) if user.avatar_url?
-              #   end
-              # }
-
-              # Customize the rendering of the current user's name in the main header.
-              # Defaults to the user's #first_name and #last_name (last name in bold),
-              # with a fallback to `display(user)` if those methods aren't defined.
-              #
-              # config.auth.format_user_name = ->(user) {
-              #   content_tag(:strong, user.full_name)
-              # }
-
-              # Customize the method for determining the user's locale.
-              # Defaults to user.locale (if the method is defined).
-              #
-              # config.auth.locale = ->(user) {
-              #   user.locale if user.respond_to?(:locale)
-              # }
-
-              # Customize the method for determining the user's time zone.
-              # Defaults to user.time_zone (if the method is defined).
-              #
-              # config.auth.time_zone = ->(user) {
-              #   user.time_zone if user.respond_to?(:time_zone)
-              # }
+            format_configuration(template_content(configuration_template))
+          end
+        end
 
-              # Specify the redirect location after a successful login.
-              # Defaults to the main Trestle admin path.
-              #
-              # config.auth.redirect_on_login = -> {
-              #   if admin = Trestle.lookup(Trestle.config.auth.user_admin)
-              #     admin.instance_path(current_user)
-              #   else
-              #     Trestle.config.path
-              #   end
-              # }
+        def generate_model
+          generate "trestle:auth:model", model unless devise?
+        end
 
-              # Specify the redirect location after logging out.
-              # Defaults to the trestle-auth new login path.
-              #
-              # config.auth.redirect_on_logout = -> { "/" }
+        def generate_admin
+          generate "trestle:auth:admin", model, ("--devise" if devise?)
+        end
 
-              # Enable or disable remember me functionality. Defaults to true.
-              #
-              # config.auth.remember.enabled = false
+        def generate_account
+          generate "trestle:auth:account", model, ("--devise" if devise?) unless options[:skip_account]
+        end
 
-              # Specify remember me expiration time. Defaults to 2 weeks.
-              #
-              # config.auth.remember.for = 30.days
+        def devise?
+          options[:devise]
+        end
 
-              # Customize the method for authenticating a user given a remember token.
-              #
-              # config.auth.remember.authenticate = ->(token) {
-              #   User.authenticate_with_remember_token(token)
-              # }
+        def configuration_template
+          devise? ? "devise.rb.erb" : "basic.rb.erb"
+        end
 
-              # Customize the method for remembering a user.
-              #
-              # config.auth.remember.remember_me, ->(user) { user.remember_me! }
+      private
+        def format_configuration(source)
+          "\n#{source.indent(2)}\n"
+        end
 
-              # Customize the method for forgetting a user.
-              #
-              # config.auth.remember.forget_me, ->(user) { user.forget_me! }
+        def template_content(path, options={})
+          path = File.expand_path(find_in_source_paths(path.to_s))
+          context = options.delete(:context) || instance_eval("binding")
 
-              # Customize the method for generating the remember cookie.
-              #
-              # config.auth.remember.cookie, ->(user) {
-              #   { value: user.remember_token, expires: user.remember_token_expires_at }
-              # }
-            RUBY
-          end
+          content = capturable_erb(path).tap do |erb|
+            erb.filename = path
+          end.result(context)
         end
 
-        def generate_model
-          generate "trestle:auth:model", model
-        end
+        def capturable_erb(path)
+          match = ERB.version.match(/(\d+\.\d+\.\d+)/)
 
-        def generate_admin
-          generate "trestle:auth:admin", model
+          if match && match[1] >= "2.2.0" # Ruby 2.6+
+            CapturableERB.new(::File.binread(path), trim_mode: "-", eoutvar: "@output_buffer")
+          else
+            CapturableERB.new(::File.binread(path), nil, "-", "@output_buffer")
+          end
         end
       end
     end