trestle-auth 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 526a5bb317d5e7a4cc86bfc4bf3f8cc7738711b5
-  data.tar.gz: 7e7ac41fbac4ab25372a076d22115d60ae5047cc
+SHA256:
+  metadata.gz: 71e10f075c0aee1777d1823511187dfac4d50788006476a5f1a67f9f3555b352
+  data.tar.gz: e00d07780f77c7914eeaffea5574143064dfe5adc514d5c0580d7d794834cff6
 SHA512:
-  metadata.gz: 7d992286cb24a3876ba4f60e46d3a43b95f936fdfa955479544083b5684755c3ed23a3e8d3cc296a5db81bf78b3e3b078413f2fc59b88a78721e2930968111e4
-  data.tar.gz: eb1877b2b963f5351b1092e82f90a0de83efa1288adbf131fbc078391cf9fcbd1038642ebb450775d33bab07278c26ef6d16beabfe2c458ad04302c185b3201a
+  metadata.gz: 46d21d2099835f6d7f80a41f98b6983c1de41c2f4fbec486f7c069038f881a7097d6c78377c41e6a1c9b1a8d2d1e2e453c177de2cbfcfbf44f3e3f9410556b14
+  data.tar.gz: dd803d5a8055402aa4f1b9c6351429c8c4160052e3b2f902db7c830894b78ed9d416f434f0ea99c8e823b043943152465a49df4cd3023494539c149780539629

data/app/assets/stylesheets/trestle/_custom-auth.scss

@@ -0,0 +1,4 @@
+// This file is left as an extension point for user customization.
+//
+// It will be overridden by the similarly named file within
+// the app/assets folder of the Rails application.

data/app/assets/stylesheets/trestle/auth.scss

@@ -1,5 +1,6 @@
 // User-defined variables
 @import "trestle/support";
+@import "auth/defaults";
 
 // 3rd party dependencies
 @import "trestle/bootstrap";
@@ -7,3 +8,6 @@
 
 @import "auth/layout";
 @import "auth/form";
+
+// User customizations
+@import "trestle/custom-auth";

data/app/assets/stylesheets/trestle/auth/_defaults.scss

@@ -0,0 +1,13 @@
+$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-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/app/assets/stylesheets/trestle/auth/_form.scss

@@ -12,34 +12,15 @@ a {
   }
 }
 
