entrance 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5416b8f703403f4d2dce15affb5e0cf6584e8380
-  data.tar.gz: 6c4531e53b0ad51c23c06cb9f2486a0d9fa0f24d
+  metadata.gz: 538d36c02daa5e94fb32097d12e8866d3d64bc3a
+  data.tar.gz: bd49b081f1c840cfc6a1b76b95b4bba009cf37e2
 SHA512:
-  metadata.gz: a82b9471b8edff7a012477d76fb44664b2f43516e5105c7beb77902bf20f61a07e6ee385635a7b80c68c494b55b7304530c22ab35d7c1b45562e5e24250ee1fc
-  data.tar.gz: 2abfe646e6c97c3db4ed23500f5ceb5741d1080176e6a70deb1fce1e0ebf7ccf4cf0ba0a0b65ddcef861167b142828b41a01705dbfd4ebe739e4f6cc46355ec6
+  metadata.gz: 10219873d111c01af05ca8e0fb3b7392f3416eeb7149d13ffe15544239d7d0dd35e02a76d4277e95d6642a75cb11374ead3baad47d2711f27f187e4284db9869
+  data.tar.gz: 4260f27c3f752a887e666b65e905f7aed5468a13df1f35d7272d177f475b2a2133c644ec33de5dfafc6f9d803197c3984a968c57c640dd4dd7b5daba84bf47ba

data/README.md

@@ -24,7 +24,7 @@ end
 class ApplicationController < ActionController::Base
   include Entrance::Controller
 
-  before_filter :login_required
+  before_filter :login_required # provided by Entrance::Controller
 
   ...
 end

data/examples/sinatra-app/app/routes.rb

@@ -43,8 +43,6 @@ module Example
     post '/login' do
       if user = User.authenticate(params[:email], params[:password]) and user.active?
         remember = ['on', '1'].include?(params[:remember_me])
-
-        puts user.inspect
         login!(user, remember)
 
         flash[:success] = 'Welcome back!'

data/lib/entrance/addons/omniauth.rb

@@ -10,8 +10,10 @@ require 'entrance/addons/omniauth'
 class Hello < Sinatra::Base
   register Entrance::OmniAuth
 
+  set :sessions, true
   set :auth_test, false    # only true for testing
   set :auth_remember, true # enables 'remember me' for omniauth logins
+  set :auth_redirect, '/'  # where to redirect on successful login
   set :auth_providers, {
     :twitter => {
       :key => 'foobar'
@@ -57,8 +59,9 @@ module Entrance
         [:get, :post].each do |action|
 
           app.send(action, '/auth/:provider/callback') do
-            auth = request.env['omniauth.auth']
-            unless user = ::Entrance::OmniAuth.auth_or_create(auth)
+            auth   = request.env['omniauth.auth']
+            params = request.env["omniauth.params"]
+            unless user = ::Entrance::OmniAuth.auth_or_create(auth, params)
               # return return_401
               redirect_with(Entrance.config.access_denied_redirect_to, :error, 'Unable to create record for new user. Check the log file.')
             end
@@ -66,7 +69,7 @@ module Entrance
             if ::Entrance::OmniAuth.valid_user?(user)
               login!(user, app.settings.auth_remember)
               flash[:success] = 'Welcome back!' if respond_to?(:flash)
-              redirect_to_stored_or(to('/'))
+              redirect_to_stored_or(to(app.settings.auth_redirect))
             else
               redirect_with(Entrance.config.access_denied_redirect_to, :error, 'Unable to authenticate. Please try again.')
             end
@@ -89,6 +92,10 @@ module Entrance
       def log(str)
         logger.info(str) rescue nil
       end
+      
+      def omniauth_params
+        @omniauth_params
+      end
 
       def valid_user?(user)
         if user.respond_to?(:can_login?) and !user.can_login?
@@ -105,14 +112,14 @@ module Entrance
       def find_user_with_username(username)
         query = {}
         query[::Entrance.fields.username] = username # .to_s.downcase.strip
-        ::Entrance.model.where(query).first
+        scoped_model.where(query).first
       end
 
       def find_user_with_provider_and_uid(provider, uid)
         query = {}
         query[::Entrance.fields.auth_provider] = provider
         query[::Entrance.fields.auth_uid] = uid
-        ::Entrance.model.where(query).first
+        scoped_model.where(query).first
       end
 
       def set_auth_credentials(user, provider, uid)
@@ -129,14 +136,12 @@ module Entrance
         data = {}
         data[::Entrance.fields.name] = name
         data[::Entrance.fields.username] = email
-        user = ::Entrance.model.new(data)
+        user = scoped_model.new(data)
         set_auth_credentials(user, provider, uid)
 
         if user.valid?
           return user.save && user
         else
-          puts user.inspect
-          puts user.local?
           log "Invalid user: #{user.errors.to_a.join(', ')}"
           false
         end
@@ -144,7 +149,9 @@ module Entrance
 
       # authorizes or creates a user with the given oauth credentials.
       # does not check if user is banned or not (the /callback route does that)
-      def auth_or_create(auth)
+      def auth_or_create(auth, params = {})
+        @omniauth_params = params
+        
         provider, uid = auth['provider'], auth['uid']
         info = auth['info'] || {}
 

data/lib/entrance/fields.rb

@@ -15,9 +15,9 @@ module Entrance
       @password              = 'password_hash'
 
       # remember and reset
-      @remember_token        = 'remember_token'
+      @remember_token        = 'remember_token' # set to nil to disable 'remember me' option
       @remember_until        = 'remember_token_expires_at'
-      @reset_token           = 'reset_token'
+      @reset_token           = 'reset_token'    # set to nil to disable 'reset password' option
       @reset_until           = 'reset_token_expires_at'
 
       # omniauth

data/lib/entrance/version.rb

@@ -1,7 +1,7 @@
 module Entrance
   MAJOR = 0
-  MINOR = 5
-  PATCH = 3
+  MINOR = 6
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entrance
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -146,9 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: entrance
-rubygems_version: 2.2.0
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Lean authentication alternative for Rails and Sinatra.
 test_files: []
-has_rdoc: