Merge pull request #97 from AlchemyCMS/admin-controllers

Move session controllers into admin module namespace

Author: tvdeyen

app/controllers/alchemy/admin/passwords_controller.rb

@@ -0,0 +1,33 @@
+module Alchemy
+  module Admin
+    class PasswordsController < ::Devise::PasswordsController
+      include Alchemy::Admin::Locale
+
+      before_action { enforce_ssl if ssl_required? && !request.ssl? }
+
+      helper 'Alchemy::Admin::Base'
+
+      layout 'alchemy/admin'
+
+      private
+
+      # Override for Devise method
+      def new_session_path(resource_name)
+        alchemy.admin_login_path
+      end
+
+      def admin_edit_password_url(resource, options={})
+        alchemy.admin_edit_password_url(options)
+      end
+
+      def after_resetting_password_path_for(resource)
+        if can? :index, :alchemy_admin_dashboard
+          alchemy.admin_dashboard_path
+        else
+          alchemy.root_path
+        end
+      end
+
+    end
+  end
+end

app/controllers/alchemy/admin/user_sessions_controller.rb

@@ -0,0 +1,60 @@
+module Alchemy
+  module Admin
+    class UserSessionsController < ::Devise::SessionsController
+      include Alchemy::Admin::Locale
+
+      protect_from_forgery prepend: true
+
+      before_action except: 'destroy' do
+        enforce_ssl if ssl_required? && !request.ssl?
+      end
+
+      before_action :check_user_count, :only => :new
+
+      helper 'Alchemy::Admin::Base'
+
+      layout 'alchemy/admin'
+
+      def create
+        authenticate_user!
+
+        if user_signed_in?
+          if session[:redirect_path].blank?
+            redirect_path = admin_dashboard_path
+          else
+            # We have to strip double slashes from beginning of path, because of strange rails/rack bug.
+            redirect_path = session[:redirect_path].gsub(/\A\/{2,}/, '/')
+          end
+          redirect_to redirect_path,
+            notice: t(:signed_in, scope: 'devise.sessions')
+        else
+          super
+        end
+      end
+
+      def destroy
+        current_alchemy_user.try(:unlock_pages!)
+        cookies.clear
+        session.clear
+        super
+      end
+
+      private
+
+      def check_user_count
+        if User.count == 0
+          redirect_to admin_signup_path
+        end
+      end
+
+      # Overwriting the default of Devise
+      def after_sign_out_path_for(resource_or_scope)
+        if request.referer.blank? || request.referer.to_s =~ /admin/
+          root_path
+        else
+          request.referer
+        end
+      end
+    end
+  end
+end

app/controllers/alchemy/passwords_controller.rb

@@ -5,7 +5,7 @@ class Notifications < ActionMailer::Base
 
     def member_created(user)
       @user = user
-      @url = login_url
+
       mail(
         to: user.email,
         subject: Alchemy.t("Your user credentials")

app/controllers/alchemy/user_sessions_controller.rb

@@ -10,13 +10,13 @@
     <%= devise_error_messages! %>
   </div>
 <% end %>
-  <%= alchemy_form_for resource, as: resource_name, url: update_password_path, method: 'patch' do |f| %>
+  <%= alchemy_form_for resource, as: resource_name, url: admin_update_password_path, method: 'patch' do |f| %>
     <%= f.hidden_field :reset_password_token %>
     <%= f.input :password, autofocus: true, label: Alchemy.t("New password") %>
     <%= f.input :password_confirmation, label: Alchemy.t("Confirm new password") %>
     <div class="input link">
       <small>
-        <%= link_to Alchemy.t(:back), alchemy.login_path %>
+        <%= link_to Alchemy.t(:back), alchemy.admin_login_path %>
       </small>
     </div>
     <%= f.submit Alchemy.t("Change password") %>

app/mailers/alchemy/notifications.rb

@@ -10,13 +10,13 @@
     <%= devise_error_messages! %>
   </div>
 <% end %>
-  <%= alchemy_form_for :user, url: reset_password_path, html: {method: 'post'} do |f| %>
+  <%= alchemy_form_for :user, url: admin_reset_password_path, html: {method: 'post'} do |f| %>
     <%= f.input :email,
       autofocus: true,
       input_html: {value: params[:email]} %>
     <div class="input link">
       <small>
-        <%= link_to Alchemy.t(:back), alchemy.login_path %>
+        <%= link_to Alchemy.t(:back), alchemy.admin_login_path %>
       </small>
     </div>
     <%= f.submit Alchemy.t("Send reset instructions"), input_html: {class: 'secondary'} %>

app/views/alchemy/passwords/edit.html.erb …ws/alchemy/admin/passwords/edit.html.erbapp/views/alchemy/passwords/edit.html.erb renamed to app/views/alchemy/admin/passwords/edit.html.erb app/views/alchemy/passwords/edit.html.erb renamed to app/views/alchemy/admin/passwords/edit.html.erb

@@ -5,7 +5,7 @@
     <%= f.input :password %>
     <div class="input link">
       <small>
-        <%= link_to Alchemy.t('Forgot your password?'), new_password_path %>
+        <%= link_to Alchemy.t('Forgot your password?'), admin_new_password_path %>
       </small>
     </div>
     <div class="submit">

app/views/alchemy/passwords/new.html.erb …ews/alchemy/admin/passwords/new.html.erbapp/views/alchemy/passwords/new.html.erb renamed to app/views/alchemy/admin/passwords/new.html.erb app/views/alchemy/passwords/new.html.erb renamed to app/views/alchemy/admin/passwords/new.html.erb

@@ -10,6 +10,6 @@ Aus Sicherheitsgründen stellen wir Ihr Passwort hier nicht dar.
 
 Wenn Sie Ihr Passwort vergessen haben oder dies Ihr erster Login ist, gehen Sie bitte auf:
 
-<%= alchemy.new_password_url %>
+<%= alchemy.admin_new_password_url %>
 
 Viel Spaß mit Alchemy!

…views/alchemy/user_sessions/new.html.erb …alchemy/admin/user_sessions/new.html.erbapp/views/alchemy/user_sessions/new.html.erb renamed to app/views/alchemy/admin/user_sessions/new.html.erb app/views/alchemy/user_sessions/new.html.erb renamed to app/views/alchemy/admin/user_sessions/new.html.erb

@@ -10,6 +10,6 @@ For security reasons we do not show your password here.
 
 If you forgot your password or this is your first login, please goto:
 
-<%= alchemy.new_password_url %>
+<%= alchemy.admin_new_password_url %>
 
 Have much fun with Alchemy!