-.remember-me {
-  display: block;
-  font-weight: normal;
-  color: rgba(white, 0.75);
-  background: rgba(black, 0.075);
-  border-radius: 5px;
-  padding: 10px 15px;
-  font-size: 13px;
-  cursor: pointer;
-
-  input {
-    margin-right: 10px;
-  }
-
-  &:hover {
-    background: rgba(black, 0.1);
-  }
-}
-
 .form-control, .input-group-addon {
-  background: rgba(white, 0.1);
-  border: none;
+  background: $auth-form-control-bg;
+  border: $auth-form-control-border;
 }
 
 .form-control {
   box-shadow: none;
 
-  color: white;
+  color: $auth-form-control-color;
 
   height: auto;
   padding: 12px 5px;
@@ -53,11 +34,11 @@ a {
   }
 
   &::placeholder {
-    color: rgba(white, 0.5);
+    color: $auth-form-control-placeholder;
   }
 
   &:-webkit-autofill {
-    -webkit-text-fill-color: white;
+    -webkit-text-fill-color: $auth-form-control-color;
 
     &, &:hover, &:focus, &:active {
       transition: background-color 9999999s ease-in-out 0s;
@@ -73,6 +54,27 @@ a {
   }
 }
 
+.remember-me {
+  display: block;
+  font-weight: normal;
+  color: $auth-remember-me-color;
+  background: $auth-remember-me-bg;
+  border-radius: 5px;
+  padding: 10px 15px;
+  font-size: 13px;
+  cursor: pointer;
+
+  input {
+    margin-right: 10px;
+    margin-top: 0;
+    vertical-align: middle;
+  }
+
+  &:hover {
+    background: opacify($auth-remember-me-bg, 0.05);
+  }
+}
+
 .btn {
   box-shadow: rgba(black, 0.1) 0 0 2px;
   padding: 12px;
@@ -82,20 +84,24 @@ a {
 .btn-primary {
   outline: none;
 
+  color: $auth-login-btn-color;
+  background: $auth-login-btn-bg;
+  border: $auth-login-btn-border;
+
   &:hover {
-    background-color: darken($btn-primary-bg, 2.5%);
-    border-color: darken($btn-primary-border, 5%);
+    background-color: darken($auth-login-btn-bg, 2.5%);
+    border-color: darken($auth-login-btn-border, 5%);
   }
 
   &:focus, &:active {
-    background-color: darken($btn-primary-bg, 5%);
-    border-color: darken($btn-primary-border, 10%);
+    background-color: darken($auth-login-btn-bg, 5%);
+    border-color: darken($auth-login-btn-border, 10%);
   }
 
   &:active:focus {
     outline: none !important;
-    background-color: darken($btn-primary-bg, 10%);
-    border-color: darken($btn-primary-border, 15%);
+    background-color: darken($auth-login-btn-bg, 10%);
+    border-color: darken($auth-login-btn-border, 15%);
   }
 }
 

data/app/assets/stylesheets/trestle/auth/_layout.scss

@@ -9,7 +9,7 @@ body {
   overflow: hidden;
 
   color: white;
-  background: $theme-bg;
+  background: $auth-bg;
 
   display: flex;
 }

data/config/locale/en.yml

@@ -1,8 +1,8 @@
 en:
   admin:
     auth:
-      my_account: My Account
-      login: Login
-      logout: Logout
-      error: Incorrect login details.
-      remember_me: Remember me
+      my_account: "My Account"
+      login: "Login"
+      logout: "Logout"
+      error: "Incorrect login details."
+      remember_me: "Remember me"

data/config/locale/pl.yml

@@ -0,0 +1,8 @@
+pl:
+  admin:
+    auth:
+      my_account: "Moje konto"
+      login: "Zaloguj się"
+      logout: "Wyloguj się"
+      error: "Nieprawidłowe dane logowania."
+      remember_me: "Zapamiętaj mnie"

data/config/locale/pt-BR.yml

@@ -0,0 +1,8 @@
+pt-BR:
+  admin:
+    auth:
+      my_account: "Minha Conta"
+      login: "Entrar"
+      logout: "Sair"
+      error: "Email ou Senha incorretos."
+      remember_me: "Lembrar-me"

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

@@ -51,6 +51,13 @@ module Trestle
               #   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)
+              # }
+
               # Enable or disable remember me functionality. Defaults to true.
               #
               # config.auth.remember.enabled = false
@@ -65,6 +72,12 @@ module Trestle
               #   User.authenticate_with_remember_token(token)
               # }
 
+              # Customize the method for finding a user given an ID from the session.
+              #
+              # config.auth.remember.find_user = ->(id) {
+              #   User.find_by(id: id)
+              # }
+
               # Customize the method for remembering a user.
               #
               # config.auth.remember.remember_me, ->(user) { user.remember_me! }

data/lib/trestle/auth.rb

@@ -7,6 +7,7 @@ module Trestle
     extend ActiveSupport::Autoload
 
     autoload :Configuration
+    autoload :Constraint
     autoload :ControllerMethods
     autoload :ModelMethods
     autoload :NullUser

data/lib/trestle/auth/configuration.rb

@@ -34,6 +34,10 @@ module Trestle
         user.locale if user.respond_to?(:locale)
       }
 
+      option :time_zone, ->(user) {
+        user.time_zone if user.respond_to?(:time_zone)
+      }
+
       option :remember, Rememberable.new
     end
   end

data/lib/trestle/auth/constraint.rb

@@ -0,0 +1,9 @@
+module Trestle
+  module Auth
+    class Constraint
+      def matches?(request)
+        Trestle.config.auth.find_user(request.session[:trestle_user]) if request.session[:trestle_user]
+      end
+    end
+  end
+end

data/lib/trestle/auth/controller_methods.rb

@@ -7,7 +7,9 @@ module Trestle
         helper_method :current_user, :logged_in?
 
         before_action :require_authenticated_user
-        around_action :set_locale
+
+        around_action :set_locale, if: :logged_in?
+        around_action :set_time_zone, if: :logged_in?
       end
 
     protected
@@ -69,10 +71,11 @@ module Trestle
       end
 
       def set_locale
-        self.locale = Trestle.config.auth.locale(current_user) || I18n.default_locale if logged_in?
-        yield
-      ensure
-        self.locale = I18n.default_locale
+        I18n.with_locale(Trestle.config.auth.locale(current_user) || I18n.default_locale) { yield }
+      end
+
+      def set_time_zone
+        Time.use_zone(Trestle.config.auth.time_zone(current_user) || Rails.application.config.time_zone) { yield }
       end
     end
   end

data/lib/trestle/auth/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Auth
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/trestle-auth.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |spec|
   spec.email         = ["sam@sampohlenz.com"]
 
   spec.summary       = "Authentication plugin for the Trestle admin framework"
-  spec.description   = "Authentication plugin for the Trestle admin framework."
   spec.homepage      = "https://www.trestle.io"
   spec.license       = "LGPL-3.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trestle
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Authentication plugin for the Trestle admin framework.
+description: 
 email:
 - sam@sampohlenz.com
 executables: []
@@ -95,7 +95,9 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/trestle/auth.js
+- app/assets/stylesheets/trestle/_custom-auth.scss
 - app/assets/stylesheets/trestle/auth.scss
+- app/assets/stylesheets/trestle/auth/_defaults.scss
 - app/assets/stylesheets/trestle/auth/_form.scss
 - app/assets/stylesheets/trestle/auth/_layout.scss
 - app/assets/stylesheets/trestle/auth/userbox.scss
@@ -106,6 +108,8 @@ files:
 - app/views/trestle/auth/sessions/new.html.erb
 - config/initializers/trestle.rb
 - config/locale/en.yml
+- config/locale/pl.yml
+- config/locale/pt-BR.yml
 - config/routes.rb
 - lib/generators/trestle/auth/admin/admin_generator.rb
 - lib/generators/trestle/auth/admin/templates/admin.rb.erb
@@ -114,6 +118,7 @@ files:
 - lib/trestle/auth.rb
 - lib/trestle/auth/configuration.rb
 - lib/trestle/auth/configuration/rememberable.rb
+- lib/trestle/auth/constraint.rb
 - lib/trestle/auth/controller_methods.rb
 - lib/trestle/auth/engine.rb
 - lib/trestle/auth/model_methods.rb
@@ -141,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Authentication plugin for the Trestle admin framework