Merge remote-tracking branch 'origin/master' into swaggerlikeus

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	templates/base.html
	test/data/test.db
	test/specs.py

data/model/legacy.py

@@ -58,7 +58,7 @@ class InvalidBuildTriggerException(DataModelException):
   pass
 
 
-def create_user(username, password, email):
+def create_user(username, password, email, is_organization=False):
   if not validate_email(email):
     raise InvalidEmailAddressException('Invalid email address: %s' % email)
   if not validate_username(username):
@@ -92,6 +92,12 @@ def create_user(username, password, email):
 
     new_user = User.create(username=username, password_hash=pw_hash,
                            email=email)
+
+    # If the password is None, then add a notification for the user to change
+    # their password ASAP.
+    if not pw_hash and not is_organization:
+      create_notification('password_required', new_user)
+    
     return new_user
   except Exception as ex:
     raise DataModelException(ex.message)
@@ -100,7 +106,7 @@ def create_user(username, password, email):
 def create_organization(name, email, creating_user):
   try:
     # Create the org
-    new_org = create_user(name, None, email)
+    new_org = create_user(name, None, email, is_organization=True)
     new_org.organization = True
     new_org.save()
 
@@ -661,6 +667,9 @@ def change_password(user, new_password):
   user.password_hash = pw_hash
   user.save()
 
+  # Remove any password required notifications for the user.
+  delete_notifications_by_kind(user, 'password_required')
+
 
 def change_invoice_email(user, invoice_email):
   user.invoice_email = invoice_email
@@ -1537,3 +1546,46 @@ def list_trigger_builds(namespace_name, repository_name, trigger_uuid,
                         limit):
   return (list_repository_builds(namespace_name, repository_name, limit)
     .where(RepositoryBuildTrigger.uuid == trigger_uuid))
+
+
+def create_notification(kind, target, metadata={}):
+  kind_ref = NotificationKind.get(name=kind)
+  notification = Notification.create(kind=kind_ref, target=target,
+                                     metadata_json=json.dumps(metadata))
+  return notification
+
+
+def list_notifications(user, kind=None):
+  Org = User.alias()
+  AdminTeam = Team.alias()
+  AdminTeamMember = TeamMember.alias()
+  AdminUser = User.alias()
+
+  query = (Notification.select()
+           .join(User)
+
+           .switch(Notification)
+           .join(Org, JOIN_LEFT_OUTER, on=(Org.id == Notification.target))
+           .join(AdminTeam, JOIN_LEFT_OUTER, on=(Org.id ==
+                                                 AdminTeam.organization))
+           .join(TeamRole, JOIN_LEFT_OUTER, on=(AdminTeam.role == TeamRole.id))
+           .switch(AdminTeam)
+           .join(AdminTeamMember, JOIN_LEFT_OUTER, on=(AdminTeam.id ==
+                                                       AdminTeamMember.team))
+           .join(AdminUser, JOIN_LEFT_OUTER, on=(AdminTeamMember.user ==
+                                                 AdminUser.id)))
+  
+  where_clause = ((Notification.target == user) |
+                  ((AdminUser.id == user) &
+                   (TeamRole.name == 'admin')))
+  
+  if kind:
+    where_clause = where_clause & (NotificationKind.name == kind)
+
+  return query.where(where_clause).order_by(Notification.created).desc()
+
+
+def delete_notifications_by_kind(target, kind):
+  kind_ref = NotificationKind.get(name=kind)
+  Notification.delete().where(Notification.target == target,
+                              Notification.kind == kind_ref).execute()