lockie 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4891f7485ad02efb026b823bc53c1975f05661eca97414310fdf89a93305188d
-  data.tar.gz: 4ba661f6c8e3e40415695f9fecd2fe7fb7e3d9d2ef5542af7420792575c7d399
+  metadata.gz: a87647ec7963dd3953e0409c1d850a6e722b5a18571bae84086f31f68ab15ac8
+  data.tar.gz: 19c6d8fa8f2b6d65012162a39a5aa9ce03bb32e285ed261a520e532fa497c24a
 SHA512:
-  metadata.gz: a1d92c0e6f02c98dcd46adc5fdb9559e9593f7c6f90f513eca1569d00ea77fa14c6b58afa41470806477b57bb786b191cd9e29d5fd3e9b1dbdd351bc46186f16
-  data.tar.gz: 70ae39adb0997816279aac2880cdc274dd1b2e1e253ac4008aa7bcd0cd50348fc1a6ac2731c9714c96a9a857b0a04e5f62ddfb976052393f739e464a2960a5b6
+  metadata.gz: b84e03fe168abe2a12e3b194894f0d512acac984681b04d4a8c2e53b3c399dfb6fe6df9adfc7794cd292f1c276bd59fd4dc2258138abc5eec2e82c4a650f2fc5
+  data.tar.gz: 306fb63d6cfa264c1ef6f18c72d9ec311d7ef90816ac36022d2bb102f17d6dcd71be95d6f313a97e062ef8bd688f257166b720108ca48ea514223526d95ea8d3

data/README.md

@@ -9,7 +9,7 @@ A drop-in, none assuming warden based Password and JWT authentication for Rails
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'lockie', '~> 0.3.1'
+gem 'lockie', '~> 0.3.3'
 ```
 
 And then execute:
@@ -41,8 +41,12 @@ Session controller
 class SessionController < ApplicationController
   skip_before_action :authenticate!, only: [:new]
 
+  def new
+    session[:callback_url] = params[:callback_url] if params[:callback_url]
+  end
+  
   def create    
-    redirect_to root_url # redirect to your homepage if username and password is valid
+    redirect_to session[:callback_url] || root_url
   end
 
   def destroy

data/lib/lockie/failure_app.rb

@@ -34,9 +34,12 @@ module Lockie
       flash[type] = message if message
       self.status = 302
       if Lockie.config.callback_url
-        callback_url = request.base_url + request.original_fullpath
         uri = URI(warden_options[:unauthenticated_path] || Lockie.config.unauthenticated_path)
-        uri.query = (uri.query.to_s.split("&") << "callback_url=#{ callback_url }").join("&")
+        # only add callback_url if original path is not the same with login path
+        unless request.original_fullpath == uri.path
+          callback_url = request.base_url + request.original_fullpath
+          uri.query = (uri.query.to_s.split("&") << "callback_url=#{ callback_url }").join("&")
+        end
         redirect_to uri.to_s
       else
         redirect_to Lockie.config.unauthenticated_path
@@ -44,7 +47,7 @@ module Lockie
     end
 
     def message
-      @message ||= request.env['warden.message'] || "Unauthorized"
+      @message ||= request.env['warden.message'] 
     end
 
     def warden_options

data/lib/lockie/version.rb

@@ -1,3 +1,3 @@
 module Lockie
-  VERSION = '0.3.1'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockie
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,7 +119,7 @@ homepage: https://github.com/melvinsembrano/lockie
 licenses:
 - MIT
 metadata:
-  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'''
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Drop in password and JWT token authentication for Ruby on Rails