Password expire: implement password resource inside profile. add before_fiter check

Dmitriy Zaporozhets
1 parent 81a9e81f
Showing 4 changed files with 66 additions and 0 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/passwords_controller.rb
app/views/passwords/new.html.haml
config/routes.rb
 class ApplicationController < ActionController::Base
   before_filter :authenticate_user!
   before_filter :reject_blocked!
+  before_filter :check_password_expiration!
   before_filter :set_current_user_for_thread
   before_filter :add_abilities
   before_filter :dev_tools if Rails.env == 'development'
@@ -156,4 +157,10 @@ class ApplicationController &lt; ActionController::Base
     gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
     gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
   end
+
+  def check_password_expiration
+    if current_user.password_expires_at < Time.now
+      redirect_to new_profile_password_path and return
+    end
+  end
 end
@@ -0,0 +1,35 @@
+class PasswordsController < ApplicationController
+  layout 'navless'
+
+  before_filter :set_user
+  before_filter :set_title
+
+  def new
+  end
+
+  def create
+    new_password = params[:user][:password]
+    new_password_confirmation = params[:user][:password_confirmation]
+
+    result = @user.update_attributes(
+      password: new_password,
+      password_confirmation: new_password_confirmation
+    )
+
+    if result
+      redirect_to root_path(notice: 'Password successfully changed')
+    else
+      render :new
+    end
+  end
+
+  private
+
+  def set_user
+    @user = current_user
+  end
+
+  def set_title
+    @title = "New password"
+  end
+end
@@ -0,0 +1,23 @@
+%h3.page_title Setup your new password
+
+%br
+
+= form_for @user, url: profile_password_path, method: :put do |f|
+  .padded
+    %p.slead After successful password update you will be redirected to dashboard
+    -if @user.errors.any?
+      .alert.alert-error
+        %ul
+          - @user.errors.full_messages.each do |msg|
+            %li= msg
+
+    .clearfix
+      = f.label :password
+      .input= f.password_field :password, required: true
+    .clearfix
+      = f.label :password_confirmation
+      .input
+        = f.password_field :password_confirmation, required: true
+    .clearfix
+      .input
+        = f.submit 'Save password', class: "btn btn-save"
@@ -123,6 +123,7 @@ Gitlab::Application.routes.draw do
     end
  
     resource :notifications
+    resource :password
   end
  
   resources :keys
1	1	class ApplicationController < ActionController::Base
2	2	before_filter :authenticate_user!
3	3	before_filter :reject_blocked!
	4	+ before_filter :check_password_expiration!
4	5	before_filter :set_current_user_for_thread
5	6	before_filter :add_abilities
6	7	before_filter :dev_tools if Rails.env == 'development'
...	...	@@ -156,4 +157,10 @@ class ApplicationController < ActionController::Base
156	157	gon.gravatar_url = request.ssl? \|\| Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
157	158	gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
158	159	end
	160	+
	161	+ def check_password_expiration
	162	+ if current_user.password_expires_at < Time.now
	163	+ redirect_to new_profile_password_path and return
	164	+ end
	165	+ end
159	166	end
...	...
...	...	@@ -0,0 +1,35 @@
	1	+class PasswordsController < ApplicationController
	2	+ layout 'navless'
	3	+
	4	+ before_filter :set_user
	5	+ before_filter :set_title
	6	+
	7	+ def new
	8	+ end
	9	+
	10	+ def create
	11	+ new_password = params[:user][:password]
	12	+ new_password_confirmation = params[:user][:password_confirmation]
	13	+
	14	+ result = @user.update_attributes(
	15	+ password: new_password,
	16	+ password_confirmation: new_password_confirmation
	17	+ )
	18	+
	19	+ if result
	20	+ redirect_to root_path(notice: 'Password successfully changed')
	21	+ else
	22	+ render :new
	23	+ end
	24	+ end
	25	+
	26	+ private
	27	+
	28	+ def set_user
	29	+ @user = current_user
	30	+ end
	31	+
	32	+ def set_title
	33	+ @title = "New password"
	34	+ end
	35	+end
...	...
...	...	@@ -0,0 +1,23 @@
	1	+%h3.page_title Setup your new password
	2	+
	3	+%br
	4	+
	5	+= form_for @user, url: profile_password_path, method: :put do \|f\|
	6	+ .padded
	7	+ %p.slead After successful password update you will be redirected to dashboard
	8	+ -if @user.errors.any?
	9	+ .alert.alert-error
	10	+ %ul
	11	+ - @user.errors.full_messages.each do \|msg\|
	12	+ %li= msg
	13	+
	14	+ .clearfix
	15	+ = f.label :password
	16	+ .input= f.password_field :password, required: true
	17	+ .clearfix
	18	+ = f.label :password_confirmation
	19	+ .input
	20	+ = f.password_field :password_confirmation, required: true
	21	+ .clearfix
	22	+ .input
	23	+ = f.submit 'Save password', class: "btn btn-save"
...	...
...	...	@@ -123,6 +123,7 @@ Gitlab::Application.routes.draw do
123	123	end
124	124
125	125	resource :notifications
	126	+ resource :password
126	127	end
127	128
128	129	resources :keys
...	...