Commit 20018afbbf88b6bb1e7d54f92da3c30123519694
1 parent
9e3e94b3
Exists in
multi_env_on_remote_user
Allow multi environment on remote user plugin
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
plugins/remote_user/lib/remote_user_plugin.rb
... | ... | @@ -28,9 +28,9 @@ class RemoteUserPlugin < Noosfero::Plugin |
28 | 28 | end |
29 | 29 | |
30 | 30 | if !logged_in? |
31 | - self.current_user = User.find_by_login(remote_user) | |
31 | + self.current_user = User.where(environment_id: environment, login: remote_user).first | |
32 | 32 | unless self.current_user |
33 | - self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user)) | |
33 | + self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user)) | |
34 | 34 | self.current_user.activate |
35 | 35 | end |
36 | 36 | self.current_user.save! |
... | ... | @@ -39,9 +39,9 @@ class RemoteUserPlugin < Noosfero::Plugin |
39 | 39 | self.current_user.forget_me |
40 | 40 | reset_session |
41 | 41 | |
42 | - self.current_user = User.find_by_login(remote_user) | |
42 | + self.current_user = User.where(environment_id: environment, login: remote_user).first | |
43 | 43 | unless self.current_user |
44 | - self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user)) | |
44 | + self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user)) | |
45 | 45 | self.current_user.activate |
46 | 46 | end |
47 | 47 | self.current_user.save! | ... | ... |