Merge branch 'master' of github.com:fetsite/fetsite

2013-12-16 10:29:01 +01:00
parent e4a3828d74 085695c632
commit da699a4776
2 changed files with 5 additions and 1 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,9 +58,10 @@ logger.debug auth.to_s
     user= User.create(name:auth.extra.raw_info.uid.first,
                       provider:auth.provider,
                       uid:auth.extra.raw_info.uid.first,
-                       email:auth.extra.raw_info.uid.first.to_s+"@ldapfet.at",
+                       email:auth.extra.raw_info.mail.first.to_s,
                       password:Devise.friendly_token[0,20])
    user.add_role("fetuser")
+logger.debug(auth.extra.raw_info.to_s)
   end
   unless user
    # user=User.create(name:"fail",