Remove unnecessary calls to the database for user and permission metadata.

endpoints/api.py

@@ -46,7 +46,7 @@ def get_logged_in_user():
   if current_user.is_anonymous():
     return jsonify({'anonymous': True})
 
-  user = current_user.db_user
+  user = current_user.db_user()
   return jsonify({
     'verified': user.verified,
     'anonymous': False,
@@ -59,7 +59,7 @@ def get_logged_in_user():
 @app.route('/api/user/', methods=['PUT'])
 @api_login_required
 def change_user_details():
-  user = current_user.db_user
+  user = current_user.db_user()
 
   user_data = request.get_json();
 
@@ -184,7 +184,7 @@ def match_repos_api():
 
   username = None
   if current_user.is_authenticated():
-    username = current_user.db_user.username
+    username = current_user.db_user().username
 
   matching = model.get_matching_repositories(prefix, username)
   response = {
@@ -219,7 +219,7 @@ def list_repos_api():
 
   username = None
   if current_user.is_authenticated() and include_private:
-    username = current_user.db_user.username
+    username = current_user.db_user().username
 
   repo_query = model.get_visible_repositories(username, limit=limit,
                                               include_public=include_public,
@@ -474,7 +474,7 @@ def subscribe():
   request_data = request.get_json()
   plan = request_data['plan']
 
-  user = current_user.db_user
+  user = current_user.db_user()
   private_repos = model.get_private_repo_count(user.username)
 
   if not user.stripe_id:
@@ -518,7 +518,7 @@ def subscribe():
 @app.route('/api/user/plan', methods=['GET'])
 @api_login_required
 def get_subscription():
-  user = current_user.db_user
+  user = current_user.db_user()
   private_repos = model.get_private_repo_count(user.username)
 
   if user.stripe_id:

endpoints/web.py

@@ -8,30 +8,37 @@ from flask.ext.principal import identity_changed, Identity, AnonymousIdentity
 
 from data import model
 from app import app, login_manager, mixpanel
+from auth.permissions import QuayDeferredPermissionUser
 
 
 logger = logging.getLogger(__name__)
 
 
 class _LoginWrappedDBUser(UserMixin):
-  def __init__(self, db_user):
-    self.db_user = db_user
+  def __init__(self, db_username):
+
+    self._db_username = db_username
+    self._db_user = None
+
+  def db_user(self):
+    if not self._db_user:
+      self._db_user = model.get_user(self._db_username)
+    return self._db_user
+
+  def is_authenticated(self):
+    return self.db_user() is not None
 
   def is_active(self):
-    return self.db_user.verified
+    return self.db_user().verified
 
   def get_id(self):
-    return unicode(self.db_user.username)
+    return unicode(self._db_username)
 
 
 @login_manager.user_loader
 def load_user(username):
   logger.debug('Loading user: %s' % username)
-  db_user = model.get_user(username)
-  if db_user:
-    return _LoginWrappedDBUser(db_user)
-  else:
-    return None
+  return _LoginWrappedDBUser(username)
 
 
 @app.route('/', methods=['GET'], defaults={'path': ''})
@@ -78,8 +85,8 @@ def privacy():
 def common_login(db_user):
   if login_user(_LoginWrappedDBUser(db_user)):
     logger.debug('Successfully signed in as: %s' % db_user.username)
-    identity_changed.send(app,
-                          identity=Identity(db_user.username, 'username'))
+    new_identity = QuayDeferredPermissionUser(db_user.username, 'username')
+    identity_changed.send(app, identity=new_identity)
     return True
   else:
     logger.debug('User could not be logged in, inactive?.')