Commit 99e65cb3 authored by Michael Rose's avatar Michael Rose

auth: fix rendering after refactor

parent 5d720d21
......@@ -11,11 +11,11 @@ class SsoController < DeviseController
def create
if current_user and user.dlp_id == nil
merge_user_and_login current_user
return
else
create_or_login
return
end
render text: 'Oops.'
end
def destroy
......@@ -39,6 +39,7 @@ class SsoController < DeviseController
user = User.where(email: @jwt['dlp_email']).first
if user
merge_user_and_login(user)
return
end
# Create a new user
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment