cafe-grader-web Commit - r759:6c24fe0db627

cafe-grader-web

Commit `r759:6c24fe0db627` public

parent | child

Description:

fix user profile, add test

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r759:6c24fe0db627 - Fri, 04 Oct 2019 12:13:26 - 7 files changed: 64 inserted, 43 deleted

app/controllers/users_controller.rb ¶ +12 -5

               require 'net/smtp'
               class UsersController < ApplicationController
                 include MailHelperMethods
                 before_action :check_valid_login, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
                 before_action :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
-            -   before_action :check_valid_login, :profile_authorization, only: [:profile]
                 before_action :admin_authorization, only: [:stat, :toggle_activate, :toggle_enable]
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
                   if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
+            +   # edit logged in user profile
+            +   def profile
+            +     if !GraderConfiguration['system.user_setting_enabled']
+            +       redirect_to :controller => 'main', :action => 'list'
+            +     else
+            +       @user = current_user;
+            +     end
+            +   end
+            +
                 def chg_passwd
                   user = User.find(session[:user_id])
-            -     user.password = params[:passwd]
+            +     user.password = params[:password]
-            -     user.password_confirmation = params[:passwd_verify]
+            +     user.password_confirmation = params[:password_confirmation]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
-            -     redirect_to :action => 'index'
+            +     redirect_to :action => 'profile'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   @user = User.new(user_params)
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                   mail_body = t('registration.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   mail_subject = "[#{contest_name}] Password recovery"
                   mail_body = t('registration.password_retrieval.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 # allow viewing of regular user profile only when options allow so
                 # only admins can view admins profile
                 def profile_authorization
                   #if view admins' profile, allow only admin
                   return false unless(params[:id])
                   user = User.find(params[:id])
                   return false unless user
                   return admin_authorization if user.admin?
                   return true if GraderConfiguration["right.user_view_submission"]
                   #finally, we allow only admin
                   admin_authorization
                 end
                 private
                   def user_params
                     params.require(:user).permit(:login, :full_name, :email)
                   end
               end

app/views/layouts/_header.html.haml ¶ +1 -1

                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Tags', 'tags', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'User Groups', 'groups', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Current Score', 'report', 'current_score')
                               = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Report', 'report', 'multiple_login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
-            -             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
+            +             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')
                           = add_menu( '[Report]', 'report', 'multiple_login')
                           = add_menu( '[Graders]', 'graders', 'list')
                           = add_menu( '[Contests]', 'contest_management', 'index')
                           = add_menu( '[Sites]', 'sites', 'index')
                           = add_menu( '[System config]', 'configurations', 'index')

app/views/user_admin/_form.html.haml ¶ +1 -3

               = simple_form_for(@user) do |f|
                 = f.error_notification
-            -   .row
-            -     .col-md-6.col-md-offset-2
                 = f.input :login, label: 'Login'
                 = f.input :full_name, label: 'Full name'
                 = f.input :password
                 = f.input :password_confirmation
                 = f.input :email
                 = f.input :alias
                 = f.input :remark
-            -       = f.button :submit, class: 'btn btn-success'
+            +   = f.button :submit, class: 'btn btn-primary'
                 = link_to 'Cancel', :back, class: 'btn btn-default'

app/views/user_admin/edit.html.haml ¶ +5

+            + .container-fluid
+            +   .row
+            +     .col-md-6
                     %h1 Editing user
+            +   .row
+            +     .col-md-6
                     = simple_form_for @user, url: user_admin_path(@user) do |f|
                       = render partial: 'form', local: f

app/views/users/profile.html.haml ⬅ ~~app/views/users/index.html.haml~~ renamed ¶ +22 -34

@@ -1,36 +1,24
1	- = user_title_bar(@user)
2	-
3	- %h1 Your account settings
4	-
5	- -#%p
6	- -#You can edit your alias and e-mails. Just click on the text and edit it.
7		1
8	- %table.table.table-bordered{:style => "width:30%"}	2	+ .container-fluid
9	- %tr
10	- %th Login
11	- %td= @user.login
12	- %tr
13	- %th Full name
14	- %td= @user.full_name
15	- -#%tr
16	- -#%th.uinfo Alias
17	- -#%td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
18	- -#%tr
19	- -#%th.uinfo E-mail
20	- -#%td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
21	- %tr
22	- %th Password
23	- %td
24	= form_tag :action => 'chg_passwd', :method => 'post' do	3	= form_tag :action => 'chg_passwd', :method => 'post' do
25	- %table	4	+ .row
26	- %tr	5	+ .col-md-6
27	- %td	6	+ %h1 Your account settings
28	- %input{:type => "password", :class => "form-control", :name => "passwd", :id => "passwd"}	7	+ .form-group
29	- %td (new)	8	+ %label{:for => "login"} Login
30	- ~~%tr~~	9	+ =@user.login
31	- %td	10	+ .form-group
32	- %input{:type => "password", :class => "form-control", :name => "passwd_verify", :id => "passwd_verify"}	11	+ %label{:for => "full_name"} Full name
33	- %td (verify)	12	+ =@user.full_name
34	- %tr	13	+ .form-group
35	- %td{:colspan => "2"}	14	+ %label{:for => "password"} Password
36	- %input{:type => "button", :class => "btn btn-default", :name => "commit", :value => "Change Password"}	15	+ =password_field_tag :password, nil, class: 'form-control'
		16	+ .form-group
		17	+ %label{:for => "password_confirmation"} Password confirmation
		18	+ =password_field_tag :password_confirmation, nil, class: 'form-control'
		19	+ .row
		20	+ .col-md-6
		21	+ =submit_tag 'Edit', class: 'btn btn-primary'
		22	+
		23	+
		24	+

config/routes.rb ¶ +4

                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                     get 'quick_create'
                     post 'do_manage'
                     post 'do_import'
                   end
                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                     delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
                     delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
                     post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
                     delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
                     delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
                   end
                   collection do
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                     get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
+            +     collection do
+            +       get 'profile'
+            +       post 'chg_passwd'
+            +     end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
                     get 'source'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #user admin
                 resources :user_admin  do
                   collection do
                     match 'bulk_manage', via: [:get, :post]
                     get 'bulk_mail'
                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
                     get 'active'
                     get 'mass_mailing'
                     get 'revoke_admin'
                     post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     match 'random_all_passwords', via: [:get, :post]
                   end
                   member do
                     get 'clear_last_ip'
                   end
                 end
                 resources :contest_management, only: [:index] do
                   collection do
                     get 'user_stat'
                     get 'clear_stat'
                     get 'clear_all_stat'
                     get 'change_contest_mode'
                   end
                 end
                 #get 'user_admin', to: 'user_admin#index'

test/system/users_test.rb ¶ +19

                     click_on 'Users', match: :first
                   end
                   click_on 'New list of users', match: :first
                   find(:css, 'textarea').fill_in with:"abc1,Boaty McBoatface,abcdef,alias1,remark1,\nabc2,Boaty2 McSecond,acbdef123,aias2,remark2"
                   click_on 'create users'
                   assert_text('remark1')
                   assert_text('remark2')
                 end
                 test "grant admin right" do
                   login 'admin', 'admin'
                   within 'header' do
                     click_on 'Manage'
                     click_on 'Users', match: :first
                   end
                   click_on "View administrator"
                   fill_in 'login', with: 'john'
                   click_on "Grant"
                   visit logout_main_path
                   login 'john','hello'
                   within 'header' do
                     click_on 'Manage'
                     click_on 'Problem', match: :first
                   end
                   assert_text "Turn off all problems"
                 end
                 test "try using admin from normal user" do
                   login 'admin','admin'
                   visit  bulk_manage_user_admin_index_path
                   assert_current_path bulk_manage_user_admin_index_path
                   visit logout_main_path
                   login 'jack','morning'
                   visit  bulk_manage_user_admin_index_path
                   assert_text 'You are not authorized'
                   assert_current_path login_main_path
                   login 'james','morning'
                   visit  new_list_user_admin_index_path
                   assert_text 'You are not authorized'
                   assert_current_path login_main_path
                 end
+            +   test "login then change password" do
+            +     newpassword = '1234asdf'
+            +     login 'john', 'hello'
+            +     visit profile_users_path
+            +
+            +     fill_in 'password', with: newpassword
+            +     fill_in 'password_confirmation', with: newpassword
+            +
+            +     click_on 'Edit'
+            +
+            +     visit logout_main_path
+            +     login 'john', 'hello'
+            +     assert_text 'Wrong password'
+            +
+            +     login 'john', newpassword
+            +     assert_text "MAIN"
+            +     assert_text "Submission"
+            +   end
+            +
                 def login(username,password)
                   visit root_path
                   fill_in "Login", with: username
                   fill_in "Password", with: password
                   click_on "Login"
                 end
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r759:6c24fe0db627 - Fri, 04 Oct 2019 12:13:26 - 7 files changed: 64 inserted, 43 deleted

Sign in to your account

Commit r759:6c24fe0db627 public

Author

r759:6c24fe0db627 - Fri, 04 Oct 2019 12:13:26 - 7 files changed: 64 inserted, 43 deleted

Commit `r759:6c24fe0db627` public