forked from External/greenlight
GRN-80: Allow local accounts on multitenant (#428)
* Changed the way the omniauth providers are declared * Allow local authentication for multitenant mode based on customer settings * Cleanead up code mandated by rubocop * Completed implementation for signin and added the one for signup * Fixed issue with rubocop * Renamed customer_name to lb_user * Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented * Completed implementation of email_verification * Fixed rubocop issue * Final update * Fix for test with loadbalancer * Make sure loadbalancer mockup is only used when env defined * Fix for test on rooms_controller * Fixed most of the test failing on multitenant env * Fixed issue detected by rubocop * Fixed issue with activation tockens not working on resend * Fixed new issue found by rubocop * Updated travis script * Harcoded credentials for mockup * Updated expectation on start_session * Fixed issue with duplication of home room * Updated script for rubocop * Restored Gemfile
This commit is contained in:
@ -224,12 +224,12 @@ class RoomsController < ApplicationController
|
||||
|
||||
def validate_verified_email
|
||||
if current_user
|
||||
redirect_to account_activation_path(current_user) unless current_user.email_verified
|
||||
redirect_to account_activation_path(current_user) unless current_user.activated?
|
||||
end
|
||||
end
|
||||
|
||||
def verify_room_owner_verified
|
||||
unless @room.owner.email_verified
|
||||
unless @room.owner.activated?
|
||||
flash[:alert] = t("room.unavailable")
|
||||
|
||||
if current_user
|
||||
|
Reference in New Issue
Block a user