Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed user creation one external login and not user already exists.

Browse source
This commit is contained in:
Martin Edenhofer 2012-04-18 14:36:30 +02:00
parent 1c250b586c
commit 8f2e1516a7
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/sessions_controller.rb
View file

@ -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
if current_user
authorization = Authorization.create_from_hash(auth, current_user)
else
authorization = Authorization.find_from_hash(auth) authorization = Authorization.find_from_hash(auth)
if !authorization
authorization = Authorization.create_from_hash(auth, current_user)
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