Fixed user creation one external login and not user already exists.
This commit is contained in:
parent
1c250b586c
commit
8f2e1516a7
1 changed files with 2 additions and 16 deletions
|
@ -79,11 +79,9 @@ class SessionsController < ApplicationController
|
||||||
|
|
||||||
# Create a new user or add an auth to existing user, depending on
|
# Create a new user or add an auth to existing user, depending on
|
||||||
# whether there is already a user signed in.
|
# whether there is already a user signed in.
|
||||||
authorization = nil
|
authorization = Authorization.find_from_hash(auth)
|
||||||
if current_user
|
if !authorization
|
||||||
authorization = Authorization.create_from_hash(auth, current_user)
|
authorization = Authorization.create_from_hash(auth, current_user)
|
||||||
else
|
|
||||||
authorization = Authorization.find_from_hash(auth)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Log the authorizing user in.
|
# Log the authorizing user in.
|
||||||
|
@ -98,18 +96,6 @@ class SessionsController < ApplicationController
|
||||||
|
|
||||||
# auto population of default collections
|
# auto population of default collections
|
||||||
default_collection = {}
|
default_collection = {}
|
||||||
# default_collection['User'] = User.all
|
|
||||||
# # get linked accounts
|
|
||||||
# default_collection['User'].each do |user|
|
|
||||||
# user['accounts'] = {}
|
|
||||||
# authorizations = user.authorizations() || []
|
|
||||||
# authorizations.each do | authorization |
|
|
||||||
# user['accounts'][authorization.provider] = {
|
|
||||||
# :uid => authorization[:uid],
|
|
||||||
# :username => authorization[:username]
|
|
||||||
# }
|
|
||||||
# end
|
|
||||||
# end
|
|
||||||
default_collection['Role'] = Role.all
|
default_collection['Role'] = Role.all
|
||||||
default_collection['Group'] = Group.all
|
default_collection['Group'] = Group.all
|
||||||
default_collection['Organization'] = Organization.all
|
default_collection['Organization'] = Organization.all
|
||||||
|
|
Loading…
Reference in a new issue