app/controllers/nyauth/sessions_controller.rb in nyauth-0.2.8 vs app/controllers/nyauth/sessions_controller.rb in nyauth-0.3.0

@@ -1,26 +1,28 @@
 module Nyauth
   class SessionsController < ApplicationController
-    include Nyauth::ApplicationConcern
-    include Nyauth::ClientConcern
-    include Nyauth::SessionConcern
-    before_action -> { require_authentication! as: client_name }
+    include Nyauth::ControllerConcern
+    before_action -> { require_authentication! as: nyauth_client_name }
     allow_everyone only: [:new, :create]
     self.responder = Nyauth::AppResponder
     respond_to :html, :json
     before_action :set_session_service
 
     def new
     end
 
     def create
-      sign_in(@session_service.client) if @session_service.save(as: client_name)
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_in.call(client_name) || main_app.root_path
+      sign_in(@session_service.client) if @session_service.save(as: nyauth_client_name)
+      redirect_path =  session.delete("#{nyauth_client_name}_return_to")
+      respond_with @session_service,
+                   location: redirect_path || \
+                   Nyauth.configuration.redirect_path_after_sign_in.call(nyauth_client_name) || \
+                   main_app.root_path
     end
 
     def destroy
       sign_out
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(client_name) || new_session_path_for(client_name)
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(nyauth_client_name) || new_session_path_for(nyauth_client_name)
     end
 
     private
 
     def set_session_service