Merge lp:~dobey/ubuntu-sso-client/testable-env into lp:ubuntu-sso-client

[dobey]

Unify usage of login and u1 host into environment variables, for testing.

This replaces usage of login.ubuntu.com in URLs with the value of $SSO_AUTH_HOST which defaults to login.ubuntu.com, and usage of one.ubuntu.com with value of $SSO_UONE_HOST which defaults to one.ubuntu.com.

[lp:~dobey/ubuntu-sso-client/testable-env]

1027. By dobey on 2013-03-28

Update copyright years too.

[Mike McCracken (mikemc)]

tests pass on osx and linux, verified that the env vars do appear to work for me.

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'ubuntu_sso/__init__.py'
--- ubuntu_sso/__init__.py	2012-07-14 04:59:06 +0000
+++ ubuntu_sso/__init__.py	2013-03-28 21:52:22 +0000
@@ -1,6 +1,5 @@
-# ubuntu_sso - Ubuntu Single Sign On client support for desktop apps
 #
-# Copyright 2009-2012 Canonical Ltd.
+# Copyright 2009-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -28,6 +27,13 @@
 # files in the program, then also delete it here.
 """Ubuntu Single Sign On client code."""
 
+import os
+
+
+# Host URL changing environment variables
+SSO_AUTH_HOST = os.environ.get('SSO_AUTH_HOST', 'login.ubuntu.com')
+SSO_UONE_HOST = os.environ.get('SSO_UONE_HOST', 'one.ubuntu.com')
+
 # DBus constants
 DBUS_BUS_NAME = "com.ubuntu.sso"
 

=== modified file 'ubuntu_sso/account.py'
--- ubuntu_sso/account.py	2012-06-29 22:40:07 +0000
+++ ubuntu_sso/account.py	2013-03-28 21:52:22 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Author: Natalia Bidart <[e-mail]>
-# Author: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2010-2012 Canonical Ltd.
+# Copyright 2010-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -42,6 +39,7 @@
 
 from twisted.internet import defer
 
+from ubuntu_sso import SSO_AUTH_HOST
 from ubuntu_sso.logger import setup_logging
 from ubuntu_sso.utils import compat, webclient
 from ubuntu_sso.utils.webclient import restful
@@ -49,7 +47,7 @@
 
 
 logger = setup_logging("ubuntu_sso.account")
-SERVICE_URL = "https://login.ubuntu.com/api/1.0/"
+SERVICE_URL = "https://%s/api/1.0/" % SSO_AUTH_HOST
 SSO_STATUS_OK = 'ok'
 SSO_STATUS_ERROR = 'error'
 

=== modified file 'ubuntu_sso/qt/sso_wizard_page.py'
--- ubuntu_sso/qt/sso_wizard_page.py	2013-03-21 17:47:33 +0000
+++ ubuntu_sso/qt/sso_wizard_page.py	2013-03-28 21:52:22 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -47,7 +47,7 @@
 )
 from twisted.internet import defer
 
-from ubuntu_sso import constants, main
+from ubuntu_sso import constants, main, SSO_UONE_HOST
 from ubuntu_sso.logger import setup_gui_logging, log_call
 from ubuntu_sso.qt import (
     ERROR_STYLE,
@@ -72,10 +72,10 @@
 
 
 APP_NAME = u"Ubuntu One"
-TC_URL = u"https://one.ubuntu.com/terms/"
-POLICY_URL = u"https://one.ubuntu.com/privacy/"
+TC_URL = u"https://%s/terms/" % SSO_UONE_HOST
+POLICY_URL = u"https://%s/privacy/" % SSO_UONE_HOST
 BASE_PING_URL = \
-    u"https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/{email}"
+    u"https://%s/oauth/sso-finished-so-get-tokens/{email}" % SSO_UONE_HOST
 # the result of platform_data is given by urlencode, encoded with ascii
 PING_URL = BASE_PING_URL + u"?" + platform_data().decode('ascii')
 

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-12-14 22:06:47 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2013-03-28 21:52:22 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -62,7 +62,6 @@
 from ubuntu_sso.utils.webclient import gsettings
 
 logger = setup_logging("ubuntu_sso.utils.webclient.qtnetwork")
-PROXY_REQUEST = 'https://one.ubuntu.com'
 
 
 def build_proxy(settings_groups):

=== modified file 'ubuntu_sso/utils/webclient/timestamp.py'
--- ubuntu_sso/utils/webclient/timestamp.py	2012-06-22 16:12:03 +0000
+++ ubuntu_sso/utils/webclient/timestamp.py	2013-03-28 21:52:22 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -32,6 +32,7 @@
 
 from twisted.internet import defer
 
+from ubuntu_sso import SSO_UONE_HOST
 from ubuntu_sso.logger import setup_logging
 
 logger = setup_logging("ubuntu_sso.utils.webclient.timestamp")
@@ -43,7 +44,7 @@
 
     CHECKING_INTERVAL = 60 * 60  # in seconds
     ERROR_INTERVAL = 30  # in seconds
-    SERVER_IRI = u"http://one.ubuntu.com/api/time"
+    SERVER_IRI = u"http://%s/api/time" % SSO_UONE_HOST
 
     def __init__(self, webclient_class):
         """Initialize this instance."""