Start conversion of the user admin/view

static/js/app.js

@@ -126,7 +126,10 @@ quayApp.config(['$routeProvider', '$locationProvider', 'pages', function($routeP
     // Organization View Application
     .route('/organization/:orgname/application/:clientid', 'manage-application')
 
-    // User Admin
+    // View User
+    .route('/user/:username', 'user-view')
+
+    // DEPRECATED: User Admin
     .route('/user/', 'user-admin')
 
     // Sign In

static/js/directives/ui/authorized-apps-manager.js

@@ -0,0 +1,41 @@
+/**
+ * Element for managing the applications authorized by a user.
+ */
+angular.module('quay').directive('authorizedAppsManager', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/authorized-apps-manager.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'user': '=user',
+      'isEnabled': '=isEnabled'
+    },
+    controller: function($scope, $element, ApiService) {
+      $scope.$watch('isEnabled', function(enabled) {
+        if (!enabled) { return; }
+        loadAuthedApps();
+      });
+
+      var loadAuthedApps = function() {
+        if ($scope.authorizedAppsResource) { return; }
+
+        $scope.authorizedAppsResource = ApiService.listUserAuthorizationsAsResource().get(function(resp) {
+          $scope.authorizedApps = resp['authorizations'];
+        });
+      };
+
+      $scope.deleteAccess = function(accessTokenInfo) {
+        var params = {
+          'access_token_uuid': accessTokenInfo['uuid']
+        };
+
+        ApiService.deleteUserAuthorization(null, params).then(function(resp) {
+          $scope.authorizedApps.splice($scope.authorizedApps.indexOf(accessTokenInfo), 1);
+        }, ApiService.errorDisplay('Could not revoke authorization'));
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});

static/js/directives/ui/convert-user-to-org.js

@@ -0,0 +1,62 @@
+/**
+ * Displays a panel for converting the current user to an organization.
+ */
+angular.module('quay').directive('convertUserToOrg', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/convert-user-to-org.html',
+    replace: false,
+    transclude: true,
+    restrict: 'C',
+    scope: {
+      'user': '=user'
+    },
+    controller: function($scope, $element, Features, PlanService, Config) {
+      $scope.convertStep = 0;
+
+      $scope.showConvertForm = function() {
+        if (Features.BILLING) {
+          PlanService.getMatchingBusinessPlan(function(plan) {
+            $scope.org.plan = plan;
+          });
+
+          PlanService.getPlans(function(plans) {
+            $scope.orgPlans = plans;
+          });
+        }
+
+        $scope.convertStep = 1;
+      };
+
+      $scope.convertToOrg = function() {
+        $('#reallyconvertModal').modal({});
+      };
+
+      $scope.reallyConvert = function() {
+        if (Config.AUTHENTICATION_TYPE != 'Database') { return; }
+
+        $scope.loading = true;
+
+        var data = {
+          'adminUser': $scope.org.adminUser,
+          'adminPassword': $scope.org.adminPassword,
+          'plan': $scope.org.plan ? $scope.org.plan.stripeId : ''
+        };
+
+        ApiService.convertUserToOrganization(data).then(function(resp) {
+          CookieService.putPermanent('quay.namespace', $scope.cuser.username);
+          UserService.load();
+          $location.path('/');
+        }, function(resp) {
+          $scope.loading = false;
+          if (resp.data.reason == 'invaliduser') {
+            $('#invalidadminModal').modal({});
+          } else {
+            $('#cannotconvertModal').modal({});
+          }
+        });
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});

static/js/directives/ui/external-login-button.js

@@ -11,6 +11,7 @@ angular.module('quay').directive('externalLoginButton', function () {
     scope: {
       'signInStarted': '&signInStarted',
       'redirectUrl': '=redirectUrl',
+      'isLink': '=isLink',
       'provider': '@provider',
       'action': '@action'
     },

static/js/directives/ui/external-logins-manager.js

@@ -0,0 +1,55 @@
+/**
+ * Element for managing the applications authorized by a user.
+ */
+angular.module('quay').directive('externalLoginsManager', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/external-logins-manager.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'user': '=user',
+    },
+    controller: function($scope, $element, ApiService, UserService, Features, Config, KeyService) {
+      $scope.Features = Features;
+      $scope.Config = Config;
+      $scope.KeyService = KeyService;
+
+      UserService.updateUserIn($scope, function(user) {
+        $scope.cuser = jQuery.extend({}, user);
+
+        if ($scope.cuser.logins) {
+          for (var i = 0; i < $scope.cuser.logins.length; i++) {
+            var login = $scope.cuser.logins[i];
+            login.metadata = login.metadata || {};
+
+            if (login.service == 'github') {
+              $scope.hasGithubLogin = true;
+              $scope.githubLogin = login.metadata['service_username'];
+              $scope.githubEndpoint = KeyService['githubEndpoint'];
+            }
+
+            if (login.service == 'google') {
+              $scope.hasGoogleLogin = true;
+              $scope.googleLogin = login.metadata['service_username'];
+            }
+          }
+        }
+      });
+
+      $scope.detachExternalLogin = function(kind) {
+        var params = {
+          'servicename': kind
+        };
+
+        ApiService.detachExternalLogin(null, params).then(function() {
+          $scope.hasGithubLogin = false;
+          $scope.hasGoogleLogin = false;
+          UserService.load();
+        }, ApiService.errorDisplay('Count not detach service'));
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});

static/js/pages/user-admin.js

@@ -1,6 +1,6 @@
 (function() {
   /**
-   * User admin/settings page.
+   * DEPRECATED: User admin/settings page.
    */
   angular.module('quayPages').config(['pages', function(pages) {
     pages.create('user-admin', 'user-admin.html', UserAdminCtrl, {
@@ -160,11 +160,7 @@
         $scope.updatingUser = false;
         $scope.changeEmailSent = true;
         $scope.sentEmail = $scope.cuser.email;
-
-        // Reset the form.
         delete $scope.cuser['email'];
-
-        $scope.changeEmailForm.$setPristine();
       }, function(result) {
         $scope.updatingUser = false;
         UIService.showFormError('#changeEmailForm', result);

static/js/pages/user-view.js

@@ -0,0 +1,113 @@
+(function() {
+  /**
+   * Page that displays details about an user.
+   */
+  angular.module('quayPages').config(['pages', function(pages) {
+    pages.create('user-view', 'user-view.html', UserViewCtrl, {
+      'newLayout': true,
+      'title': 'User {{ user.username }}',
+      'description': 'User {{ user.username }}'
+    }, ['layout'])
+  }]);
+
+  function UserViewCtrl($scope, $routeParams, $timeout, ApiService, UserService, UIService, AvatarService) {
+    var username = $routeParams.username;
+
+    $scope.showInvoicesCounter = 0;
+    $scope.showAppsCounter = 0;
+    $scope.changeEmailInfo = {};
+    $scope.changePasswordInfo = {};
+
+    UserService.updateUserIn($scope);
+
+    var loadRepositories = function() {
+      var options = {
+        'public': false,
+        'private': true,
+        'sort': true,
+        'namespace': username,
+      };
+
+      $scope.repositoriesResource = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
+        return resp.repositories;
+      });
+    };
+
+    var loadUser = function() {
+      $scope.userResource = ApiService.getUserInformationAsResource({'username': username}).get(function(user) {
+        $scope.user = user;
+
+        // Load the repositories.
+        $timeout(function() {
+          loadRepositories();
+        }, 10);
+      });
+    };
+
+    // Load the user.
+    loadUser();
+
+    $scope.showInvoices = function() {
+      $scope.showInvoicesCounter++;
+    };
+
+    $scope.showApplications = function() {
+      $scope.showAppsCounter++;
+    };
+
+    $scope.changePassword = function() {
+      UIService.hidePopover('#changePasswordForm');
+      $scope.changePasswordInfo.state = 'changing';
+
+      var data = {
+        'password': $scope.changePasswordInfo.password
+      };
+
+      ApiService.changeUserDetails(data).then(function(resp) {
+        $scope.changePasswordInfo.state = 'changed';
+
+        // Reset the form
+        delete $scope.changePasswordInfo['password']
+        delete $scope.changePasswordInfo['repeatPassword']
+
+        // Reload the user.
+        UserService.load();
+      }, function(result) {
+        $scope.changePasswordInfo.state = 'change-error';
+        UIService.showFormError('#changePasswordForm', result);
+      });
+    };
+
+    $scope.generateClientToken = function() {
+      var generateToken = function(password) {
+        var data = {
+          'password': password
+        };
+
+        ApiService.generateUserClientKey(data).then(function(resp) {
+          $scope.generatedClientToken = resp['key'];
+          $('#clientTokenModal').modal({});
+        }, ApiService.errorDisplay('Could not generate token'));
+      };
+
+      UIService.showPasswordDialog('Enter your password to generated an encrypted version:', generateToken);
+    };
+
+    $scope.changeEmail = function() {
+      UIService.hidePopover('#changeEmailForm');
+
+      var details = {
+        'email': $scope.changeEmailInfo.email
+      };
+
+      $scope.changeEmailInfo.state = 'sending';
+      ApiService.changeUserDetails(details).then(function() {
+        $scope.changeEmailInfo.state = 'sent';
+        delete $scope.changeEmailInfo['email'];
+      }, function(result) {
+        $scope.changeEmailInfo.state = 'send-error';
+        UIService.showFormError('#changeEmailForm', result);
+      });
+    };
+  }
+})();