Start on new org view

endpoints/api/organization.py

@@ -24,16 +24,20 @@ logger = logging.getLogger(__name__)
 
 
 def org_view(o, teams):
-  admin_org = AdministerOrganizationPermission(o.username)
-  is_admin = admin_org.can()
+  is_admin = AdministerOrganizationPermission(o.username).can()
+  is_member = OrganizationMemberPermission(o.username).can()
+
   view = {
     'name': o.username,
     'email': o.email if is_admin else '',
     'avatar': avatar.compute_hash(o.email, name=o.username),
-    'teams': {t.name : team_view(o.username, t) for t in teams},
-    'is_admin': is_admin
+    'is_admin': is_admin,
+    'is_member': is_member
   }
 
+  if teams is not None:
+    view['teams'] = {t.name : team_view(o.username, t) for t in teams}
+
   if is_admin:
     view['invoice_email'] = o.invoice_email
 
@@ -129,17 +133,17 @@ class Organization(ApiResource):
   @nickname('getOrganization')
   def get(self, orgname):
     """ Get the details for the specified organization """
-    permission = OrganizationMemberPermission(orgname)
-    if permission.can():
-      try:
-        org = model.get_organization(orgname)
-      except model.InvalidOrganizationException:
-        raise NotFound()
+    try:
+      org = model.get_organization(orgname)
+    except model.InvalidOrganizationException:
+      raise NotFound()
 
+    teams = None
+    if OrganizationMemberPermission(orgname).can():
       teams = model.get_teams_within_org(org)
-      return org_view(org, teams)
 
-    raise Unauthorized()
+    return org_view(org, teams)
+
 
   @require_scope(scopes.ORG_ADMIN)
   @nickname('changeOrganizationDetails')
@@ -218,7 +222,7 @@ class OrgPrivateRepositories(ApiResource):
 @path_param('orgname', 'The name of the organization')
 class OrgnaizationMemberList(ApiResource):
   """ Resource for listing the members of an organization. """
- 
+
   @require_scope(scopes.ORG_ADMIN)
   @nickname('getOrganizationMembers')
   def get(self, orgname):