X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/410bfa05ee36ed1d99356c443a5f3f6aa3ee9578..4fa3c66b3e0a937bb32bb0db81b0db81ab5aa206:/forum_modules/openidauth/authentication.py?ds=sidebyside

diff --git a/forum_modules/openidauth/authentication.py b/forum_modules/openidauth/authentication.py
index c82b99e..58759b5 100644
--- a/forum_modules/openidauth/authentication.py
+++ b/forum_modules/openidauth/authentication.py
@@ -1,22 +1,9 @@
 from consumer import OpenIdAbstractAuthConsumer
 from forum.authentication.base import ConsumerTemplateContext
 
-class GoogleAuthConsumer(OpenIdAbstractAuthConsumer):
-    def get_user_url(self, request):
-        return 'https://www.google.com/accounts/o8/id'
-
-class GoogleAuthContext(ConsumerTemplateContext):
-    mode = 'BIGICON'
-    type = 'DIRECT'
-    weight = 200
-    human_name = 'Google'
-    icon = '/media/images/openid/google.gif'
-
-
-
 class YahooAuthConsumer(OpenIdAbstractAuthConsumer):
     def get_user_url(self, request):
-        return 'http://yahoo.com/'
+        return 'http://me.yahoo.com/'
 
 class YahooAuthContext(ConsumerTemplateContext):
     mode = 'BIGICON'
@@ -33,30 +20,37 @@ class AolAuthConsumer(OpenIdAbstractAuthConsumer):
         return 'http://openid.aol.com/' + uname
 
 class AolAuthContext(ConsumerTemplateContext):
-    mode = 'BIGICON'
+    mode = 'SMALLICON'
     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'AOL screen name'
     }
-    weight = 400
+    weight = 200
     human_name = 'AOL'
-    icon = '/media/images/openid/aol.gif'
+    icon = '/media/images/openid/aol.png'
 
 
 class MyOpenIdAuthConsumer(OpenIdAbstractAuthConsumer):
+    dataype2ax_schema = {
+        #'username': ('http://schema.openid.net/namePerson/friendly', 'friendly'),
+        'email': 'http://schema.openid.net/contact/email',
+        #'web': 'http://schema.openid.net/contact/web/default',
+        #'birthdate': ('http://schema.openid.net/birthDate', 'birthDate'),
+    }
+
     def get_user_url(self, request):
         blog_name = request.POST['input_field']
         return "http://%s.myopenid.com/" % blog_name
 
 class MyOpenIdAuthContext(ConsumerTemplateContext):
-    mode = 'SMALLICON'
+    mode = 'BIGICON'
     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'MyOpenID user name'
     }
-    weight = 200
+    weight = 400
     human_name = 'MyOpenID'
-    icon = '/media/images/openid/myopenid.png'
+    icon = '/media/images/openid/myopenid_big.png'
 
 
 class FlickrAuthConsumer(OpenIdAbstractAuthConsumer):