0
@@ -62,7 +62,7 @@ class User(object):
0
   """
0
 
0
 
0
-  def __init__(self, email=None, _auth_domain=None):
0
+  def __init__(self, email=None, _auth_domain=None, nickname=None):
0
     """Constructor.
0
 
0
     Args:
0
@@ -76,6 +76,10 @@ class User(object):
0
 
0
     assert _auth_domain
0
 
0
+    if nickname is None:
0
+      assert 'USER_NICKNAME' in os.environ
0
+      nickname = os.environ['USER_NICKNAME']
0
+
0
     if email is None:
0
       assert 'USER_EMAIL' in os.environ
0
       email = os.environ['USER_EMAIL']
0
@@ -83,6 +87,7 @@ class User(object):
0
     if not email:
0
       raise UserNotFoundError
0
 
0
+    self.__nickname = nickname
0
     self.__email = email
0
     self.__auth_domain = _auth_domain
0
 
0
@@ -93,6 +98,8 @@ class User(object):
0
     with respect to this application. It will be an email address for some
0
     users, but not all.
0
     """
0
+    if self.__nickname:
0
+      return self.__nickname
0
     if (self.__email and self.__auth_domain and
0
         self.__email.endswith('@' + self.__auth_domain)):
0
       suffix_len = len(self.__auth_domain) + 1

0
@@ -492,6 +492,7 @@ def SetupEnvironment(cgi_path,
0
   cookies = ', '.join(headers.getheaders('cookie'))
0
   email, nickname, admin, valid_cookie = get_user_info(cookies)
0
   env['USER_EMAIL'] = email
0
+  env['USER_NICKNAME'] = nickname
0
 
0
   if admin:
0
     env['USER_IS_ADMIN'] = '1'