trestle-auth-otp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa70c1631d8f06c4e290a69ccef4bad9f5e02684d7af49d1cd0bc496ff499d23
-  data.tar.gz: ac440bb9299832f574996ba8dc782d301378d939182235b381a6cc40d5c43601
+  metadata.gz: ab6852c8a3f306278dcb768a3402db8e9c5c60b326591738f048c0171872b8ed
+  data.tar.gz: 78b38ba718aa93cea3475987b2df9e1fbe0323150e437a53d77d94e46eb5b59f
 SHA512:
-  metadata.gz: 55d0941ed0ae31609d51744bb0f80224eb698bf4a2e12381c993b597fd33ddf26e7f866f9e9d1dbba441a97f127ab14ccefd2306c9b950143c7a1252cea805a9
-  data.tar.gz: ff0f42eb7c5abe45e36a66fe3cef72350341c17dd5c6f470a73d16f1a59da4e54b7dbe5fe1cc93bee7354119680602f730f94a02a2897ad2d96546a41c4a6dba
+  metadata.gz: 8a6bcfddae92e9878c7697044b4d7e432663cba9ca0bacfde9b3c5cb9f6435fcd5ae5da4c9671894cdb8f8c925573b72d17d206f6729fa92297caa83fe8ef6db
+  data.tar.gz: c64a1b2b991cbad6a55c86e908e477b47f76f66c6eddac04e9b15b91ae22e1a1f80e3539f0a08b67dace50518da57ad1156c80ec7e3c721023047dea6a115c0b

data/.gitignore

@@ -12,3 +12,5 @@
 /spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
 /spec/dummy/tmp/*
+
+*.gem

data/config/initializers/trestle.rb

@@ -4,4 +4,22 @@ Trestle.configure do |config|
     render 'trestle/auth/otp'
   end
 
+  config.auth.authenticate = ->(params) {
+
+    scope = Trestle.config.auth.user_scope
+
+    user = scope.authenticate(params[Trestle.config.auth.authenticate_with], params[:password])
+
+    if user && user.otp_module?
+      if params[:otp_code_token].present? && user.authenticate_otp(params[:otp_code_token], drift: 60)
+        return user
+      else
+        return false
+      end
+    else
+      return user
+    end
+
+  }
+
 end

data/lib/trestle/auth/otp.rb

@@ -1,6 +1,7 @@
 require "trestle/auth/otp/version"
 
 require "trestle"
+require "trestle/auth"
 
 require "active_model_otp"
 require "rqrcode"

data/lib/trestle/auth/otp/version.rb

@@ -1,7 +1,7 @@
 module Trestle
   module Auth
     module Otp
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/trestle-auth-otp.gemspec

@@ -26,4 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rqrcode", "~> 1.1"
 
   spec.add_development_dependency "rspec-rails",         "~> 3.0"
+  spec.add_development_dependency "show_me_the_cookies", "~> 5.0"
+  spec.add_development_dependency "timecop",             "~> 0.9.1"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trestle-auth-otp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Emanuele Barban
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: show_me_the_cookies
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: 
 email: 
 executables: []
@@ -94,7 +122,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/trestle/auth/sessions_controller.rb
 - app/views/trestle/admin/_qr_code.html.erb
 - app/views/trestle/auth/_otp.html.erb
 - bin/rails

data/app/controllers/trestle/auth/sessions_controller.rb

@@ -1,48 +0,0 @@
-class Trestle::Auth::SessionsController < Trestle::ApplicationController
-  layout 'trestle/auth'
-
-  skip_before_action :authenticate_user, only: [:new, :create]
-  skip_before_action :require_authenticated_user
-
-  def new; end
-
-  def create
-    if user = Trestle.config.auth.authenticate(params)
-
-      if user&.otp_module?
-        if params[:otp_code_token].size > 0
-          if user.authenticate_otp(params[:otp_code_token], drift: 60)
-            continue_sign_in(user)
-          else
-            logout!
-            flash[:error] = t('admin.auth.error', default: 'Bad Credentials Supplied.')
-            redirect_to instance_exec(&Trestle.config.auth.redirect_on_login)
-          end
-        else
-          logout!
-          flash[:error] = t('admin.auth.error', default: 'Your account needs to supply a token.')
-          redirect_to instance_exec(&Trestle.config.auth.redirect_on_login)
-        end
-      else
-        continue_sign_in(user)
-      end
-    else
-      flash[:error] = t('admin.auth.error', default: 'Incorrect login details.')
-      redirect_to action: :new
-    end
-  end
-
-  def destroy
-    logout!
-    redirect_to instance_exec(&Trestle.config.auth.redirect_on_logout)
-  end
-
-  private
-
-  def continue_sign_in(user)
-    login!(user)
-    remember_me! if params[:remember_me] == '1'
-    redirect_to previous_location || instance_exec(&Trestle.config.auth.redirect_on_login)
-  end
-end
-