- Add API for returning the user’s used private repos and available private repos

- Fix the same API for orgs
- Change the chosen plan in the create repo view to use the API
- Add an account indicator if the user is over their plan

static/js/app.js

@@ -1493,10 +1493,26 @@ quayApp.directive('headerBar', function () {
     restrict: 'C',
     scope: {
     },
-    controller: function($scope, $element, $location, UserService, Restangular) {
-      $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-        $scope.user = currentUser;
-      }, true);
+    controller: function($scope, $element, $location, UserService, PlanService, Restangular) {
+      $scope.overPlan = false;
+
+      var checkOverPlan = function() {
+        if ($scope.user.anonymous) {
+          $scope.overPlan = false;
+          return;
+        }
+
+        var checkPrivate = Restangular.one('user/private');
+        checkPrivate.customGET().then(function(resp) {
+          $scope.overPlan = resp.privateCount >= resp.reposAllowed;
+        });
+      };
+      
+      // Monitor any user changes and place the current user into the scope.
+      UserService.updateUserIn($scope, checkOverPlan);
+     
+      // Monitor any plan changes.
+      PlanService.registerListener(this, checkOverPlan);
         
       $scope.signout = function() {
         var signoutPost = Restangular.one('signout');
@@ -1511,7 +1527,7 @@ quayApp.directive('headerBar', function () {
             return "_self";
         }
         return "";
-      };
+      };     
     }
   };
   return directiveDefinitionObject;

static/js/controllers.js

@@ -810,23 +810,34 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
     
     var isUserNamespace = (namespace == $scope.user.username);
 
+    $scope.checkingPlan = true;
     $scope.planRequired = null;
     $scope.isUserNamespace = isUserNamespace;
 
     if (isUserNamespace) {
       // Load the user's subscription information in case they want to create a private
       // repository.
-      PlanService.getSubscription(null, subscribedToPlan, function() {
-        PlanService.getMinimumPlan(1, false, function(minimum) { $scope.planRequired = minimum; });
+      var checkPrivateAllowed = Restangular.one('user/private');
+      checkPrivateAllowed.get().then(function(resp) {
+        if (resp.privateCount + 1 > resp.reposAllowed) {
+          PlanService.getMinimumPlan(resp.privateCount + 1, false, function(minimum) {
+            $scope.planRequired = minimum;
+          });
+        }
+
+        $scope.checkingPlan = false;
+      }, function() {
+        $scope.planRequired = {};
+        $scope.checkingPlan = false;
       });
     } else {
-      $scope.planRequired = null;
-
       var checkPrivateAllowed = Restangular.one('organization/' + namespace  + '/private');
       checkPrivateAllowed.get().then(function(resp) {
         $scope.planRequired = resp.privateAllowed ? null : {};
+        $scope.checkingPlan = false;
       }, function() {
         $scope.planRequired = {};
+        $scope.checkingPlan = false;
       });
 
       // Auto-set to private repo.