diff --git a/api/auth/authproviders.py b/api/auth/authproviders.py index 3252bfba73e0375f45b8145f2567cedf731d1215..36e974df08f6992a15e702c760e9358c23cbecae 100644 --- a/api/auth/authproviders.py +++ b/api/auth/authproviders.py @@ -80,6 +80,8 @@ class JWTAuthProvider(AuthProvider): self.ensure_user_exists(uid) self.set_user_gravatar(uid, uid) + return uid + class GoogleOAuthProvider(AuthProvider): diff --git a/api/web/base.py b/api/web/base.py index 6abe33ffe56a4cdb392708c7a77e06f5f9653422..c4692484f76021af4466690ee52e6b85e5a3725d 100644 --- a/api/web/base.py +++ b/api/web/base.py @@ -80,8 +80,10 @@ class RequestHandler(webapp2.RequestHandler): if self.public_request or self.source_site: self.superuser_request = False + self.user_is_admin = False elif drone_request: self.superuser_request = True + self.user_is_admin = True else: user = config.db.users.find_one({'_id': self.uid}, ['root', 'disabled']) if not user: @@ -174,7 +176,6 @@ class RequestHandler(webapp2.RequestHandler): """ payload = self.request.json_body - config.log.debug(payload) if 'code' not in payload or 'auth_type' not in payload: self.abort(400, 'Auth code and type required for login') @@ -362,7 +363,6 @@ class RequestHandler(webapp2.RequestHandler): # If this is a ticket download, log only once per ticket ticket_id = self.get_param('ticket') log_map['context']['ticket_id'] = ticket_id - config.log.debug('the context is {} and the ticket is {}'.format(log_map['context'], ticket_id)) try: config.log_db.access_log.update( {'context.ticket_id': ticket_id},