'.format(self.nickname)
@@ -43,22 +45,26 @@ def create(cls, nickname, created_by):
except OrgDoesNotExistError:
org = cls(
nickname=nickname,
- created_by_key=created_by.key)
+ created_by_key=created_by.key,
+ owner_key=created_by.key)
org.put()
- teams.Team.create(org, None, created_by=created_by,
- kind=teams.messages.Kind.ORG_OWNERS)
return org
def delete(self):
- from jetway.projects import projects
+ from app.projects import projects
results = projects.Project.search(owner=self)
if results:
- raise OrgConflictError('Cannot delete organizations that have projects.')
- results = teams.Team.search(owner=self)
- for team in results:
team.delete()
self.key.delete()
+ @classmethod
+ def get_by_ident(cls, ident):
+ key = ndb.Key('Org', int(ident))
+ project = key.get()
+ if project is None:
+ raise OrgDoesNotExistError('Org {} does not exist.'.format(ident))
+ return project
+
@classmethod
def get(cls, nickname):
query = cls.query(cls.nickname == nickname)
@@ -78,6 +84,13 @@ def url(self):
def ident(self):
return str(self.key.id())
+ @property
+ def owner(self):
+ if self.owner_key:
+ return self.owner_key.get()
+ if self.created_by_key:
+ return self.created_by_key.get()
+
def update(self, message):
try:
if Org.get(message.nickname) != self:
@@ -94,39 +107,33 @@ def list(cls):
query = cls.query()
return query.fetch()
- def search_members(self):
- team_objs = teams.Team.search(owner=self)
- user_keys = []
- for team in team_objs:
- user_keys += team.user_keys
- return ndb.get_multi(list(set(user_keys)))
-
- def get_team_membership(self, user):
- team_objs = self.list_teams()
- team_keys = [team.key for team in team_objs]
- query = teams.TeamMembership.query()
- query = query.filter(teams.TeamMembership.parent_key.IN(team_keys))
- query = query.filter(teams.TeamMembership.user_key == user.key)
- results = query.fetch(1)
- result = results[0] if len(results) else None
- if result is None:
- text = '{} is not a member of any team in {}.'
- raise memberships.MembershipDoesNotExistError(text.format(user, self))
- return result
-
- def create_team_membership(self, team, user, role):
- # multipel teams, so parent isnt always the same
- try:
- self.get_team_membership(user)
- text = '{} is already a member of a team in {}.'
- raise memberships.MembershipExistsError(text.format(user, self))
- except memberships.MembershipDoesNotExistError:
- return team.create_membership(user, role)
-
@property
def avatar_url(self):
return avatars.Avatar.create_url(self)
+ @classmethod
+ def search(cls, owner=None):
+ query = cls.query()
+ if owner:
+ query = query.filter(cls.owner_key == owner.key)
+ return query.fetch()
+
+ @property
+ def group(self):
+ def _create_group():
+ group = groups.Group.create(org=self)
+ self.group_key = group.key
+ self.put()
+ group.org = self
+ return group
+ if not self.group_key:
+ return _create_group()
+ group = self.group_key.get()
+ if group is None:
+ return _create_group()
+ group.org = self
+ return group
+
def to_message(self):
message = messages.OrgMessage()
message.nickname = self.nickname
@@ -136,4 +143,5 @@ def to_message(self):
message.updated = self.updated
message.avatar_url = self.avatar_url
message.ident = self.ident
+ message.owner = self.owner.to_message()
return message
diff --git a/jetway/orgs/service_messages.py b/app/orgs/service_messages.py
similarity index 73%
rename from jetway/orgs/service_messages.py
rename to app/orgs/service_messages.py
index 7c237c6..41da566 100644
--- a/jetway/orgs/service_messages.py
+++ b/app/orgs/service_messages.py
@@ -1,6 +1,7 @@
+from ..groups import messages as group_messages
+from app.orgs import messages as org_messages
+from app.users import messages as user_messages
from protorpc import messages
-from jetway.orgs import messages as org_messages
-from jetway.users import messages as user_messages
class CreateOrgRequest(messages.Message):
@@ -49,3 +50,12 @@ class SearchMembersRequest(messages.Message):
class SearchMembersResponse(messages.Message):
users = messages.MessageField(user_messages.UserMessage, 1, repeated=True)
+
+
+class GroupResponse(messages.Message):
+ group = messages.MessageField(group_messages.GroupMessage, 1)
+
+
+class MembershipRequest(messages.Message):
+ org = messages.MessageField(org_messages.OrgMessage, 1)
+ membership = messages.MessageField(group_messages.MembershipMessage, 2)
diff --git a/jetway/orgs/services.py b/app/orgs/services.py
similarity index 59%
rename from jetway/orgs/services.py
rename to app/orgs/services.py
index e829c3f..20b428f 100644
--- a/jetway/orgs/services.py
+++ b/app/orgs/services.py
@@ -1,8 +1,9 @@
+from app import api
+from app.groups import groups
+from app.orgs import orgs
+from app.orgs import service_messages
+from app.users import users
from protorpc import remote
-from jetway import api
-from jetway.orgs import orgs
-from jetway.orgs import service_messages
-from jetway.users import users
import logging
@@ -26,7 +27,10 @@ def create(self, request):
service_messages.GetOrgRequest,
service_messages.GetOrgResponse)
def get(self, request):
- org = orgs.Org.get(request.org.nickname)
+ try:
+ org = orgs.Org.get(request.org.nickname)
+ except Exception as e:
+ raise remote.ApplicationError(str(e))
message = service_messages.GetOrgResponse()
message.org = org.to_message()
return message
@@ -71,3 +75,38 @@ def search_members(self, request):
message = service_messages.SearchMembersResponse()
message.users = [user.to_message() for user in results]
return message
+
+ @remote.method(service_messages.GetOrgRequest,
+ service_messages.GroupResponse)
+ def get_group(self, request):
+ org = orgs.Org.get(request.org.nickname)
+# self._get_policy(project).authorize_read()
+ resp = service_messages.GroupResponse()
+ resp.group = org.group.to_message()
+ return resp
+
+ @remote.method(service_messages.MembershipRequest,
+ service_messages.GroupResponse)
+ def update_membership(self, request):
+ org = self._get_org(request)
+# self._get_policy(org).authorize_admin()
+ try:
+ org.group.update_membership(request.membership)
+ except groups.Error as e:
+ raise api.Error(str(e))
+ resp = service_messages.GroupResponse()
+ resp.group = org.group.to_message()
+ return resp
+
+ @remote.method(service_messages.MembershipRequest,
+ service_messages.GroupResponse)
+ def create_membership(self, request):
+ org = self._get_org(request)
+# self._get_policy(org).authorize_admin()
+ try:
+ org.group.create_membership(request.membership)
+ except groups.Error as e:
+ raise api.Error(str(e))
+ resp = service_messages.GroupResponse()
+ resp.group = org.group.to_message()
+ return resp
diff --git a/jetway/projects/__init__.py b/app/owners/__init__.py
similarity index 100%
rename from jetway/projects/__init__.py
rename to app/owners/__init__.py
diff --git a/jetway/owners/messages.py b/app/owners/messages.py
similarity index 100%
rename from jetway/owners/messages.py
rename to app/owners/messages.py
diff --git a/jetway/owners/owners.py b/app/owners/owners.py
similarity index 81%
rename from jetway/owners/owners.py
rename to app/owners/owners.py
index a32845e..d3808f5 100644
--- a/jetway/owners/owners.py
+++ b/app/owners/owners.py
@@ -1,10 +1,9 @@
from google.appengine.ext import ndb
-from jetway.avatars import avatars
-from jetway.orgs import orgs
-from jetway.owners import messages
-from jetway.users import users
-from jetway.teams import teams
-from jetway import api_errors as api
+from app.avatars import avatars
+from app.orgs import orgs
+from app.owners import messages
+from app.users import users
+from app import api_errors as api
class Error(Exception):
@@ -106,17 +105,6 @@ def to_message(self):
message.created = self._entity.created
message.website_url = self._entity.website_url
message.avatar_url = self.avatar_url
+ if self.kind == messages.OwnerMessage.Kind.USER:
+ message.email = self._entity.email
return message
-
- def create_team(self, nickname, created_by):
- return teams.Team.create(self, nickname, created_by)
-
- def search_teams(self):
- return teams.Team.search(owner=self)
-
- def get_team(self, nickname):
- return teams.Team.get(self, nickname)
-
- def delete_team(self, nickname):
- team = self.get_team(nickname)
- team.delete()
diff --git a/jetway/owners/owners_test.py b/app/owners/owners_test.py
similarity index 75%
rename from jetway/owners/owners_test.py
rename to app/owners/owners_test.py
index 8cdfc54..7616ea1 100644
--- a/jetway/owners/owners_test.py
+++ b/app/owners/owners_test.py
@@ -1,7 +1,7 @@
-from jetway import testing
-from jetway.orgs import orgs
-from jetway.owners import owners
-from jetway.users import users
+from app import testing
+from app.orgs import orgs
+from app.owners import owners
+from app.users import users
import unittest
diff --git a/jetway/owners/services.py b/app/owners/services.py
similarity index 90%
rename from jetway/owners/services.py
rename to app/owners/services.py
index ec4f3f2..d6569ed 100644
--- a/jetway/owners/services.py
+++ b/app/owners/services.py
@@ -1,7 +1,7 @@
from protorpc import remote
-from jetway import api
-from jetway.owners import owners
-from jetway.owners import messages
+from app import api
+from app.owners import owners
+from app.owners import messages
class OwnerService(api.Service):
@@ -47,5 +47,7 @@ def update(self, request):
def get(self, request):
owner = self.get_owner(request)
resp = messages.GetOwnerResponse()
+ if owner is None:
+ raise api.NotFoundError(request.owner.nickname)
resp.owner = owner.to_message()
return resp
diff --git a/jetway/server/__init__.py b/app/policies/__init__.py
similarity index 100%
rename from jetway/server/__init__.py
rename to app/policies/__init__.py
diff --git a/app/policies/policies.py b/app/policies/policies.py
new file mode 100644
index 0000000..2e036f7
--- /dev/null
+++ b/app/policies/policies.py
@@ -0,0 +1 @@
+from .projects import *
diff --git a/app/policies/projects.py b/app/policies/projects.py
new file mode 100644
index 0000000..bbb6c35
--- /dev/null
+++ b/app/policies/projects.py
@@ -0,0 +1,56 @@
+from ..groups import groups
+from ..groups import messages
+from app import api_errors
+
+
+class Error(Exception):
+ pass
+
+
+class ForbiddenError(Error, api_errors.ForbiddenError):
+ pass
+
+
+class ProjectPolicy(object):
+
+ def __init__(self, user, project):
+ self.project = project
+ self.user = user
+ self.mem = self.project.group.get_membership(self.user)
+ self.is_owner = self.project.owner_key == user.key
+
+ def authorize_admin(self):
+ if not self.can_write():
+ raise ForbiddenError('{} is not an admin for {}'.format(self.user, self.project))
+
+ def authorize_write(self):
+ if not self.can_write():
+ raise ForbiddenError('{} cannot write to {}'.format(self.user, self.project))
+
+ def authorize_read(self):
+ if not self.can_read():
+ raise ForbiddenError('{} cannot read {}'.format(self.user, self.project))
+
+ def can_administer(self):
+ if self.is_owner:
+ return True
+ if self.mem is None:
+ return False
+ return self.mem.role in [messages.Role.ADMIN]
+
+ def can_read(self):
+ if self.is_owner:
+ return True
+ if self.project.owner.org:
+ if self.user.key == self.project.owner.org.owner_key:
+ return True
+ if self.mem is None:
+ return False
+ return self.mem.role in [messages.Role.ADMIN, messages.Role.READ, None]
+
+ def can_write(self):
+ if self.is_owner:
+ return True
+ if self.mem is None:
+ return False
+ return self.mem.role in [messages.Role.ADMIN, messages.Role.WRITE]
diff --git a/jetway/sheets/__init__.py b/app/projects/__init__.py
similarity index 100%
rename from jetway/sheets/__init__.py
rename to app/projects/__init__.py
diff --git a/app/projects/messages.py b/app/projects/messages.py
new file mode 100644
index 0000000..331e973
--- /dev/null
+++ b/app/projects/messages.py
@@ -0,0 +1,90 @@
+from app.owners import messages as owner_messages
+from protorpc import message_types
+from protorpc import messages
+
+
+class Permission(messages.Enum):
+ READ = 1
+ WRITE = 2
+ ADMINISTER = 3
+
+
+class Order(messages.Enum):
+ NAME = 0
+
+
+class BuildbotGitStatus(messages.Enum):
+ NONE = 1
+ SYNCING = 2
+ ERROR = 3
+ CONNECTED = 4
+
+
+class ProjectMessage(messages.Message):
+ nickname = messages.StringField(1)
+ ident = messages.StringField(2)
+ owner = messages.MessageField(owner_messages.OwnerMessage, 3)
+ description = messages.StringField(4)
+ avatar_url = messages.StringField(6)
+ name = messages.StringField(9)
+ built = message_types.DateTimeField(10)
+ buildbot_job_id = messages.StringField(11)
+ git_url = messages.StringField(12)
+ translation_branch = messages.StringField(13)
+ buildbot_git_status = messages.EnumField(BuildbotGitStatus, 14)
+
+
+###
+
+
+class CreateProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class CreateProjectResponse(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class DeleteProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class DeleteProjectResponse(messages.Message):
+ pass
+
+
+class UpdateProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class UpdateProjectResponse(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class SearchProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class SearchProjectResponse(messages.Message):
+ projects = messages.MessageField(ProjectMessage, 1, repeated=True)
+
+
+class GetProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class GetProjectResponse(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class DeleteProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class DeleteProjectResponse(messages.Message):
+ pass
+
+
+class TransferOwnerRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+ owner = messages.MessageField(owner_messages.OwnerMessage, 2)
diff --git a/jetway/projects/projects.py b/app/projects/projects.py
similarity index 53%
rename from jetway/projects/projects.py
rename to app/projects/projects.py
index 7369acc..e3f3ac0 100644
--- a/jetway/projects/projects.py
+++ b/app/projects/projects.py
@@ -1,13 +1,21 @@
from . import watchers
+from ..buildbot import buildbot
+from ..buildbot import messages as buildbot_messages
+from ..catalogs import catalogs
+from ..groups import groups
+from ..groups import messages as group_messages
+from ..policies import policies
from google.appengine.ext import ndb
from google.appengine.ext.ndb import msgprop
-from jetway.avatars import avatars
-from jetway.filesets import filesets
-from jetway.filesets import named_filesets
-from jetway.owners import owners
-from jetway.projects import messages
-from jetway.teams import teams
+from app.avatars import avatars
+from app.filesets import filesets
+from app.filesets import named_filesets
+from app.owners import owners
+from app.projects import messages
+from protorpc import protojson
import appengine_config
+import json
+import logging
import os
@@ -26,17 +34,8 @@ class ProjectDoesNotExistError(Error):
pass
-class Cover(ndb.Model):
- content = ndb.StringProperty()
-
- @classmethod
- def from_message(cls, message):
- return cls(content=message.content)
-
- def to_message(self):
- message = messages.CoverMessage()
- message.content = self.content
- return message
+class GitIntegrationError(Error):
+ pass
class Project(ndb.Model):
@@ -45,15 +44,21 @@ class Project(ndb.Model):
owner_key = ndb.KeyProperty()
created_by_key = ndb.KeyProperty()
description = ndb.StringProperty()
- cover = ndb.StructuredProperty(Cover)
- visibility = msgprop.EnumProperty(messages.Visibility,
- default=messages.Visibility.PRIVATE)
built = ndb.DateTimeProperty()
+ buildbot_job_id = ndb.StringProperty()
+ git_url = ndb.StringProperty()
+ group_key = ndb.KeyProperty()
+ translation_branch = ndb.StringProperty()
+ buildbot_git_status = msgprop.EnumProperty(messages.BuildbotGitStatus)
@property
def name(self):
return '{}/{}'.format(self.owner.nickname, self.nickname)
+ @property
+ def permalink(self):
+ return '{}/{}'.format(appengine_config.BASE_URL, self.name)
+
@property
def name_padded(self):
return '{} / {}'.format(self.owner.nickname, self.nickname)
@@ -66,7 +71,7 @@ def ident(self):
return str(self.key.id())
@classmethod
- def create(cls, owner, nickname, created_by, description=None):
+ def create(cls, owner, nickname, created_by, description=None, git_url=None):
try:
cls.get(owner, nickname)
text = 'Project {}/{} already exists.'
@@ -77,11 +82,11 @@ def create(cls, owner, nickname, created_by, description=None):
owner_key=owner.key,
created_by_key=created_by.key,
nickname=nickname,
+ git_url=git_url,
description=description)
project.put()
- teams.Team.create(owner, None,
- created_by=created_by, project=project,
- kind=teams.messages.Kind.PROJECT_OWNERS)
+ project._init_default_group()
+ project._update_buildbot_job(project.git_url)
return project
@classmethod
@@ -104,6 +109,36 @@ def get(cls, owner=None, nickname=None):
raise ProjectDoesNotExistError(text.format(nickname))
return project
+ def _update_buildbot_job(self, git_url):
+ if self.git_url == git_url and self.buildbot_job_id:
+ return
+ if not git_url:
+ self.buildbot_job_id = None
+ self.put()
+ return
+ logging.info('Buildbot URL update {} -> {}'.format(self, git_url))
+ bot = buildbot.Buildbot()
+ try:
+ resp = bot.create_job(
+ git_url=git_url,
+ remote=self.permalink)
+ self.buildbot_job_id = str(resp['job_id'])
+ text = 'Buildbot job ID update {} -> {}'
+ logging.info(text.format(self, self.buildbot_job_id))
+ self.put()
+ except buildbot.Error:
+ logging.exception('Buildbot connection error.')
+
+ def _init_default_group(self):
+ group = groups.Group.create(self)
+ if appengine_config.DEFAULT_DOMAIN:
+ mem_message = group_messages.MembershipMessage(
+ domain=appengine_config.DEFAULT_DOMAIN)
+ group.create_membership(mem_message)
+ self.group_key = group.key
+ self.put()
+ return group
+
@classmethod
def search(cls, owner=None, order=None):
query = cls.query()
@@ -112,24 +147,19 @@ def search(cls, owner=None, order=None):
elif order == messages.Order.NAME:
query = query.order(-cls.nickname)
if owner:
- query = query.filter(cls.owner_key == owner.key)
+ if isinstance(owner, list):
+ query = query.filter(cls.owner_key.IN([o.key for o in owner]))
+ else:
+ query = query.filter(cls.owner_key == owner.key)
return query.fetch()
def delete(self):
- from jetway.launches import launches
- team_results = teams.Team.search(projects=[self], kind=teams.messages.Kind.DEFAULT)
+ from app.launches import launches
launch_results = launches.Launch.search(project=self)
fileset_results = filesets.Fileset.search(project=self)
@ndb.transactional(retries=1, xg=True)
def _delete_project():
- try:
- project_team = teams.Team.get(self.ident, teams.messages.Kind.PROJECT_OWNERS)
- project_team.delete()
- except teams.TeamDoesNotExistError:
- pass
- for team in team_results:
- team.remove_project(self)
for launch in launch_results:
launch.delete()
for fileset in fileset_results:
@@ -145,9 +175,6 @@ def create_fileset(self, name, commit=None):
def get_fileset(self, name):
return filesets.Fileset.get(project=self, name=name)
- def get_team(self):
- return teams.Team.get(self.ident, teams.messages.Kind.PROJECT_OWNERS)
-
def search_filesets(self):
query = filesets.Fileset.query()
query = query.filter(filesets.Fileset.project_key == self.key)
@@ -161,13 +188,20 @@ def owner(self):
return owners.Owner.get_by_key(self.owner_key)
@property
- def git_url(self):
- host = os.getenv('SERVER_NAME')
- if os.getenv('SERVER_SOFTWARE').startswith('Dev'):
- port = os.getenv('SERVER_PORT')
- host = '{}:{}'.format(host, port)
- scheme = os.getenv('wsgi.url_scheme')
- return '{}://{}/{}/{}.git'.format(scheme, host, self.owner.nickname, self.nickname)
+ def group(self):
+ def _create_group():
+ group = groups.Group.create(project=self)
+ self.group_key = group.key
+ self.put()
+ group.project = self
+ return group
+ if not self.group_key:
+ return _create_group()
+ group = self.group_key.get()
+ if group is None:
+ return _create_group()
+ group.project = self
+ return group
@property
def avatar_url(self):
@@ -184,33 +218,31 @@ def to_message(self):
message.ident = self.ident
message.owner = self.owner.to_message()
message.description = self.description
- message.git_url = self.git_url
message.avatar_url = self.avatar_url
- message.visibility = self.visibility
- if self.cover:
- message.cover = self.cover.to_message()
+ message.git_url = self.git_url
+ message.buildbot_job_id = self.buildbot_job_id
message.built = self.built
+ message.translation_branch = self.translation_branch
return message
def update(self, message):
self.description = message.description
- if message.cover:
- self.cover = Cover.from_message(message.cover)
- self.visibility = message.visibility
+ self.translation_branch = message.translation_branch
+ self._update_buildbot_job(message.git_url)
+ self.git_url = message.git_url
self.put()
- def search_teams(self, users=None):
- return teams.Team.search(projects=[self], users=None)
+ def transfer_owner(self, owner):
+ self.owner_key = owner.key
+ self.put()
def list_users_to_notify(self):
return self.search_users(is_public=None)
def search_users(self, is_public=True):
- team = self.get_team()
users = []
- for membership in team.memberships:
- if (is_public is None
- or membership.is_public == is_public):
+ for membership in self.group.memberships:
+ if membership.user_key:
users.append(membership.user)
return users
@@ -218,54 +250,11 @@ def search_users(self, is_public=True):
def filter(cls, results, user, permission=messages.Permission.READ):
filtered = []
for project in results:
- if project.can(user, permission):
+ policy = policies.ProjectPolicy(user, project)
+ if policy.can_read():
filtered.append(project)
return filtered
- def can(self, user, permission=messages.Permission.READ):
- if not user:
- return False
- # TODO: Implement proper domain-level access controls.
- username, domain = user.email.split('@')
- if username in appengine_config.DOMAIN_ACCESS_USERS:
- return True
- if (appengine_config.DEFAULT_USER_DOMAINS and
- domain in appengine_config.DEFAULT_USER_DOMAINS):
- return True
- if self.visibility in [messages.Visibility.PUBLIC, messages.Visibility.COVER]:
- if appengine_config.DEFAULT_USER_DOMAINS:
- return domain in appengine_config.DEFAULT_USER_DOMAINS
- else:
- return True
- if self.owner == user:
- return True
- query = teams.Team.query(ndb.OR(# Project teams.
- ndb.AND(teams.Team.project_keys == self.key,
- teams.Team.user_keys == user.key),
- # Org Owners team.
- ndb.AND(teams.Team.kind == teams.messages.Kind.ORG_OWNERS,
- teams.Team.owner_key == self.owner.key,
- teams.Team.user_keys == user.key)))
- found_teams = query.fetch()
- if self.visibility == messages.Visibility.ORGANIZATION:
- return bool(found_teams)
- if self.visibility == messages.Visibility.PRIVATE:
- # TODO: Remove this once exposing default permissions in UI.
- if (appengine_config.DEFAULT_USER_DOMAINS
- and user.email.split('@')[-1] in appengine_config.DEFAULT_USER_DOMAINS):
- return True
- for team in found_teams:
- membership = team.get_membership(user)
- if not membership:
- continue
- # Org owners have access to all projects.
- if team.kind == teams.messages.Kind.ORG_OWNERS:
- return True
- # If the user is in a team that has this project, return True.
- if self.key in team.project_keys:
- return True
- return False
-
def create_watcher(self, user):
return watchers.Watcher.create(project=self, user=user)
@@ -293,3 +282,42 @@ def delete_named_fileset(self, name):
def list_named_filesets(self):
return named_filesets.NamedFileset.search(project=self)
+
+ def verify_repo_status(self):
+ if not self.buildbot_job_id:
+ raise GitIntegrationError('Git repository not initialized.')
+
+ def list_branches(self):
+ self.verify_repo_status()
+ bot = buildbot.Buildbot()
+ job = bot.get_job(self.buildbot_job_id)['job']
+ results = []
+ for ref, data in job['ref_map'].iteritems():
+ name = ref.replace('refs/heads/', '')
+ commit = buildbot_messages.CommitMessage(sha=data['sha'])
+ ident = self.ident + ':branch:' + name
+ branch_message = buildbot_messages.BranchMessage(
+ name=name,
+ commit=commit,
+ ident=ident)
+ results.append(branch_message)
+ results = sorted(results, key=lambda message: message.name)
+ return results
+
+ def list_catalogs(self, ref=None):
+ self.verify_repo_status()
+ bot = buildbot.Buildbot()
+ items = bot.get_contents(
+ self.buildbot_job_id,
+ path='/translations/',
+ ref=ref)
+ catalog_objs = []
+ for item in items:
+ if item['type'] == 'dir':
+ catalog = self.get_catalog(locale=item['name'])
+ catalog_objs.append(catalog)
+ return catalog_objs
+
+ def get_catalog(self, locale, ref=None):
+ self.verify_repo_status()
+ return catalogs.Catalog(project=self, locale=locale, ref=ref)
diff --git a/jetway/projects/projects_test.py b/app/projects/projects_test.py
similarity index 60%
rename from jetway/projects/projects_test.py
rename to app/projects/projects_test.py
index 8ccd096..9fde5c4 100644
--- a/jetway/projects/projects_test.py
+++ b/app/projects/projects_test.py
@@ -1,4 +1,4 @@
-from jetway import testing
+from app import testing
import unittest
@@ -14,6 +14,13 @@ def test_named_filesets(self):
self.assertItemsEqual([named_fileset], ents)
self.project.delete_named_fileset('preview')
+ def test_transfer_owner(self):
+ owner = self.project.owner
+ self.assertEqual(owner, self.project.owner)
+ new_owner = self.create_owner('new-owner', 'new-owner@example.com')
+ self.project.transfer_owner(new_owner)
+ self.assertEqual(new_owner, self.project.owner)
+
if __name__ == '__main__':
unittest.main()
diff --git a/jetway/projects/service_messages.py b/app/projects/service_messages.py
similarity index 65%
rename from jetway/projects/service_messages.py
rename to app/projects/service_messages.py
index 69a17f4..cf1df7f 100644
--- a/jetway/projects/service_messages.py
+++ b/app/projects/service_messages.py
@@ -1,4 +1,7 @@
+from ..buildbot import messages as buildbot_messages
+from ..catalogs import messages as catalog_messages
from ..filesets.named_fileset_messages import *
+from ..groups import messages as group_messages
from .messages import *
from .watcher_messages import *
from protorpc import messages
@@ -98,3 +101,43 @@ class DeleteNamedFilesetRequest(messages.Message):
class DeleteNamedFilesetResponse(messages.Message):
named_fileset = messages.MessageField(NamedFilesetMessage, 1)
+
+
+class ListBranchesRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+
+
+class ListBranchesResponse(messages.Message):
+ branches = messages.MessageField(buildbot_messages.BranchMessage, 1, repeated=True)
+
+
+class ProjectRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+ branch = messages.StringField(2)
+
+
+class ListCatalogsResponse(messages.Message):
+ catalogs = messages.MessageField(catalog_messages.CatalogMessage, 1, repeated=True)
+
+
+class CatalogRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+ catalog = messages.MessageField(catalog_messages.CatalogMessage, 2)
+
+
+class CatalogResponse(messages.Message):
+ catalog = messages.MessageField(catalog_messages.CatalogMessage, 1)
+
+
+class GroupResponse(messages.Message):
+ group = messages.MessageField(group_messages.GroupMessage, 1)
+
+
+class MembershipRequest(messages.Message):
+ project = messages.MessageField(ProjectMessage, 1)
+ membership = messages.MessageField(group_messages.MembershipMessage, 2)
+
+
+class GroupRequest(messages.Message):
+ project = messages.MessageField(project_messages.ProjectMessage, 1)
+ group = messages.MessageField(group_messages.GroupMessage, 2)
diff --git a/app/projects/services.py b/app/projects/services.py
new file mode 100644
index 0000000..9bbaf38
--- /dev/null
+++ b/app/projects/services.py
@@ -0,0 +1,283 @@
+from . import service_messages
+from ..buildbot import buildbot
+from ..policies import policies
+from app import api
+from app.groups import groups
+from app.owners import owners
+from app.projects import messages
+from app.projects import projects
+from protorpc import remote
+import appengine_config
+
+
+class ProjectService(api.Service):
+
+ def _get_policy(self, project):
+ return policies.ProjectPolicy(user=self.me, project=project)
+
+ def _get_project(self, request):
+ try:
+ if request.project.ident:
+ return projects.Project.get_by_ident(request.project.ident)
+ owner = owners.Owner.get(request.project.owner.nickname)
+ return projects.Project.get(owner, request.project.nickname)
+ except (owners.OwnerDoesNotExistError,
+ projects.ProjectDoesNotExistError) as e:
+ raise api.NotFoundError(str(e))
+
+ @remote.method(service_messages.CreateProjectRequest,
+ service_messages.CreateProjectResponse)
+ def create(self, request):
+ try:
+ try:
+ owner = owners.Owner.get(request.project.owner.nickname)
+ except owners.OwnerDoesNotExistError as e:
+ raise api.NotFoundError(str(e))
+ project = projects.Project.create(owner, request.project.nickname,
+ description=request.project.description,
+ git_url=request.project.git_url,
+ created_by=self.me)
+ except projects.ProjectExistsError as e:
+ raise api.ConflictError(str(e))
+ resp = service_messages.CreateProjectResponse()
+ resp.project = project.to_message()
+ return resp
+
+ @remote.method(service_messages.SearchProjectRequest,
+ service_messages.SearchProjectResponse)
+ def search(self, request):
+ if request.project and request.project.owner:
+ owner = owners.Owner.get(request.project.owner.nickname)
+ else:
+ owner = None
+ results = projects.Project.search(owner=owner, order=messages.Order.NAME)
+ results = projects.Project.filter(results, self.me)
+ results = sorted(results, key=lambda project: project.name)
+ resp = service_messages.SearchProjectResponse()
+ resp.projects = [project.to_message() for project in results]
+ return resp
+
+ @remote.method(service_messages.UpdateProjectRequest,
+ service_messages.UpdateProjectResponse)
+ def update(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_admin()
+ project.update(request.project)
+ resp = service_messages.UpdateProjectResponse()
+ resp.project = project.to_message()
+ return resp
+
+ @remote.method(service_messages.GetProjectRequest,
+ service_messages.GetProjectResponse)
+ def get(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ resp = service_messages.GetProjectResponse()
+ resp.project = project.to_message()
+ return resp
+
+ @remote.method(service_messages.DeleteProjectRequest,
+ service_messages.DeleteProjectResponse)
+ def delete(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_admin()
+ project.delete()
+ resp = service_messages.DeleteProjectResponse()
+ return resp
+
+ @remote.method(service_messages.GetProjectRequest,
+ service_messages.CreateWatcherResponse)
+ def watch(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ watcher = project.create_watcher(self.me)
+ resp = service_messages.CreateWatcherResponse()
+ resp.watcher = watcher.to_message()
+ return resp
+
+ @remote.method(service_messages.GetProjectRequest,
+ service_messages.ListWatchersResponse)
+ def unwatch(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ project.delete_watcher(self.me)
+ watchers = project.list_watchers()
+ resp = service_messages.ListWatchersResponse()
+ resp.watchers = [watcher.to_message() for watcher in watchers]
+ return resp
+
+ @remote.method(service_messages.ListWatchersRequest,
+ service_messages.ListWatchersResponse)
+ def list_watchers(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ watchers = project.list_watchers()
+ resp = service_messages.ListWatchersResponse()
+ resp.watching = any(self.me == watcher.user for watcher in watchers)
+ resp.watchers = [watcher.to_message() for watcher in watchers]
+ return resp
+
+ @remote.method(service_messages.ListNamedFilesetsRequest,
+ service_messages.ListNamedFilesetsResponse)
+ def list_named_filesets(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ named_filesets = project.list_named_filesets()
+ resp = service_messages.ListNamedFilesetsRequest()
+ resp.named_filesets = [named_fileset.to_message()
+ for named_fileset in named_filesets]
+ return resp
+
+ @remote.method(service_messages.CreateNamedFilesetRequest,
+ service_messages.CreateNamedFilesetResponse)
+ def create_named_fileset(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_write()
+ named_fileset = project.create_named_fileset(
+ request.named_fileset.name, request.named_fileset.branch)
+ resp = service_messages.CreateNamedFilesetResponse()
+ resp.named_fileset = named_fileset.to_message()
+ return resp
+
+ @remote.method(service_messages.DeleteNamedFilesetRequest,
+ service_messages.DeleteNamedFilesetResponse)
+ def delete_named_fileset(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_write()
+ project.delete_named_fileset(request.named_fileset.name)
+ resp = service_messages.DeleteNamedFilesetResponse()
+ return resp
+
+ @remote.method(service_messages.ListBranchesRequest,
+ service_messages.ListBranchesResponse)
+ def list_branches(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ try:
+ branches = project.list_branches()
+ except (buildbot.Error, projects.GitIntegrationError) as e:
+ raise api.Error(str(e))
+ resp = service_messages.ListBranchesResponse()
+ resp.branches = branches
+ return resp
+
+ @remote.method(service_messages.ProjectRequest,
+ service_messages.ListCatalogsResponse)
+ def list_catalogs(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ try:
+ catalogs = project.list_catalogs(ref=request.branch)
+ except (buildbot.Error, projects.GitIntegrationError) as e:
+ raise api.Error(str(e))
+ resp = service_messages.ListCatalogsResponse()
+ resp.catalogs = [catalog.to_message(included=[]) for catalog in catalogs]
+ return resp
+
+ @remote.method(service_messages.CatalogRequest,
+ service_messages.CatalogResponse)
+ def get_catalog(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ try:
+ catalog = project.get_catalog(
+ locale=request.catalog.locale,
+ ref=request.catalog.ref)
+ except (buildbot.Error, projects.GitIntegrationError) as e:
+ raise api.Error(str(e))
+ resp = service_messages.CatalogResponse()
+ resp.catalog = catalog.to_message()
+ return resp
+
+ @remote.method(service_messages.CatalogRequest,
+ service_messages.CatalogResponse)
+ def update_translations(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_write()
+ try:
+ catalog = project.get_catalog(request.catalog.locale)
+ except buildbot.Error as e:
+ raise api.Error(str(e))
+ committer = {
+ 'name': appengine_config.EMAIL_NAME,
+ 'email': appengine_config.EMAIL_ADDRESS,
+ }
+ author = {
+ 'name': self.me.name or 'Web Review User',
+ 'email': self.me.email,
+ }
+ try:
+ catalog.update_translations(
+ request.catalog.translations,
+ ref=request.catalog.ref,
+ sha=request.catalog.sha,
+ committer=committer,
+ author=author)
+ except buildbot.Error as e:
+ raise api.Error(str(e))
+ resp = service_messages.CatalogResponse()
+ resp.catalog = catalog.to_message()
+ return resp
+
+ @remote.method(service_messages.GroupRequest,
+ service_messages.GroupResponse)
+ def get_group(self, request):
+ if request.group:
+ group = groups.Group.get(request.group.ident)
+ elif request.project:
+ project = self._get_project(request)
+ self._get_policy(project).authorize_read()
+ group = project.group
+ resp = service_messages.GroupResponse()
+ resp.group = group.to_message()
+ return resp
+
+ @remote.method(service_messages.MembershipRequest,
+ service_messages.GroupResponse)
+ def update_membership(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_admin()
+ try:
+ project.group.update_membership(request.membership)
+ except groups.Error as e:
+ raise api.Error(str(e))
+ resp = service_messages.GroupResponse()
+ resp.group = project.group.to_message()
+ return resp
+
+ @remote.method(service_messages.MembershipRequest,
+ service_messages.GroupResponse)
+ def create_membership(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_admin()
+ try:
+ project.group.create_membership(request.membership)
+ except groups.Error as e:
+ raise api.Error(str(e))
+ resp = service_messages.GroupResponse()
+ resp.group = project.group.to_message()
+ return resp
+
+ @remote.method(service_messages.MembershipRequest,
+ service_messages.GroupResponse)
+ def delete_membership(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_admin()
+ try:
+ project.group.delete_membership(request.membership)
+ except groups.Error as e:
+ raise api.Error(str(e))
+ resp = service_messages.GroupResponse()
+ resp.group = project.group.to_message()
+ return resp
+
+ @remote.method(service_messages.TransferOwnerRequest,
+ service_messages.GetProjectResponse)
+ def transfer(self, request):
+ project = self._get_project(request)
+ self._get_policy(project).authorize_admin()
+ owner = owners.Owner.get(request.owner.nickname)
+ project.transfer_owner(owner)
+ resp = service_messages.GetProjectResponse()
+ resp.project = project.to_message()
+ return resp
diff --git a/jetway/projects/watcher_messages.py b/app/projects/watcher_messages.py
similarity index 100%
rename from jetway/projects/watcher_messages.py
rename to app/projects/watcher_messages.py
diff --git a/jetway/projects/watchers.py b/app/projects/watchers.py
similarity index 100%
rename from jetway/projects/watchers.py
rename to app/projects/watchers.py
diff --git a/jetway/teams/__init__.py b/app/server/__init__.py
similarity index 100%
rename from jetway/teams/__init__.py
rename to app/server/__init__.py
diff --git a/jetway/server/handlers.py b/app/server/handlers.py
similarity index 81%
rename from jetway/server/handlers.py
rename to app/server/handlers.py
index 518f66a..b880488 100644
--- a/jetway/server/handlers.py
+++ b/app/server/handlers.py
@@ -1,10 +1,11 @@
from google.appengine.ext import ndb
-from jetway.auth import handlers as auth_handlers
-from jetway.files import files
-from jetway.filesets import filesets
-from jetway.owners import owners
-from jetway.projects import projects
-from jetway.server import utils
+from app.auth import handlers as auth_handlers
+from app.files import files
+from app.filesets import filesets
+from app.owners import owners
+from app.policies import policies
+from app.projects import projects
+from app.server import utils
import jinja2
import os
@@ -15,6 +16,12 @@
class RequestHandler(auth_handlers.SessionHandler):
+ def _is_open_path(self, path):
+ # TODO: Remove dirty hack to get around issues with Chrome Beta and
+ # Firefox. Note that this exposes all ttf and woff files.
+ # http://stackoverflow.com/questions/31140826
+ return path.endswith(('.woff', '.ttf'))
+
def error(self, status, title, message):
template = _env.get_template('error.html')
html = template.render({
@@ -45,7 +52,8 @@ def get(self):
if fileset_name is None:
raise filesets.FilesetDoesNotExistError
fileset = filesets.Fileset.get_by_name_or_ident(fileset_name)
- if not fileset.project.can(self.me, projects.Permission.READ):
+ policy = policies.ProjectPolicy(self.me, fileset.project)
+ if not self._is_open_path(self.request.path) and not policy.can_read():
if self.me:
text = '{} does not have access to this page.'.format(self.me)
self.error(403, 'Forbidden', text)
diff --git a/jetway/server/templates/error.html b/app/server/templates/error.html
similarity index 100%
rename from jetway/server/templates/error.html
rename to app/server/templates/error.html
diff --git a/jetway/server/utils.py b/app/server/utils.py
similarity index 69%
rename from jetway/server/utils.py
rename to app/server/utils.py
index 0cc3f96..f2c6fcd 100644
--- a/jetway/server/utils.py
+++ b/app/server/utils.py
@@ -5,10 +5,14 @@
_HOSTNAME_RE = re.compile('^(?:(.*)--)?(.*)--([^\.]*)\.')
+def is_avatar_request(hostname):
+ return re.match('^avatars-.-dot-', hostname)
+
+
def is_preview_server(hostname, path=None):
return (hostname.endswith(appengine_config.PREVIEW_HOSTNAME)
and hostname != appengine_config.PREVIEW_HOSTNAME
- and not re.match('^avatars\d-dot-', hostname))
+ and not re.match('^avatars-\w-dot-', hostname))
def parse_hostname(hostname, path=None, multitenant=False):
@@ -26,6 +30,15 @@ def parse_hostname(hostname, path=None, multitenant=False):
return tuple(part if part else None for part in results[0])
+def make_subdomain(name, project, owner, ident=None, multitenant=False):
+ if multitenant:
+ return '{name}--{project}--{owner}'.format(
+ name=name, project=project, owner=owner)
+ elif name:
+ return name
+ return ident
+
+
def make_url(name, project, owner, path=None,
multitenant=False,
include_port=appengine_config.IS_DEV_SERVER,
@@ -38,14 +51,6 @@ def make_url(name, project, owner, path=None,
sep = '-dot-'
else:
sep = '.'
- if multitenant:
- return '{scheme}://{name}--{project}--{owner}{sep}{hostname}'.format(
- scheme=scheme, name=name, sep=sep, hostname=preview_hostname,
- owner=owner, project=project)
- else:
- if name:
- return '{scheme}://{name}{sep}{hostname}'.format(
- scheme=scheme, name=name, sep=sep, hostname=preview_hostname)
- else:
- return '{scheme}://{ident}{sep}{hostname}'.format(
- scheme=scheme, ident=ident, sep=sep, hostname=preview_hostname)
+ subdomain = make_subdomain(name, project, owner, ident=ident, multitenant=multitenant)
+ return '{scheme}://{subdomain}{sep}{hostname}'.format(
+ scheme=scheme, subdomain=subdomain, sep=sep, hostname=preview_hostname)
diff --git a/jetway/server/utils_test.py b/app/server/utils_test.py
similarity index 84%
rename from jetway/server/utils_test.py
rename to app/server/utils_test.py
index 3bde0ac..ebe1793 100644
--- a/jetway/server/utils_test.py
+++ b/app/server/utils_test.py
@@ -1,5 +1,5 @@
-from jetway import testing
-from jetway.server import utils
+from app import testing
+from app.server import utils
import unittest
@@ -42,6 +42,14 @@ def test_make_url(self):
result = utils.make_url(fileset, project, owner, include_port=True)
self.assertEqual(expected, result)
+ def test_is_avatar_request(self):
+ hostnames = [
+ 'avatars-1-dot-foo',
+ 'avatars-U-dot-foo',
+ 'avatars-a-dot-foo',
+ ]
+ for hostname in hostnames:
+ self.assertTrue(utils.is_avatar_request(hostname))
if __name__ == '__main__':
diff --git a/jetway/testing.py b/app/testing.py
similarity index 76%
rename from jetway/testing.py
rename to app/testing.py
index 0eaac26..ea01505 100644
--- a/jetway/testing.py
+++ b/app/testing.py
@@ -1,9 +1,9 @@
from google.appengine.ext import testbed
-from jetway.filesets import messages as fileset_messages
-from jetway.orgs import orgs
-from jetway.owners import owners
-from jetway.projects import projects
-from jetway.users import users
+from app.filesets import messages as fileset_messages
+from app.orgs import orgs
+from app.owners import owners
+from app.projects import projects
+from app.users import users
import appengine_config
import unittest
@@ -34,3 +34,7 @@ def create_fileset(self):
project = self.create_project()
commit = fileset_messages.CommitMessage(branch='master', sha='1234567890')
return project.create_fileset('master', commit=commit)
+
+ def create_owner(self, nickname, email):
+ creator = users.User.create(nickname, email=email)
+ return owners.Owner.get(creator.nickname)
diff --git a/jetway/users/__init__.py b/app/translations/__init__.py
similarity index 100%
rename from jetway/users/__init__.py
rename to app/translations/__init__.py
diff --git a/app/translations/messages.py b/app/translations/messages.py
new file mode 100644
index 0000000..b425090
--- /dev/null
+++ b/app/translations/messages.py
@@ -0,0 +1,7 @@
+from protorpc import messages
+
+
+class TranslationMessage(messages.Message):
+ msgid = messages.StringField(1)
+ string = messages.StringField(2)
+ ident = messages.StringField(3)
diff --git a/app/translations/translations.py b/app/translations/translations.py
new file mode 100644
index 0000000..ac4bc1d
--- /dev/null
+++ b/app/translations/translations.py
@@ -0,0 +1,28 @@
+from . import messages
+
+
+class Translation(object):
+
+ def __init__(self, catalog, msgid, string, comments=None):
+ self.catalog = catalog
+ self.msgid = msgid or ''
+ self.string = string or ''
+ self.comments = comments
+
+ @property
+ def ident(self):
+ return self.catalog.ident + '/' + self.msgid
+ if isinstance(self.msgid, unicode):
+ msgid = self.msgid.encode('utf-8')
+ else:
+ msgid = self.msgid
+ result = '{}/{}'.format(self.catalog.ident, msgid)
+ result = result.decode()
+ return result
+
+ def to_message(self):
+ message = messages.TranslationMessage()
+ message.ident = self.ident
+ message.msgid = self.msgid
+ message.string = self.string
+ return message
diff --git a/jetway/utils/__init__.py b/app/users/__init__.py
similarity index 100%
rename from jetway/utils/__init__.py
rename to app/users/__init__.py
diff --git a/app/users/messages.py b/app/users/messages.py
new file mode 100644
index 0000000..17b1611
--- /dev/null
+++ b/app/users/messages.py
@@ -0,0 +1,12 @@
+from protorpc import messages
+
+
+class UserMessage(messages.Message):
+ ident = messages.StringField(1)
+ nickname = messages.StringField(2)
+ avatar_url = messages.StringField(3)
+ email = messages.StringField(4)
+ website_url = messages.StringField(5)
+ description = messages.StringField(6)
+ location = messages.StringField(7)
+ name = messages.StringField(8)
diff --git a/jetway/users/messages.py b/app/users/service_messages.py
similarity index 59%
rename from jetway/users/messages.py
rename to app/users/service_messages.py
index a91b3ff..5f30956 100644
--- a/jetway/users/messages.py
+++ b/app/users/service_messages.py
@@ -1,19 +1,7 @@
+from .messages import UserMessage
+from app.orgs import messages as org_messages
+from app.projects import messages as project_messages
from protorpc import messages
-from jetway.orgs import messages as org_messages
-from jetway.projects import messages as project_messages
-
-
-class UserMessage(messages.Message):
- ident = messages.StringField(1)
- nickname = messages.StringField(2)
- avatar_url = messages.StringField(3)
- email = messages.StringField(4)
- website_url = messages.StringField(5)
- description = messages.StringField(6)
- location = messages.StringField(7)
-
-
-###
class GetMeRequest(messages.Message):
@@ -21,16 +9,8 @@ class GetMeRequest(messages.Message):
class GetMeResponse(messages.Message):
- me = messages.MessageField(UserMessage, 1)
-
-
-class RegenerateGitPasswordRequest(messages.Message):
- pass
-
-
-class RegenerateGitPasswordResponse(messages.Message):
- me = messages.MessageField(UserMessage, 1)
- git_password = messages.StringField(2)
+ me = messages.MessageField(UserMessage, 1) # TODO: Deprecate "me".
+ user = messages.MessageField(UserMessage, 2)
class SignInRequest(messages.Message):
@@ -50,11 +30,13 @@ class SignOutResponse(messages.Message):
class UpdateMeRequest(messages.Message):
- me = messages.MessageField(UserMessage, 1)
+ me = messages.MessageField(UserMessage, 1) # TODO: Deprecate "me".
+ user = messages.MessageField(UserMessage, 2)
class UpdateMeResponse(messages.Message):
- me = messages.MessageField(UserMessage, 1)
+ me = messages.MessageField(UserMessage, 1) # TODO: Deprecate "me".
+ user = messages.MessageField(UserMessage, 2)
class SearchOrgsRequest(messages.Message):
diff --git a/jetway/users/services.py b/app/users/services.py
similarity index 54%
rename from jetway/users/services.py
rename to app/users/services.py
index f4fffdd..28a2f17 100644
--- a/jetway/users/services.py
+++ b/app/users/services.py
@@ -1,62 +1,65 @@
-from jetway import api
-from jetway.users import messages
-from jetway.owners import owners
-from jetway.projects import projects
-from jetway.users import users
-from jetway.projects import watcher_messages
+from . import service_messages
+from app import api
+from app.owners import owners
+from app.projects import projects
+from app.projects import watcher_messages
+from app.users import messages
+from app.users import users
from protorpc import remote
class MeService(api.Service):
- @remote.method(messages.GetMeRequest,
- messages.GetMeResponse)
+ @remote.method(service_messages.GetMeRequest,
+ service_messages.GetMeResponse)
@api.me_required
def get(self, request):
- resp = messages.GetMeResponse()
+ resp = service_messages.GetMeResponse()
resp.me = self.me.to_me_message()
+ resp.user = resp.me
return resp
- @remote.method(messages.SignInRequest,
- messages.SignInResponse)
+ @remote.method(service_messages.SignInRequest,
+ service_messages.SignInResponse)
def sign_in(self, request):
- resp = messages.SignInResponse()
+ resp = service_messages.SignInResponse()
return resp
- @remote.method(messages.SignOutRequest,
- messages.SignOutResponse)
+ @remote.method(service_messages.SignOutRequest,
+ service_messages.SignOutResponse)
@api.me_required
def sign_out(self, request):
- resp = messages.SignOutResponse()
+ resp = service_messages.SignOutResponse()
return resp
- @remote.method(messages.UpdateMeRequest,
- messages.UpdateMeResponse)
+ @remote.method(service_messages.UpdateMeRequest,
+ service_messages.UpdateMeResponse)
@api.me_required
def update(self, request):
try:
- self.me.update(request.me)
+ self.me.update(request.user)
except users.UserExistsError as e:
raise api.ConflictError(str(e))
- resp = messages.UpdateMeResponse()
+ resp = service_messages.UpdateMeResponse()
resp.me = self.me.to_me_message()
+ resp.user = resp.me
return resp
- @remote.method(messages.SearchProjectsRequest,
- messages.SearchProjectsResponse)
+ @remote.method(service_messages.SearchProjectsRequest,
+ service_messages.SearchProjectsResponse)
@api.me_required
def search_projects(self, request):
results = self.me.search_projects()
- resp = messages.SearchProjectsResponse()
+ resp = service_messages.SearchProjectsResponse()
resp.projects = [project.to_message() for project in results]
return resp
- @remote.method(messages.SearchOrgsRequest,
- messages.SearchOrgsResponse)
+ @remote.method(service_messages.SearchOrgsRequest,
+ service_messages.SearchOrgsResponse)
@api.me_required
def search_orgs(self, request):
results = self.me.search_orgs()
- resp = messages.SearchOrgsResponse()
+ resp = service_messages.SearchOrgsResponse()
resp.orgs = [org.to_message() for org in results]
return resp
@@ -70,17 +73,6 @@ def search_watchers(self, request):
return resp
- @remote.method(messages.RegenerateGitPasswordRequest,
- messages.RegenerateGitPasswordResponse)
- @api.me_required
- def regenerate_git_password(self, request):
- git_password = self.me.regenerate_git_password()
- resp = messages.RegenerateGitPasswordResponse()
- resp.me = self.me.to_me_message()
- resp.git_password = git_password
- return resp
-
-
class UserService(api.Service):
def _get_project(self, request):
@@ -93,20 +85,20 @@ def _get_project(self, request):
projects.ProjectDoesNotExistError) as e:
raise api.NotFoundError(str(e))
- @remote.method(messages.SearchOrgsRequest,
- messages.SearchOrgsResponse)
+ @remote.method(service_messages.SearchOrgsRequest,
+ service_messages.SearchOrgsResponse)
def search_orgs(self, request):
user = users.User.get(request.user.nickname)
results = user.search_orgs()
- resp = messages.SearchOrgsResponse()
+ resp = service_messages.SearchOrgsResponse()
resp.orgs = [org.to_message() for org in results]
return resp
- @remote.method(messages.SearchRequest,
- messages.SearchResponse)
+ @remote.method(service_messages.SearchRequest,
+ service_messages.SearchResponse)
def search(self, request):
project = self._get_project(request)
results = project.search_users()
- resp = messages.SearchResponse()
+ resp = service_messages.SearchResponse()
resp.users = [user.to_message() for user in results]
return resp
diff --git a/jetway/users/users.py b/app/users/users.py
similarity index 71%
rename from jetway/users/users.py
rename to app/users/users.py
index d1de4a8..9983336 100644
--- a/jetway/users/users.py
+++ b/app/users/users.py
@@ -1,11 +1,10 @@
-import random
from google.appengine.ext import ndb
-from jetway.avatars import avatars
-from jetway.files import files
-from jetway.teams import teams
-from jetway.users import messages
+from app.avatars import avatars
+from app.files import files
+from app.users import messages
from webapp2_extras import security
from webapp2_extras.appengine.auth import models
+import random
class Error(Exception):
@@ -26,6 +25,11 @@ class UserExistsError(Error):
class BaseUser(models.User):
email = ndb.StringProperty()
+ name = ndb.StringProperty()
+
+ @property
+ def domain(self):
+ return self.email.split('@')[-1]
def user_id(self):
# Provides compatibility with oauth2client.
@@ -33,10 +37,22 @@ def user_id(self):
@classmethod
def get_by_ident(cls, ident):
- user = cls.get_by_id(int(ident))
- if user is None:
- raise UserDoesNotExistError()
- return user
+ key = cls._key_from_ident(ident)
+ ent = key.get()
+ if ent is None:
+ raise UserDoesNotExistError('{} does not exist.'.format(ident))
+ if type(ent) != cls:
+ text = 'Retrieved model of type {}, expected {}.'
+ raise ModelKindError(text.format(type(ent), cls))
+ return ent
+
+ @classmethod
+ def _key_from_ident(cls, ident):
+ try:
+ return ndb.Key(urlsafe=ident)
+ # except (TypeError, ProtocolBufferDecodeError):
+ except:
+ return ndb.Key(cls, ident)
@classmethod
def get_by_email(cls, email):
@@ -82,7 +98,6 @@ def create_unique_username(cls, email):
class User(BaseUser):
-
nickname = ndb.StringProperty()
description = ndb.StringProperty()
location = ndb.StringProperty()
@@ -108,23 +123,27 @@ def get(cls, nickname):
query = cls.query()
query = query.filter(cls.nickname == nickname)
user = query.get()
+ if user is None:
+ user = cls.get_by_email(nickname)
if user is None:
raise UserDoesNotExistError('User "{}" not found.'.format(nickname))
return user
@property
def ident(self):
- return str(self.key.id())
+ return self.key.urlsafe()
def to_message(self):
message = messages.UserMessage()
if self.nickname:
message.nickname = self.nickname
+ message.email = self.email
message.ident = self.ident
message.avatar_url = self.avatar_url
message.description = self.description
- message.location = self.description
+ message.location = self.location
message.website_url = self.website_url
+ message.name = self.name
return message
def to_me_message(self):
@@ -175,7 +194,7 @@ def update(self, message):
raise UserExistsError('Nickname already in use.')
except UserDoesNotExistError:
pass
- self.email = message.email
+ self.name = message.name
self.nickname = message.nickname
self.description = message.description
self.location = message.location
@@ -183,40 +202,44 @@ def update(self, message):
self.put()
def search_teams(self):
- query = teams.Team.query()
- query = query.filter(teams.Team.user_keys == self.key)
+ from app.groups import groups
+ query = groups.Group.query()
+ query = query.filter(groups.Group.project_keys != None)
+ query = query.filter(groups.Group.memberships.user_key == self.key)
return query.fetch()
def search_orgs(self):
- team_ents = self.search_teams()
- org_keys = list(set([team.owner_key for team in team_ents
- if team.kind != teams.messages.Kind.PROJECT_OWNERS]))
- return filter(None, ndb.get_multi(org_keys))
+ from app.groups import groups
+ query = groups.Group.query()
+ query = query.filter(groups.Group.org_keys != None)
+ query = query.filter(groups.Group.memberships.user_key == self.key)
+ results = query.fetch()
+ org_keys = []
+ for result in results:
+ for org_key in result.org_keys:
+ org_keys.append(org_key)
+ from app.orgs import orgs
+ org_ents = orgs.Org.search(owner=self) or []
+ org_ents += ndb.get_multi(list(set(org_keys)))
+ org_ents = sorted(org_ents, key=lambda org: org.nickname)
+ return org_ents
def search_projects(self):
- team_ents = self.search_teams()
+ group_ents = self.search_teams()
project_keys = []
- for team in team_ents:
- project_keys += team.project_keys
- team_projects = ndb.get_multi(list(set(project_keys)))
- from jetway.projects import projects
+ for group in group_ents:
+ if group.project_key:
+ for project_key in group.project_keys:
+ project_keys.append(project_key)
+ group_projects = ndb.get_multi(list(set(project_keys)))
+ from app.projects import projects
user_projects = projects.Project.search(owner=self)
- results = filter(None, team_projects)
+ org_ents = self.search_orgs()
+ if org_ents:
+ user_projects += projects.Project.search(owner=org_ents)
+ results = filter(None, group_projects)
for project in user_projects:
if project not in results:
results.append(project)
results = sorted(results, key=lambda project: project.nickname)
return results
-
- def regenerate_git_password(self):
- git_password = security.generate_random_string(length=20)
- hashed_password = security.generate_password_hash(git_password)
- self.hashed_git_password = hashed_password
- self.put()
- return git_password
-
- def check_hashed_git_password(self, git_password):
- matched = security.check_password_hash(git_password, self.hashed_git_password)
- if matched is not True:
- raise BadGitPasswordError()
- return True
diff --git a/app/utils/__init__.py b/app/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/jetway/utils/gcs.py b/app/utils/gcs.py
similarity index 100%
rename from jetway/utils/gcs.py
rename to app/utils/gcs.py
diff --git a/appengine_config.py b/appengine_config.py
index f0c40a9..02105b3 100644
--- a/appengine_config.py
+++ b/appengine_config.py
@@ -7,6 +7,9 @@
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib'))
mimetypes.add_type('image/svg+xml', '.svg')
+mimetypes.add_type('font/opentype', '.otf')
+mimetypes.add_type('font/ttf', '.ttf')
+mimetypes.add_type('font/woff', '.woff')
if 'JETWAY_CONFIG' in os.environ:
_config_path = os.getenv('JETWAY_CONFIG')
@@ -22,7 +25,7 @@
else:
DOMAIN_ACCESS_USERS = None
-if os.environ.get('TESTING'):
+if os.environ.get('CI'):
service_account_key = json.load(open('testing/service_account_key.json'))
client_secrets_path = os.path.abspath('testing/client_secrets.json')
client_secrets = json.load(open(client_secrets_path))
@@ -41,22 +44,30 @@
ALLOWED_USER_DOMAINS = jetway_config.get('options', {}).get('allowed_user_domains', None)
DEFAULT_USER_DOMAINS = jetway_config.get('options', {}).get('default_user_domains', None)
+DEFAULT_DOMAIN = 'google.com'
+
REQUIRE_HTTPS_FOR_PREVIEWS = jetway_config.get('require_https', {}).get('preview_domain', False)
+HTTPS_PROXY_ENABLED_FOR_PREVIEWS = jetway_config.get('require_https', {}).get('behind_proxy', False)
+
REQUIRE_HTTPS_FOR_APP = jetway_config.get('require_https', {}).get('app_domain', False)
GCS_SERVICE_ACCOUNT_EMAIL = service_account_key['client_email']
-_appid = os.getenv('APPLICATION_ID').replace('s~', '')
-_sender_name = 'WebReview'
-_sender_address = 'noreply@{}.appspotmail.com'.format(_appid)
-EMAIL_SENDER = '{} <{}>'.format(_sender_name, _sender_address)
-
IS_DEV_SERVER = os.getenv('SERVER_SOFTWARE', '').startswith('Dev')
+if IS_DEV_SERVER:
+ _appid = os.getenv('APPLICATION_ID').split('~')[-1]
+else:
+ _appid = 'webreview-local-dev'
+
+EMAIL_NAME = 'Web Review'
+EMAIL_ADDRESS = 'noreply@{}.appspotmail.com'.format(_appid)
+EMAIL_SENDER = '{} <{}>'.format(EMAIL_NAME, EMAIL_ADDRESS)
+
def get_gcs_bucket():
if IS_DEV_SERVER:
- return 'grow-prod.appspot.com'
+ return 'grow-webreview-dev'
return app_identity.get_default_gcs_bucket_name()
if os.environ.get('TESTING'):
@@ -67,9 +78,13 @@ def get_gcs_bucket():
PREVIEW_HOSTNAME = jetway_config['urls']['hostname']['prod']
BUILDBOT_API_KEY = jetway_config['app'].get('webreview_buildbot_api_key')
+BUILDBOT_URL = jetway_config['app'].get('webreview_buildbot_url')
+BUILDBOT_PASSWORD = jetway_config['app'].get('webreview_buildbot_password')
+BUILDBOT_USERNAME = jetway_config['app'].get('webreview_buildbot_username')
BUILDBOT_SERVICE_ACCOUNT = jetway_config['app'].get('webreview_buildbot_service_account')
-BASE_URL = '{}://{}'.format(os.getenv('wsgi.url_scheme'), os.getenv('SERVER_NAME'))
+APP_HOSTNAME = os.getenv('DEFAULT_VERSION_HOSTNAME', os.getenv('SERVER_NAME'))
+BASE_URL = '{}://{}'.format(os.getenv('wsgi.url_scheme'), APP_HOSTNAME)
if IS_DEV_SERVER:
BASE_URL += ':{}'.format(os.getenv('SERVER_PORT'))
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 8bd3819..0000000
--- a/bower.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "name": "jetway",
- "private": true,
- "dependencies": {
- "angular": "1.2.8",
- "angular-bootstrap": "*",
- "angular-ui-router": "*",
- "angular-xeditable": "*",
- "bootstrap": "3.2.0"
- },
- "resolutions": {
- "angular": ">=1.3.0"
- }
-}
diff --git a/config/jetway.yaml.example b/config/jetway.yaml.example
old mode 100755
new mode 100644
index 6250e77..7e004a3
--- a/config/jetway.yaml.example
+++ b/config/jetway.yaml.example
@@ -12,6 +12,9 @@ app:
# service_account_key_file: "example-123456789.json"
webreview_buildbot_api_key: "xxx-xxx-xxx"
webreview_buildbot_service_account: "xxx-xxx@developer.gserviceaccount.com"
+ webreview_buildbot_username: "admin"
+ webreview_buildbot_password: "admin"
+ webreview_buildbot_url: "http://localhost:5000"
urls:
# Where staging builds are served for previews.
diff --git a/config/webreview.yaml b/config/webreview.yaml
new file mode 100755
index 0000000..38d8d2f
--- /dev/null
+++ b/config/webreview.yaml
@@ -0,0 +1,16 @@
+options:
+ title: Web Review
+
+app:
+ client_secrets_file: "client_secret_696801287973-6usfr61a10jr8k7o16pebmqvmajgq3dd.apps.googleusercontent.com.json"
+ service_account_key_file: betawebreview-349110b1b659.json
+ api_key: "xxx"
+
+urls:
+ hostname:
+ prod: betawebreview.appspot.com
+ dev: webreview.dev.example.com
+
+require_https:
+ preview_domain: yes
+ app_domain: yes
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index 16e51c3..0000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var autoprefixer = require('gulp-autoprefixer');
-var concat = require('gulp-concat');
-var es = require('event-stream');
-var gulp = require('gulp');
-var plumber = require('gulp-plumber');
-var sass = require('gulp-sass');
-var stylish = require('jshint-stylish');
-var uglify = require('gulp-uglify');
-
-
-var Path = {
- CSS_OUT_DIR: './dist/css/',
- CSS_SOURCES: './jetway/frontend/static/sass/*',
- JS_OUT_DIR: './dist/js/',
- JS_SOURCES: './jetway/frontend/static/js/*.js',
-};
-
-
-gulp.task('sass', function() {
- var appFiles = gulp.src('./jetway/frontend/static/sass/*.scss')
- .pipe(plumber())
- .pipe(sass({
- outputStyle: 'compressed'
- }))
- var vendorFiles = gulp.src([
- './bower_components/bootstrap/dist/css/bootstrap.min.css',
- ])
- return es.concat(vendorFiles, appFiles)
- .pipe(concat('main.min.css'))
- .pipe(autoprefixer())
- .pipe(gulp.dest(Path.CSS_OUT_DIR));
-});
-
-
-gulp.task('minify', function(){
- return gulp.src([
- './bower_components/angular/angular.min.js',
- './bower_components/angular-bootstrap/ui-bootstrap.min.js',
- './bower_components/angular-ui-router/release/angular-ui-router.min.js',
- './bower_components/angular-xeditable/dist/js/xeditable.js',
- './jetway/frontend/static/js/controllers.js',
- Path.JS_SOURCES,
- ])
- .pipe(concat('main.min.js'))
- .pipe(gulp.dest(Path.JS_OUT_DIR));
-});
-
-
-gulp.task('watch', function() {
- gulp.watch([Path.JS_SOURCES], ['minify']);
- gulp.watch([Path.CSS_SOURCES], ['sass']);
-});
-
-
-gulp.task('build', ['sass', 'minify']);
-gulp.task('default', ['sass', 'minify', 'watch']);
diff --git a/index.yaml b/index.yaml
index e13a19f..a326039 100644
--- a/index.yaml
+++ b/index.yaml
@@ -10,6 +10,14 @@ indexes:
# automatically uploaded to the admin console when you next deploy
# your application using appcfg.py.
+- kind: Fileset
+ properties:
+ - name: commit.sha
+ - name: name
+ - name: project_key
+ - name: modified
+ direction: desc
+
- kind: Fileset
properties:
- name: commit.sha
@@ -23,12 +31,39 @@ indexes:
- name: modified
direction: desc
+- kind: Fileset
+ properties:
+ - name: name
+ - name: project_key
+ - name: modified
+ direction: desc
+
- kind: Fileset
properties:
- name: project_key
- name: modified
direction: desc
+- kind: Group
+ properties:
+ - name: memberships.user_key
+ - name: org_key
+
+- kind: Group
+ properties:
+ - name: memberships.user_key
+ - name: org_keys
+
+- kind: Group
+ properties:
+ - name: memberships.user_key
+ - name: project_key
+
+- kind: Group
+ properties:
+ - name: memberships.user_key
+ - name: project_keys
+
- kind: Project
properties:
- name: owner_key
diff --git a/jetway/builds/build_tasks.py b/jetway/builds/build_tasks.py
deleted file mode 100644
index 40208b9..0000000
--- a/jetway/builds/build_tasks.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from google.appengine.ext import ndb
-from . import messages
-
-"""
-buildbot polls webreview
-webreview returns list of projects to register, unregister, and update
-buildbot registers and unregisters projects
-buildbot updates webreview
-"""
-
-
-class BuildTask(ndb.Model):
- project_key = ndb.KeyProperty()
- action = ndb.MessageProperty(messages.ActionMessage)
-
- @classmethod
- def create(cls, project, action):
- build_task = cls(project_key=project.key, action=action)
- build_task.put()
- return build_task
-
- def delete(cls):
- pass
-
- @classmethod
- def search(cls):
- pass
-
- def register(cls):
- pass
-
- def unregister(cls):
- pass
-
- def to_message(self):
- message = messages.BuildTaskMessage()
- message.project = self.project.to_message()
- message.action = self.action
- return message
diff --git a/jetway/builds/messages.py b/jetway/builds/messages.py
deleted file mode 100644
index 2025900..0000000
--- a/jetway/builds/messages.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from protorpc import messages
-from ..projects import messages as project_messages
-
-
-class ActionMessage(messages.Message):
- UNREGISTER = 0
- REGISTER = 1
-
-
-class BuildMessage(messages.Message):
- project = messages.MessageField(project_messages.ProjectMessage, 1)
- action = messages.EnumField(ActionMessage)
diff --git a/jetway/frontend/static/html/home.html b/jetway/frontend/static/html/home.html
deleted file mode 100644
index ccff46c..0000000
--- a/jetway/frontend/static/html/home.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Sites
-
diff --git a/jetway/frontend/static/html/new.html b/jetway/frontend/static/html/new.html
deleted file mode 100644
index 9c4b704..0000000
--- a/jetway/frontend/static/html/new.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
diff --git a/jetway/frontend/static/html/orgs.new.html b/jetway/frontend/static/html/orgs.new.html
deleted file mode 100644
index 3473296..0000000
--- a/jetway/frontend/static/html/orgs.new.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
- Create organization
-
-
-
-
Take control of your team's web site production workflow by using organizations.
-
Organizations let you:
-
- Control review and approval workflow for launches.
- Group projects together by functional area.
- Manage teams and control access.
- View activity streams for all your projects.
-
-
-
diff --git a/jetway/frontend/static/html/owner.html b/jetway/frontend/static/html/owner.html
deleted file mode 100644
index 52738e2..0000000
--- a/jetway/frontend/static/html/owner.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/jetway/frontend/static/html/project.builds.html b/jetway/frontend/static/html/project.builds.html
deleted file mode 100644
index 802cd22..0000000
--- a/jetway/frontend/static/html/project.builds.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
diff --git a/jetway/frontend/static/html/project.html b/jetway/frontend/static/html/project.html
deleted file mode 100644
index f5b80ae..0000000
--- a/jetway/frontend/static/html/project.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- Watch
-
-
- Unwatch
-
-
- {{watchers.length || 0}}
-
-
-
-
{{project.description}}
-
-
-
-Delete
-Transfer ownership
-Delete project
diff --git a/jetway/frontend/static/html/project.team.html b/jetway/frontend/static/html/project.team.html
deleted file mode 100644
index fdf6bf6..0000000
--- a/jetway/frontend/static/html/project.team.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
diff --git a/jetway/frontend/static/html/project.translations.html b/jetway/frontend/static/html/project.translations.html
deleted file mode 100644
index 23d454b..0000000
--- a/jetway/frontend/static/html/project.translations.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- Locale
- % translated
-
-
-
-
-
-
-
-
-
-
-
-
- {{watcher.user.nickname}}
-
-
-
diff --git a/jetway/frontend/static/html/projects.html b/jetway/frontend/static/html/projects.html
deleted file mode 100644
index da04bd5..0000000
--- a/jetway/frontend/static/html/projects.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/jetway/frontend/static/html/settings-new.html b/jetway/frontend/static/html/settings-new.html
deleted file mode 100644
index 90fb0df..0000000
--- a/jetway/frontend/static/html/settings-new.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/jetway/frontend/static/html/settings.accounts.html b/jetway/frontend/static/html/settings.accounts.html
deleted file mode 100644
index 85b6c33..0000000
--- a/jetway/frontend/static/html/settings.accounts.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
- Connected accounts (experimental)
- Coming soon.
-
-
-
- Delete Grow account (experimental)
- Obliterate your account from Grow. Projects you own must be transferred or deleted first. You can download your files on a project-by-project basis if you would like to keep your data.
-
Delete... (not yet available)
-
diff --git a/jetway/frontend/static/html/settings.html b/jetway/frontend/static/html/settings.html
deleted file mode 100644
index 04939f3..0000000
--- a/jetway/frontend/static/html/settings.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/jetway/frontend/static/html/settings.index.html b/jetway/frontend/static/html/settings.index.html
deleted file mode 100644
index 8bf2d1c..0000000
--- a/jetway/frontend/static/html/settings.index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
diff --git a/jetway/frontend/static/html/settings.referrals.html b/jetway/frontend/static/html/settings.referrals.html
deleted file mode 100644
index f3e8b27..0000000
--- a/jetway/frontend/static/html/settings.referrals.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
- Share a referral
- The ability to create and share referrals is in progress, and is coming soon!
-
-
-
-Email a referral
-
-Refer someone to Grow to gain karma points and project hosting credits. The more people that sign up under your referrals, the more free projects you'll get.
-
-
-
-
- {{error.error_message}}
-
-
-
-
-
-
-Your referrals
-
-Here's everyone you've referred. If a referral is unredeemed, you can remind the person or cancel the referral.
-
-
-
-
- Created
- Sent to
- Status
-
-
- {{referral.created|date:'mediumDate'}}
- {{referral.email}}
-
- {{referral.redeemed}}
-
-
-
-
diff --git a/jetway/frontend/static/images/badge.png b/jetway/frontend/static/images/badge.png
deleted file mode 100644
index 5196d8d..0000000
Binary files a/jetway/frontend/static/images/badge.png and /dev/null differ
diff --git a/jetway/frontend/static/js/app.js b/jetway/frontend/static/js/app.js
deleted file mode 100644
index fe2e7ab..0000000
--- a/jetway/frontend/static/js/app.js
+++ /dev/null
@@ -1,332 +0,0 @@
-var _prefix = '/_app/' + __config.ver;
-
-var app = angular.module('jetway', [
- 'ui.router',
- 'ui.bootstrap',
- 'jetwayFilters',
- 'xeditable'
-])
-
-.config(function($stateProvider, $urlRouterProvider, $locationProvider, $tooltipProvider) {
- $tooltipProvider.options({
- animation: false
- });
- $locationProvider.html5Mode(true);
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: _prefix + '/static/html/home.html',
- controller: HomeController
- })
- .state('new', {
- url: '/new?owner',
- controller: NewController,
- templateUrl: _prefix + '/static/html/new.html'
- })
- .state('orgs', {
- url: '/orgs',
- template: ''.format(self.ident)
-
- @classmethod
- def create(cls, owner, nickname, created_by, project=None,
- kind=messages.Kind.DEFAULT):
- letter = cls.get_letter_from_kind(kind)
- ident = project.ident if project else str(uuid.uuid4())[:10].replace('-', '')
- ident = '{}/{}'.format(letter, str(ident))
- key = ndb.Key('Team', ident)
- team = cls(
- key=key,
- owner_key=owner.key,
- created_by_key=created_by.key,
- nickname=nickname,
- kind=kind)
- if project:
- team.project_keys = [project.key]
- if kind != messages.Kind.DEFAULT:
- team.create_membership(created_by, role=messages.Role.ADMIN)
- return team
-
- @classmethod
- def get_letter_from_kind(cls, kind):
- if kind == messages.Kind.PROJECT_OWNERS:
- return 'p'
- elif kind == messages.Kind.ORG_OWNERS:
- return 'o'
- else:
- return 'd'
-
- @classmethod
- def get(cls, ident, kind):
- letter = cls.get_letter_from_kind(kind)
- ident = '{}/{}'.format(letter, ident)
- team = ndb.Key('Team', ident).get()
- if team is None:
- raise TeamDoesNotExistError('Team "{}" does not exist.'.format(ident))
- return team
-
- @classmethod
- def search(cls, owner=None, projects=None, users=None, kind=None):
- query = cls.query()
- if kind is not None:
- query = query.filter(cls.kind == kind)
- if owner is not None:
- query = query.filter(cls.owner_key == owner.key)
- if projects is not None:
- for project in projects:
- query = query.filter(cls.project_keys == project.key)
- if users is not None:
- for user in users:
- query = query.filter(cls.user_keys == user.key)
- return query.fetch()
-
- @property
- def owner(self):
- from jetway.owners import owners
- return owners.Owner.get_by_key(self.owner_key)
-
- @property
- def ident(self):
- return str(self.key.id()).split('/')[-1]
-
- def list_memberships(self):
- return TeamMembership.list(parent=self)
-
- @property
- def projects(self):
- return ndb.get_multi(self.project_keys)
-
- @property
- def letter(self):
- return Team.get_letter_from_kind(self.kind)
-
- @property
- def title(self):
- if self.kind == messages.Kind.ORG_OWNERS:
- return '{} owners'.format(self.owner.nickname)
- if self.kind == messages.Kind.PROJECT_OWNERS and self.projects:
- project = self.projects[0]
- return '{}/{} project team'.format(project.owner.nickname, project.nickname)
- return self.nickname
-
- def to_message(self):
- message = messages.TeamMessage()
- message.ident = self.ident
- message.title = self.title
- message.nickname = self.nickname
- message.projects = [project.to_message() for project in self.projects]
- message.description = self.description
- message.modified = self.modified
- message.memberships = [m.to_message() for m in self.memberships]
- message.title = self.title
- message.num_projects = len(self.projects)
- message.owner = self.owner.to_message()
- message.letter = self.letter
- message.role = self.role
- message.kind = self.kind
- return message
-
- def update(self, message):
- self.nickname = message.nickname
- self.description = message.description
- self.role = message.role
- self.put()
-
- def delete(self):
- self.key.delete()
-# mems = self.list_memberships()
-# keys = [mem.key for mem in mems]
-# keys.append(self.key)
-# ndb.delete_multi(keys)
-
- def add_project(self, project):
- if project.key in self.project_keys:
- raise ProjectConflictError('Project "{}" already exists in team.'.format(project))
- self.project_keys.append(project.key)
- self.put()
-
- def remove_project(self, project):
- try:
- self.project_keys.remove(project.key)
- except ValueError:
- raise ProjectConflictError('Project "{}" does not exist in team.'.format(project))
- self.put()
-
- def get_membership(self, user):
- for membership in self.memberships:
- if membership.user_key == user.key:
- return membership
-
- def create_membership(self, user, role=None, is_public=False):
-# if role is not None and self.kind != messages.Kind.PROJECT:
-# raise ValueError('Role cannot be set for non-project teams.')
- for membership in self.memberships:
- if membership.user_key == user.key:
- raise MembershipConflictError('Membership already exists.')
- membership = TeamMembership(user_key=user.key, role=role, is_public=is_public)
- self.memberships.append(membership)
- self.user_keys = [m.user_key for m in self.memberships]
- self.put()
-
- def delete_membership(self, user):
- # TODO: check for last remaining admin in project teams
- if self.kind == messages.Kind.ORG_OWNERS and len(self.memberships) == 1:
- raise MembershipConflictError('Cannot remove the last remaining user.')
- for i, membership in enumerate(self.memberships):
- if membership.user_key == user.key:
- del self.memberships[i]
- self.put()
- self.user_keys = [m.user_key for m in self.memberships]
- return
- raise MembershipConflictError('Membership does not exist.')
-
- def update_membership(self, user, role, review_required=False, is_public=False):
- for membership in self.memberships:
- if membership.user_key == user.key:
- membership.role = role
- membership.review_required = review_required
- membership.is_public = is_public
- self.put()
diff --git a/package.json b/package.json
deleted file mode 100644
index 28153ef..0000000
--- a/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "name": "jetway",
- "private": true,
- "devDependencies": {
- "bower": "*",
- "gulp": "*",
- "event-stream": "3.3.1",
- "gulp-autoprefixer": "^2.1.0",
- "gulp-sass": "^1.3.3",
- "gulp-concat": "*",
- "gulp-plumber": "^1.0.0",
- "gulp-uglify": "*",
- "jshint-stylish": "*",
- "run-sequence": "^1.0.2"
- }
-}
diff --git a/requirements.txt b/requirements.txt
index 5884e8e..612aa47 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,10 @@
+Babel==1.3
+pytz
+
GoogleAppEngineCloudStorageClient==1.9.5.0
google-api-python-client==1.3.1
httplib2
+requests
protorpc-standalone==0.9.1
pycrypto==2.6
@@ -22,8 +26,10 @@ uritemplate
docker-py
# Testing.
-NoseGAE==0.5.6
+NoseGAE==0.5.10
nose==1.3.1
rednose==0.4.1
coverage==3.7.1
gaenv==0.1.7
+mock==1.0.1
+WebTest==2.0.17
diff --git a/scripts/deploy b/scripts/deploy
index c4ea7eb..51911e7 100755
--- a/scripts/deploy
+++ b/scripts/deploy
@@ -1,19 +1,24 @@
-#!/bin/bash -e
+#!/bin/bash
+cd webreview-fe && ember build && cd ..
./scripts/test
if [ -d env ]; then
source env/bin/activate
if [ $2 ]; then
- gcloud preview app deploy \
+ gcloud app deploy \
+ -q \
+ --no-promote \
--project=$1 \
--version=$2 \
- app.grow-prod.yaml
+ app.yaml
elif [ $1 ]; then
- gcloud preview app deploy \
+ gcloud app deploy \
+ -q \
+ --no-promote \
--project=$1 \
--version=auto \
- app.grow-prod.yaml
+ app.yaml
else
echo "Usage: ./scripts/deploy "
exit 1
diff --git a/scripts/run b/scripts/run
index 0380bb6..0e2ec82 100755
--- a/scripts/run
+++ b/scripts/run
@@ -1,4 +1,4 @@
#!/bin/bash
-./node_modules/.bin/gulp \
- & dev_appserver.py --port=8088 --admin_port=8089 .
+#./node_modules/.bin/gulp \
+dev_appserver.py --port=8088 --admin_port=8089 .
diff --git a/scripts/setup b/scripts/setup
index fb4a726..365e67e 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -15,16 +15,9 @@ gaenv -h 2>&1> /dev/null || {
sudo pip install gaenv
}
-node --version 2>&1> /dev/null || {
- echo "node not installed. Install from: http://nodejs.org/"
- exit 1
-}
-
virtualenv env
source env/bin/activate
pip install --upgrade --allow-unverified PIL --allow-external PIL -r requirements.txt
-npm install
-./node_modules/.bin/bower install
gaenv --lib lib --no-import
deactivate
diff --git a/scripts/test b/scripts/test
index b3b8e73..281e7c9 100755
--- a/scripts/test
+++ b/scripts/test
@@ -12,8 +12,8 @@ if [ -d env ]; then
--cover-erase \
--cover-html \
--cover-html-dir=htmlcov \
- --cover-package=jetway \
- jetway/
+ --cover-package=app \
+ app/
deactivate
else
echo 'Run ./scripts/setup first.'
diff --git a/webreview-fe b/webreview-fe
new file mode 160000
index 0000000..d2b9303
--- /dev/null
+++ b/webreview-fe
@@ -0,0 +1 @@
+Subproject commit d2b9303af60b48b70456b6e4f0c96b5402df9b2b