projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13558: add req_id as a tag to Rails.logger
[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 5a90f4f8ead61df1bfa5ae791dd0c4354bcebb51..b8fe2948923582ad9f40f3ec00c394cd6b2473ec 100644
(file)
--- a/
services/api/app/controllers/user_sessions_controller.rb
+++ b/
services/api/app/controllers/user_sessions_controller.rb
@@
-24,7
+24,11
@@
class UserSessionsController < ApplicationController
return redirect_to login_failure_url
end
return redirect_to login_failure_url
end
- user = User.find_by_identity_url(omniauth['info']['identity_url'])
+ # Only local users can create sessions, hence uuid_like_pattern
+ # here.
+ user = User.unscoped.where('identity_url = ? and uuid like ?',
+ omniauth['info']['identity_url'],
+ User.uuid_like_pattern).first
if not user
# Check for permission to log in to an existing User record with
# a different identity_url
if not user
# Check for permission to log in to an existing User record with
# a different identity_url
@@
-41,6
+45,7
@@
class UserSessionsController < ApplicationController
end
end
end
end
end
end
+
if not user
# New user registration
user = User.new(:email => omniauth['info']['email'],
if not user
# New user registration
user = User.new(:email => omniauth['info']['email'],
@@
-63,6
+68,13
@@
class UserSessionsController < ApplicationController
# First login to a pre-activated account
user.identity_url = omniauth['info']['identity_url']
end
# First login to a pre-activated account
user.identity_url = omniauth['info']['identity_url']
end
+
+ while (uuid = user.redirect_to_user_uuid)
+ user = User.unscoped.where(uuid: uuid).first
+ if !user
+ raise Exception.new("identity_url #{omniauth['info']['identity_url']} redirects to nonexistent uuid #{uuid}")
+ end
+ end
end
# For the benefit of functional and integration tests:
end
# For the benefit of functional and integration tests: