Merge branch 'master' of https://bitbucket.org/yackob03/quay

data/database.py

@@ -36,12 +36,32 @@ class BaseModel(Model):
 
 class User(BaseModel):
   username = CharField(unique=True, index=True)
-  password_hash = CharField()
+  password_hash = CharField(null=True)
   email = CharField(unique=True, index=True)
   verified = BooleanField(default=False)
   stripe_id = CharField(index=True, null=True)
 
 
+class LoginService(BaseModel):
+  name = CharField(unique=True, index=True)
+
+
+class FederatedLogin(BaseModel):
+  user = ForeignKeyField(User, index=True)
+  service = ForeignKeyField(LoginService, index=True)
+  service_ident = CharField()
+
+  class Meta:
+    database = db
+    indexes = (
+      # create a unique index on service and the local service id
+      (('service', 'service_ident'), True),
+
+      # a user may only have one federated login per service
+      (('service', 'user'), True),
+    )
+
+
 class Visibility(BaseModel):
   name = CharField(index=True)
 
@@ -136,9 +156,10 @@ class RepositoryTag(BaseModel):
 def initialize_db():
   create_model_tables([User, Repository, Image, AccessToken, Role,
                        RepositoryPermission, Visibility, RepositoryTag,
-                       EmailConfirmation])
+                       EmailConfirmation, FederatedLogin, LoginService])
   Role.create(name='admin')
   Role.create(name='write')
   Role.create(name='read')
   Visibility.create(name='public')
   Visibility.create(name='private')
+  LoginService.create(name='github')

data/model.py

@@ -34,6 +34,34 @@ def create_user(username, password, email):
     raise DataModelException(ex.message)
 
 
+def create_federated_user(username, email, service_name, service_id):
+  try:
+    new_user = User.create(username=username, email=email, verified=True)
+    service = LoginService.get(LoginService.name == service_name)
+    federated_user = FederatedLogin.create(user=new_user, service=service,
+                                           service_ident=service_id)
+
+    return new_user
+
+  except Exception as ex:
+    raise DataModelException(ex.message)
+
+
+def verify_federated_login(service_name, service_id):
+  selected = FederatedLogin.select(FederatedLogin, User)
+  with_service = selected.join(LoginService)
+  with_user = with_service.switch(FederatedLogin).join(User)
+  found = with_user.where(FederatedLogin.service_ident == service_id,
+                             LoginService.name == service_name)
+
+  found_list = list(found)
+
+  if found_list:
+    return found_list[0].user
+
+  return None
+
+
 def create_confirm_email_code(user):
   code = EmailConfirmation.create(user=user, email_confirm=True)
   return code