Merge branch 'swaggerlikeus' of ssh://bitbucket.org/yackob03/quay into swaggerlikeus

Conflicts:
	test/data/test.db

data/model/oauth.py

@@ -233,6 +233,26 @@ def delete_application(org, client_id):
   application.delete_instance(recursive=True, delete_nullable=True)
   return application
 
+
+def lookup_access_token_for_user(user, token_uuid):
+  try:
+    return OAuthAccessToken.get(OAuthAccessToken.authorized_user == user,
+                                OAuthAccessToken.uuid == token_uuid)
+  except OAuthAccessToken.DoesNotExist:
+    return None
+
+
+def list_access_tokens_for_user(user):
+  query = (OAuthAccessToken
+           .select()
+           .join(OAuthApplication)
+           .switch(OAuthAccessToken)
+           .join(User)
+           .where(OAuthAccessToken.authorized_user == user))
+
+  return query  
+
+
 def list_applications_for_org(org):
   query = (OAuthApplication
            .select()
@@ -240,3 +260,11 @@ def list_applications_for_org(org):
            .where(OAuthApplication.organization == org))
 
   return query
+
+
+def create_access_token_for_testing(user, client_id, scope):
+  expires_at = datetime.now() + timedelta(seconds=10000)
+  application = get_application_for_client_id(client_id)
+  OAuthAccessToken.create(application=application, authorized_user=user, scope=scope,
+                          token_type='token', access_token='test',
+                          expires_at=expires_at, refresh_token='', data='')