Remove support for Google OpenID logins

[osqa.git] / forum_modules / openidauth / authentication.py

diff --git a/forum_modules/openidauth/authentication.py b/forum_modules/openidauth/authentication.py
index c04c44b93a934786e00ecaf1800bf6a4d89ac436..58759b53b23daee9bccf66fdd68c7a24d2d5c407 100644 (file)
--- 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.ico'
+    icon = '/media/images/openid/myopenid_big.png'
 
 
 class FlickrAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -72,7 +66,7 @@ class FlickrAuthContext(ConsumerTemplateContext):
     }
     weight = 250
     human_name = 'Flickr'
-    icon = '/media/images/openid/flickr.ico'
+    icon = '/media/images/openid/flickr.png'
 
 
 class TechnoratiAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -88,7 +82,7 @@ class TechnoratiAuthContext(ConsumerTemplateContext):
     }
     weight = 260
     human_name = 'Technorati'
-    icon = '/media/images/openid/technorati.ico'
+    icon = '/media/images/openid/technorati.png'
 
 
 class WordpressAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -104,7 +98,7 @@ class WordpressAuthContext(ConsumerTemplateContext):
     }
     weight = 270
     human_name = 'Wordpress'
-    icon = '/media/images/openid/wordpress.ico'
+    icon = '/media/images/openid/wordpress.png'
 
 
 class BloggerAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -120,7 +114,7 @@ class BloggerAuthContext(ConsumerTemplateContext):
     }
     weight = 300
     human_name = 'Blogger'
-    icon = '/media/images/openid/blogger.ico'
+    icon = '/media/images/openid/blogger.png'
 
 
 class LiveJournalAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -136,7 +130,7 @@ class LiveJournalAuthContext(ConsumerTemplateContext):
     }
     weight = 310
     human_name = 'LiveJournal'
-    icon = '/media/images/openid/livejournal.ico'
+    icon = '/media/images/openid/livejournal.png'
 
 
 class ClaimIdAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -152,22 +146,7 @@ class ClaimIdAuthContext(ConsumerTemplateContext):
     }
     weight = 320
     human_name = 'ClaimID'
-    icon = '/media/images/openid/claimid.ico'
-
-class VidoopAuthConsumer(OpenIdAbstractAuthConsumer):
-    def get_user_url(self, request):
-        blog_name = request.POST['input_field']
-        return "http://%s.myvidoop.com/" % blog_name
-
-class VidoopAuthContext(ConsumerTemplateContext):
-    mode = 'SMALLICON'
-    type = 'SIMPLE_FORM'
-    simple_form_context = {
-        'your_what': 'Vidoop user name'
-    }
-    weight = 330
-    human_name = 'Vidoop'
-    icon = '/media/images/openid/vidoop.ico'
+    icon = '/media/images/openid/claimid.png'
 
 class VerisignAuthConsumer(OpenIdAbstractAuthConsumer):
     def get_user_url(self, request):
@@ -182,7 +161,7 @@ class VerisignAuthContext(ConsumerTemplateContext):
     }
     weight = 340
     human_name = 'Verisign'
-    icon = '/media/images/openid/verisign.ico'
+    icon = '/media/images/openid/verisign.png'
 
     
 class OpenIdUrlAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -193,4 +172,4 @@ class OpenIdUrlAuthContext(ConsumerTemplateContext):
     weight = 300
     human_name = 'OpenId url'
     stack_item_template = 'modules/openidauth/openidurl.html'
-    icon = '/media/images/openid/openid-inputicon.gif'
\ No newline at end of file
+    icon = '/media/images/openid/openid-inputicon.gif'