minimalist_authentication 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d020d82d864706eb3048098a397f68a6dd1cbf7
-  data.tar.gz: 0ebabb35dda1683be51aff8132a84fbb851f1da7
+  metadata.gz: 16ed1dfe1bdc98a54c7eb28354a075b3d0d2f750
+  data.tar.gz: e765bfe8fff4491147ba167239dc731ea632110d
 SHA512:
-  metadata.gz: fb9ec1fde1bbf9d5ba15778b0b52b906b67cf2a76e5a5c44ed1159d72377b2fc313f81bde6d54423e4229111b14927ac3e7ef695dd0fc5c21b2631b0f4663a2a
-  data.tar.gz: 82e0db4943b2b1e4b8e0fe4320876079a5a38609a0add94598bc01f4d68e101560cf1e5569814076aa62918461374068c8ad5531cf3eb87dcd3e57f4d80bb893
+  metadata.gz: 672dc8cb16782c78e71b420e5496ef3ecb88eba36bbe7ff18fe3f526d5787d0ea1f70a66b982616048f8b6ff2327fa305aa4559ea1aa245525c1a0f1c5f776d7
+  data.tar.gz: 2773fe5d5534866f6e981b79002d13222ce2aa0a35d7fa9ebeb3908444e08bd62aadbb1a1271267ee4fa31530aade23321fb91a683d8140ccf877b3620b758ab

data/README.md

@@ -32,7 +32,7 @@ Include Minimalist::Authorization in your ApplicationController (app/controllers
 ```ruby
 class ApplicationController < ActionController::Base
   include Minimalist::Authorization
-  
+
   # Lock down everything by default
   # use skip_before_action to open up specific actions
   before_action :authorization_required
@@ -43,7 +43,6 @@ Include Minimalist::Sessions in your SessionsController (app/controllers/session
 ```ruby
 class SessionsController < ApplicationController
   include Minimalist::Sessions
-  skip_before_action :authorization_required, only: %i(new create)
 end
 ```
 
@@ -54,6 +53,9 @@ class ActiveSupport::TestCase
 end
 ```
 
+## Build
+[![Build Status](https://travis-ci.org/wwidea/minimalist_authentication.svg?branch=master)](https://travis-ci.org/wwidea/minimalist_authentication)
+
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/minimalist/authentication.rb

@@ -4,7 +4,7 @@ require 'bcrypt'
 module Minimalist
   module Authentication
     extend ActiveSupport::Concern
-    
+
     GUEST_USER_EMAIL = 'guest'
     PREFERRED_DIGEST_VERSION = 3
 
@@ -29,10 +29,11 @@ module Minimalist
     end
 
     module ClassMethods
-      def authenticate(email, password)
-        return if email.blank? || password.blank?
-        user = active.where(email: email).first
-        return unless user && user.authenticated?(password)
+      def authenticate(params)
+        field, value = params.to_h.select { |key, value| %w(email username).include?(key.to_s) && value.present? }.first
+        return if field.blank? || value.blank? || params[:password].blank?
+        user = active.where(field => value).first
+        return unless user && user.authenticated?(params[:password])
         return user
       end
 

data/lib/minimalist/sessions.rb

@@ -1,55 +1,65 @@
 module Minimalist
   module Sessions
+    extend ActiveSupport::Concern
 
-    def show
-      redirect_to new_session_path
+    included do
+      skip_before_action :authorization_required,     only: %i(new create)
+      skip_before_action :verify_authenticity_token,  only: %i(create destroy)
     end
-    
+
     def new
       @user = User.new
     end
 
     def create
-      if user = User.authenticate(user_params[:email], user_params[:password])
-        user.logged_in
-        session[:user_id] = user.id
-        after_authentication(user)
-        redirect_back_or_default(login_redirect_to(user))
+      if authenticated_user
+        scrub_session!
+        authenticated_user.logged_in
+        session[:user_id] = authenticated_user.id
+        after_authentication_success
         return
       else
         after_authentication_failure
-        flash.now[:alert] = "Couldn't log you in as '#{user_params[:email]}'"
-        render action: 'new'
       end
     end
 
     def destroy
-      session[:user_id] = nil
+      scrub_session!
       flash[:notice] = "You have been logged out."
       redirect_to logout_redirect_to
     end
 
-
     private
-    
+
+    def authenticated_user
+      @authenticated_user ||= User.authenticate(user_params)
+    end
+
     def user_params
-      @user_params ||= params.require(:user).permit(:email, :password)
+      @user_params ||= params.require(:user).permit(:email, :username, :password)
     end
 
-    def login_redirect_to(user)
-      '/'
+    def after_authentication_success
+      redirect_back_or_default(login_redirect_to)
     end
 
-    def logout_redirect_to
-      '/'
+    def after_authentication_failure
+      flash.now[:alert] = "Couldn't log you in as '#{user_params[:email] || user_params[:username]}'"
+      render :new
     end
 
-    def after_authentication(user)
-      # overide in application
+    def scrub_session!
+      (session.keys - %w(session_id _csrf_token return_to)).each do |key|
+        session.delete(key)
+      end
     end
 
-    def after_authentication_failure
-      # overide in application
+    def login_redirect_to
+      root_path
+    end
+
+    def logout_redirect_to
+      new_session_path
     end
   end
 end

data/lib/minimalist/test_helper.rb

@@ -3,8 +3,8 @@ module Minimalist
     def login_as(user_fixture_name, password = 'password')
       post session_path, params: { user: { email: users(user_fixture_name).email, password: password } }
     end
-    
-    
+
+
     def current_user
       @current_user ||= (@request.session[:user_id] ? User.find(@request.session[:user_id]) : nil)
     end

data/lib/minimalist_authentication/version.rb

@@ -1,3 +1,3 @@
 module MinimalistAuthentication
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimalist_authentication
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Rails authentication plugin that takes a minimalist approach.