Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Unified Diff: appengine/findit/common/base_handler.py

Issue 2397603002: [Findit] Cloud Endpoints API to receive reports on flakes. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/findit/common/base_handler.py
diff --git a/appengine/findit/common/base_handler.py b/appengine/findit/common/base_handler.py
index 9bd697af299cec9aff41e6249f580f49d74cfde7..d4ef7e04b845479c98e074be47e14d0fda4375ff 100644
--- a/appengine/findit/common/base_handler.py
+++ b/appengine/findit/common/base_handler.py
@@ -10,6 +10,7 @@ from google.appengine.api import users
import jinja2
import webapp2
+from common import auth_util
from common import constants
@@ -48,16 +49,16 @@ class BaseHandler(webapp2.RequestHandler):
# Only give access to google accounts or admins.
return self.IsCorpUserOrAdmin()
elif self.PERMISSION_LEVEL == Permission.ADMIN:
- return users.is_current_user_admin()
+ return auth_util.IsCurrentUserAdmin()
else:
logging.error('Unknown permission level: %s' % self.PERMISSION_LEVEL)
return False
def IsCorpUserOrAdmin(self):
"""Returns True if the user logged in with corp account or as admin."""
- user = users.get_current_user()
- return ((user and user.email().endswith('@google.com')) or
- users.is_current_user_admin())
+ user_email = auth_util.GetUserEmail()
+ return ((user_email and user_email.endswith('@google.com')) or
+ auth_util.IsCurrentUserAdmin())
@staticmethod
def CreateError(error_message, return_code=500):
@@ -144,10 +145,8 @@ class BaseHandler(webapp2.RequestHandler):
self.response.write(data)
def GetLoginUrl(self):
- if self.request.referer:
- return users.create_login_url(self.request.referer)
- else:
- return users.create_login_url(self.request.uri)
+ """Returns the login url."""
+ return users.create_login_url(self.request.referer or self.request.uri)
def _Handle(self, handler_func):
try:

Powered by Google App Engine
This is Rietveld 408576698