brightcontent-core 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4728c556a9210324820656f23e9f3f6158e64936452ca928d9caf49aba63792b
-  data.tar.gz: 5a7255c6d7f22eec541ba1ed0bd7804a1ad7fc9bcd039b460f918dca7e6ed0d7
+  metadata.gz: 12c7f53b58837c974cbaa3aa92e6fa884e2ba2f3fdc264121ef1b2ef56dd324d
+  data.tar.gz: 7edc026e01dd198e6003a14e3105638ecba9504e1a2aa2b21911216b6b9440e5
 SHA512:
-  metadata.gz: 1f011fad510317317fa9fa1f83ca53122c5138efe632aefe16a05ad4b4343c3309c29ae8729630fe86d8a71e7fbd3baa649b094c46caae6cf5e3d4ec66ac5346
-  data.tar.gz: ee8dee6153c1eaad9ef354590cf34ed8d3b0419bcb79919edc3595b59be88b97bb45dc26afb20f76ee5df2a08726d1a647c64161103cf05ad8bf6f3b1e9003da
+  metadata.gz: 4e0e2eef043e8f3ef0634f46f136fc37fb99ad944d3ee076c8cda9ffb6aca3f9c9e2efa868ca97767a6e0b24cea887ef5e6b73ba41acfc466fb94daa9f091c10
+  data.tar.gz: 92285171b581c06fba8317f1f6e925df39187d6a1e833dcaf188d5875caa07798aa70602003d6a8b1c752c771017467c1235367a52a7d45042c51c1a8217fa46

data/app/controllers/brightcontent/application_controller.rb

@@ -33,7 +33,10 @@ module Brightcontent
     helper_method :user_resources
 
     def authorize
-      redirect_to login_url unless current_user
+      unless current_user
+        session[:return_to] = request.original_url
+        redirect_to login_url
+      end
     end
   end
 end

data/app/controllers/brightcontent/sessions_controller.rb

@@ -5,14 +5,14 @@ module Brightcontent
     skip_before_action :authorize
 
     def new
-      redirect_to root_url if current_user
+      redirect_after_login if current_user
     end
 
     def create
       user = Brightcontent.user_model.authenticate(params[:email], params[:password])
       if user
         session[:brightcontent_user_id] = user.id
-        redirect_to root_url
+        redirect_after_login
       else
         flash.now[:danger] = "Email or password is invalid"
         render :new
@@ -21,7 +21,14 @@ module Brightcontent
 
     def destroy
       session[:brightcontent_user_id] = nil
+      session[:return_to] = nil
       redirect_to root_url
     end
+
+    private
+
+    def redirect_after_login
+      redirect_to session.delete(:return_to).presence || root_url
+    end
   end
 end

data/spec/features/login_spec.rb

@@ -27,6 +27,11 @@ feature "Login" do
     page.should have_content "Please sign in"
   end
 
+  scenario "Return to original page after logging in " do
+    sign_in "/admin/grouped_blogs"
+    current_url.should end_with "/admin/grouped_blogs"
+  end
+
   def sign_in_with_invalid_email
     @user = create(:admin_user)
     visit "/admin"

data/spec/support/acceptance_helper.rb

@@ -1,6 +1,6 @@
-def sign_in
+def sign_in(url = "/admin")
   user = create(:admin_user)
-  visit "/admin"
+  visit url
   fill_in "Email", with: user.email
   fill_in "Password", with: "password"
   click_button "Login"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails