Fix tests as suggested by shivamag00. (#1309)

api/login_api.py

@@ -24,9 +24,7 @@ from flask import session
 
 
 from framework import basehandlers
-# from framework import permissions
-# from framework import ramcache
-# from internals import models
+import settings
 
 class LoginAPI(basehandlers.APIHandler):
   """Create a session using the id_token generated by Google Sign-In."""
@@ -36,8 +34,9 @@ class LoginAPI(basehandlers.APIHandler):
     message = "Unable to Authenticate"
 
     try:
-      CLIENT_ID = '77756740465-e5r4o15qg4hkdfiucjpl231o79k3ipjv.apps.googleusercontent.com'
-      idinfo = id_token.verify_oauth2_token(token, requests.Request(), CLIENT_ID)
+      idinfo = id_token.verify_oauth2_token(
+          token, requests.Request(),
+          settings.GOOGLE_SIGN_IN_CLIENT_ID)
       # userid = idinfo['sub']
       # email = idinfo['email']
       session["id_token"] = token
@@ -48,4 +47,3 @@ class LoginAPI(basehandlers.APIHandler):
       pass
 
     return {'message': message}
-

framework/basehandlers.py

@@ -78,12 +78,11 @@ class BaseHandler(flask.views.MethodView):
   def get_current_user(self, required=False):
     # TODO(jrobbins): oauth support
     current_user = None
-    if self.request.method == 'POST':
+    if not settings.UNIT_TEST_MODE and self.request.method == 'POST':
       current_user = users.get_current_user() or gae_users.get_current_user()
     else:
       current_user = users.get_current_user()
 
-
     if required and not current_user:
       self.abort(403, msg='User must be signed in')
     return current_user
@@ -291,6 +290,7 @@ class FlaskHandler(BaseHandler):
     common_data = {
       'prod': settings.PROD,
       'APP_TITLE': settings.APP_TITLE,
+      'google_sign_in_client_id': settings.GOOGLE_SIGN_IN_CLIENT_ID,
       'current_path': current_path,
       'TEMPLATE_CACHE_TIME': settings.TEMPLATE_CACHE_TIME,
       'banner_message': settings.BANNER_MESSAGE,
@@ -300,8 +300,6 @@ class FlaskHandler(BaseHandler):
     user = self.get_current_user()
     if user:
       user_pref = models.UserPref.get_signed_in_user_pref()
-      common_data['login'] = (
-          'Sign out', "SignOut")
       common_data['user'] = {
         'can_create_feature': permissions.can_create_feature(user),
         'can_edit': permissions.can_edit_any_feature(user),
@@ -313,8 +311,6 @@ class FlaskHandler(BaseHandler):
       common_data['xsrf_token_expires'] = xsrf.token_expires_sec()
     else:
       common_data['user'] = None
-      common_data['login'] = (
-           'Sign in', "Sign In")
       common_data['xsrf_token'] = xsrf.generate_token(None)
       common_data['xsrf_token_expires'] = 0
     return common_data

framework/basehandlers_test.py

@@ -28,6 +28,7 @@ import werkzeug.exceptions  # Flask HTTP stuff.
 from framework import users
 
 from framework import basehandlers
+from framework import users
 from framework import xsrf
 from internals import models
 import settings
@@ -490,9 +491,6 @@ class FlaskHandlerTests(unittest.TestCase):
 
     self.assertIn('prod', actual)
     self.assertIsNone(actual['user'])
-    self.assertEqual('Sign in', actual['login'][0])
-    self.assertIn('/Login', actual['login'][1])
-    self.assertIn('/test/path', actual['login'][1])
 
   def test_get_common_data__signed_in(self):
     """When user is signed in, offer sign out link."""
@@ -502,9 +500,6 @@ class FlaskHandlerTests(unittest.TestCase):
 
     self.assertIn('prod', actual)
     self.assertIsNotNone(actual['user'])
-    self.assertEqual('Sign out', actual['login'][0])
-    self.assertIn('/Logout', actual['login'][1])
-    self.assertIn('/test/path', actual['login'][1])
 
   def test_render(self):
     """We can render a simple template to a string."""
@@ -602,9 +597,11 @@ class FlaskHandlerTests(unittest.TestCase):
         self.handler.require_task_header()
 
   @mock.patch('settings.UNIT_TEST_MODE', False)
-  def test_require_xsrf_token__normal(self):
+  @mock.patch('framework.users.get_current_user')
+  def test_require_xsrf_token__normal(self, mock_get_user):
     """We accept a POST with a valid token."""
     testing_config.sign_in('user1@example.com', 111)
+    mock_get_user.return_value = users.User(email='user1@example.com')
     form_data = {'token': xsrf.generate_token('user1@example.com')}
     with test_app.test_request_context('/test', data=form_data):
       self.handler.require_xsrf_token()

framework/users.py

@@ -1,7 +1,9 @@
-import sys
+import os
 from flask import session
 from google.oauth2 import id_token
 from google.auth.transport import requests
+import settings
+
 
 class User(object):
     """Provides the email address, nickname, and ID for a user.
@@ -177,20 +179,27 @@ class User(object):
 
 
 def get_current_user():
+    if settings.UNIT_TEST_MODE:
+      if os.environ['USER_EMAIL']!= '':
+        current_user = User(
+            email=os.environ['USER_EMAIL'],
+            _user_id=os.environ['USER_ID'])
+      else:
+        current_user = None
+      return current_user
 
     token = session.get('id_token')
     current_user = None
     if token:
       try:
-        CLIENT_ID = '77756740465-e5r4o15qg4hkdfiucjpl231o79k3ipjv.apps.googleusercontent.com'
-        idinfo = id_token.verify_oauth2_token(token, requests.Request(), CLIENT_ID)
+        idinfo = id_token.verify_oauth2_token(
+            token, requests.Request(), settings.GOOGLE_SIGN_IN_CLIENT_ID)
         current_user = User(email=idinfo['email'], _user_id=idinfo['sub'])
 
       except ValueError:
           # Remove the id_token from session if it is invalid or expired
           session.clear()
           current_user = None
-          pass
 
     return current_user
 

settings.py

@@ -56,6 +56,10 @@ else:
 SITE_URL = 'http://%s.appspot.com/' % APP_ID
 CLOUD_TASKS_REGION = 'us-central1'
 
+GOOGLE_SIGN_IN_CLIENT_ID = (
+    '914217904764-enfcea61q4hqe7ak8kkuteglrbhk8el1.'
+    'apps.googleusercontent.com')
+
 if UNIT_TEST_MODE:
   APP_TITLE = 'Local testing'
   SITE_URL = 'http://127.0.0.1:8888/'

templates/_base.html

@@ -29,7 +29,7 @@ limitations under the License.
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-  <meta name="google-signin-client_id" content="77756740465-e5r4o15qg4hkdfiucjpl231o79k3ipjv.apps.googleusercontent.com">
+  <meta name="google-signin-client_id" content="{{google_sign_in_client_id}}">
 
   <link rel="apple-touch-icon" href="/static/img/crstatus_128.png">
   <link rel="apple-touch-icon-precomposed" href="/static/img/crstatus_128.png">

templates/feature.html

@@ -32,7 +32,8 @@
     </span>
   {% else %}
     <span class="tooltip" title="Sign in to get email notifications for updates">
-      <a href="{{login.1}}" data-tooltip>
+      {# TODO(jrobbins): redo to use Google Sign-in #}
+      <a href="#" data-tooltip>
         <iron-icon icon="chromestatus:star-border"
                     class="pushicon"></iron-icon>
       </a>

templates/features.html

@@ -52,7 +52,8 @@
 {% block content %}
   <chromedash-featurelist
     {% if user %}signedin{% endif %}
-    loginurl="{{login.1}}"
+    {# TODO(jrobbins): Fix to work with Google Sign-In #}
+    loginurl="#"
     {% if user.can_edit %}canedit{% endif %}
     ></chromedash-featurelist>
 {% endblock %}

templates/header.html

@@ -30,13 +30,11 @@
         </a>
         <ul>
           <li><a href="/settings">Settings</a></li>
-          <!-- <li><a href="{{login.1}}">{{login.0}}</a></li> -->
           <li><a href="#" onclick="signOut()">Sign out</a></li>
 
         </ul>
       </div>
     {% else %}
-      <!-- <a href="{{login.1}}">{{login.0}}</a> -->
       <li><div class="g-signin2" data-onsuccess="onSignIn"></div></li>
     {% endif %}
 

templates/schedule.html

@@ -22,7 +22,8 @@
   <section id="releases-section">
     <chromedash-schedule
       {% if user %}signedin{% endif %}
-      loginurl="{{login.1}}"
+      {# TODO(jrobbins): Fix to work with google sign-in #}
+      loginurl="#"
     ></chromedash-schedule>
   </section>
 {% endblock %}