Merge lp:~daker/loco-team-portal/fix.611294 into lp:loco-team-portal

[Adnane Belmadiaf]

Switched to login.ubuntu.com

[lp:~daker/loco-team-portal/fix.611294]

606. By Adnane Belmadiaf on 2013-02-04

Fixed get_permanent_openid_from_username

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2012-11-26 21:07:29 +0000
+++ loco_directory/common/launchpad.py	2013-02-04 22:43:21 +0000
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 from launchpadlib.launchpad import Launchpad
-from launchpadlib.errors import HTTPError
 from django.conf import settings
 
 import os
-import sys
 import urllib2
 
+
 def is_debug_user(username):
     try:
         if settings.DEBUG and username in settings.DEBUG_USERS:
@@ -15,6 +14,7 @@
         return False
     return False
 
+
 def lp_login(lp_instance='production'):
     cachedir = os.path.join(settings.PROJECT_PATH, 'lp_data/cache')
     client_ident = getattr(settings, 'LP_PROJECT_NAME', "LoCo Team Portal")
@@ -29,6 +29,7 @@
             return None
     return launchpad
 
+
 def is_user_on_loco_council(user):
     if not user.is_authenticated():
         return False
@@ -39,6 +40,7 @@
     lc_in_groups = user.groups.filter(name__exact='ubuntu-lococouncil')
     return (lc_in_groups.count() == 1)
 
+
 def is_team_member(user, team):
     if not user.is_authenticated():
         return False
@@ -47,6 +49,7 @@
     user_in_groups = user.groups.filter(name__exact=team.lp_name)
     return (user_in_groups.count() >= 1)
 
+
 def is_admin_or_owner(username, team):
     # check just using the LD data
     if username == team.owner_profile.user.username:
@@ -57,6 +60,7 @@
         return True
     return False
 
+
 def get_mugshot_url(url):
     # Not ideal, but until LP #713873
     # or similar, we are in a hard spot.
@@ -69,6 +73,7 @@
         # 404 or some other issue that means we should default to False
         return "https://launchpad.net/@@/person-logo"
 
+
 def get_user_timezone(username, lp=None):
     timezone = 'UTC'
     if username is None:
@@ -93,11 +98,11 @@
     html = f.read()
     services = OpenIDServiceEndpoint().fromHTML(url, html)
     if services is not None and len(services) > 0:
+        services[0].local_id = services[0].local_id.replace('launchpad.net', 'ubuntu.com')
         return services[0]
     else:
         return None
-    # ... or use this line if you want the Ubuntu SSO OpenID:
-    # return services[0].local_id.replace('launchpad.net', 'ubuntu.com')
+
 
 def set_user_openid(user, force=False):
     from django_openid_auth.models import UserOpenID
@@ -105,7 +110,7 @@
     if len(openids) == 0 or force:
         if len(openids) == 0:
             openid_assoc = UserOpenID(user=user)
-        else :
+        else:
             openid_assoc = openids[0]
         openid = get_permanent_openid_from_username(user.username)
         if openid is not None:

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-12-26 21:27:08 +0000
+++ loco_directory/settings.py	2013-02-04 22:43:21 +0000
@@ -186,7 +186,7 @@
 
 # If set, always use this as the identity URL rather than asking the
 # user.  This only makes sense if it is a server URL.
-OPENID_SSO_SERVER_URL = 'https://login.launchpad.net/'
+OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
 
 # Automatically map lp team membership to ld group membership
 OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True