Admin panel (#496)

* Added the administrator role and functionality that comes with it  (#403)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* Update user.rb

* Update admins.js

* GRN-15: Added the ability to change color and image from admin interface (#425)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* GRN-15: Added the ability for admins to customize color and image

* Update user.rb

* Update user.rb

* Update routes.rb

* Update admins_controller.rb

* GRN-87:Added a super admin role and made changes to how to the design works (#430)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* Update user.rb

* Update themes_controller_spec.rb

* Update routes.rb

* Update admins_controller.rb

* Removed duplicated code that broke the build after last merge

* GRN-78: Restructured some of the views to make the UI more consistent and responsive (#435)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* GRN-78: Cleaned up buttons and moved signin to its own page

* GRN-78: Moved the Rooms and Recordings link to nav bar

* Merge fix

* Views restructure fix (#458)

* Added cache to gitlab-ci.yml

* Restructured seed

* GRN2-99 -> GRN2-106: UI cleanup and refactoring (#478)

* GRN2-98: Change Fullname to Full name

* GRN2-105: Changed View Users to Manage Users

* GRN2-101/103: Updated email to match branding

* GRN2-100: Updated Email Sent flash to be more descriptive

* GRN2-104: Redirect user to sign in page w/ flash after clicking activation link

* GRN2-102: Changed the wording in the verification email

* GRN2-99: Added email form validation

* GRN2-106: Cleaned up Users list front end

* Fixes to rake and admin password validator for passing rubocop

* GRN2-113: Fixed issues with admin panel (#479)

* GRN2-116: Code clean up after restructure of views (#482)

* Removed unused references

* Rubocop

* Added pagination to admin view (#483)

* GRN2-114: Added the ability for admins to ban/unban users (#487)

* Added the ability for admins to ban and unban users

* Update sessions_helper.rb

*  Merge branch 'master' into admin-panel  (#492)

* Updated rubocop gem

* Updated rubocop and fixed issues (#490)

* Rubocop fixes

* GRN2-122: Updated sign in flow for admins and switch design tab to site settings (#489)

* Switched design tab to site settings

* Update _header with spaces instead of tabs

* Added more test cases to increase coverage (#494)

This commit is contained in:

Jesus Federico

2019-05-03 13:05:12 -04:00

committed by

GitHub

parent b9efff586a

commit 9f74b0e2c0

85 changed files with 2286 additions and 203 deletions

									
										14

app/controllers/sessions_controller.rb
									
												View File
												
				@ -27,12 +27,18 @@ class SessionsController < ApplicationController

				  # POST /users/login

				  def create

				    user = User.find_by(email: session_params[:email], provider: @user_domain)

				    redirect_to(root_path, alert: I18n.t("invalid_user")) && return unless user

				    redirect_to(root_path, alert: I18n.t("invalid_login_method")) && return unless user.greenlight_account?

				    admin = User.find_by(email: session_params[:email])

				    if admin&.has_role? :super_admin

				      user = admin

				    else

				      user = User.find_by(email: session_params[:email], provider: @user_domain)

				      redirect_to(root_path, alert: I18n.t("invalid_user")) && return unless user

				      redirect_to(root_path, alert: I18n.t("invalid_login_method")) && return unless user.greenlight_account?

				      redirect_to(account_activation_path(email: user.email)) && return unless user.activated?

				    end

				    redirect_to(root_path, alert: I18n.t("invalid_credentials")) && return unless user.try(:authenticate,

				      session_params[:password])

				    redirect_to(account_activation_path(email: user.email)) && return unless user.activated?

				    login(user)

				  end

Admin panel (#496)

14 app/controllers/sessions_controller.rb Unescape Escape View File

14

app/controllers/sessions_controller.rb

View File