projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2903-remove-pi-active-and-success
[arvados.git]
/
services
/
api
/
app
/
controllers
/
user_sessions_controller.rb
diff --git
a/services/api/app/controllers/user_sessions_controller.rb
b/services/api/app/controllers/user_sessions_controller.rb
index 3d4b05af4a0db5dbf37057ec71adb2b6b69e9b61..0b80877bc25624e9b66a38f8c0c35c75b468cc0f 100644
(file)
--- a/
services/api/app/controllers/user_sessions_controller.rb
+++ b/
services/api/app/controllers/user_sessions_controller.rb
@@
-9,7
+9,6
@@
class UserSessionsController < ApplicationController
# omniauth callback method
def create
omniauth = env['omniauth.auth']
# omniauth callback method
def create
omniauth = env['omniauth.auth']
- #logger.debug "+++ #{omniauth}"
identity_url_ok = (omniauth['info']['identity_url'].length > 0) rescue false
unless identity_url_ok
identity_url_ok = (omniauth['info']['identity_url'].length > 0) rescue false
unless identity_url_ok
@@
-58,7
+57,7
@@
class UserSessionsController < ApplicationController
# "unauthorized":
Thread.current[:user] = user
# "unauthorized":
Thread.current[:user] = user
- user.save
!
+ user.save
or raise Exception.new(user.errors.messages)
omniauth.delete('extra')
omniauth.delete('extra')