Better upwell messaging for everyone and show the upsell for organization admins

endpoints/api.py

@@ -183,7 +183,7 @@ def get_logged_in_user():
 @api.route('/user/private', methods=['GET'])
 @api_login_required
 @internal_api_call
-def get_user_private_count():
+def get_user_private_allowed():
   user = current_user.db_user()
   private_repos = model.get_private_repo_count(user.username)
   repos_allowed = 0
@@ -197,7 +197,7 @@ def get_user_private_count():
     
   return jsonify({
     'privateCount': private_repos,
-    'reposAllowed': repos_allowed
+    'privateAllowed': (private_repos < repos_allowed)
   })
 
 
@@ -729,12 +729,16 @@ def get_organization_member(orgname, membername):
 @api.route('/organization/<orgname>/private', methods=['GET'])
 @api_login_required
 @internal_api_call
+@org_api_call('get_user_private_allowed')
 def get_organization_private_allowed(orgname):
   permission = CreateRepositoryPermission(orgname)
   if permission.can():
     organization = model.get_organization(orgname)
-
     private_repos = model.get_private_repo_count(organization.username)
+    data = {
+      'privateAllowed': False
+    }
+
     if organization.stripe_id:
       cus = stripe.Customer.retrieve(organization.stripe_id)
       if cus.subscription:
@@ -743,13 +747,13 @@ def get_organization_private_allowed(orgname):
         if plan:
           repos_allowed = plan['privateRepos']
               
-        return jsonify({
-          'privateAllowed': (private_repos < repos_allowed)
-        })
+        data['privateAllowed'] = (private_repos < repos_allowed)
+
       
-    return jsonify({
-      'privateAllowed': False
-    })
+    if AdministerOrganizationPermission(orgname).can():
+      data['privateCount'] = private_repos
+      
+    return jsonify(data)
 
   abort(403)