From 44f1ff0ef1f432d0cb7b7cb20511b126b19159de Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 7 Nov 2013 15:19:52 -0500 Subject: [PATCH 1/4] Add ability to create a new organization --- endpoints/api.py | 31 +++++++ static/css/quay.css | 97 ++++++++++++++++++++++ static/directives/signin-form.html | 25 ++++++ static/js/app.js | 44 ++++++++++ static/js/controllers.js | 91 +++++++++++++------- static/js/graphing.js | 2 +- static/partials/new-organization.html | 114 +++++++++++++++++++++++++- static/partials/signin.html | 31 +------ 8 files changed, 373 insertions(+), 62 deletions(-) create mode 100644 static/directives/signin-form.html diff --git a/endpoints/api.py b/endpoints/api.py index 234e47563..897e56b85 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -282,6 +282,37 @@ def team_view(orgname, t): } +@app.route('/api/organization/', methods=['POST']) +@required_json_args('name', 'email') +@api_login_required +def create_organization_api(): + org_data = request.get_json() + existing = None + + try: + existing = model.get_organization(org_data['name']) or model.get_user(org_data['name']) + except: + pass + + if existing: + error_resp = jsonify({ + 'message': 'A user or organization with this name already exists' + }) + error_resp.status_code = 400 + return error_resp + + try: + organization = model.create_organization(org_data['name'], org_data['email'], + current_user.db_user()) + return make_response('Created', 201) + except model.DataModelException as ex: + error_resp = jsonify({ + 'message': ex.message, + }) + error_resp.status_code = 400 + return error_resp + + @app.route('/api/organization/', methods=['GET']) @api_login_required def get_organization(orgname): diff --git a/static/css/quay.css b/static/css/quay.css index 5671c1109..ff6f9ab68 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1611,6 +1611,103 @@ p.editable:hover i { margin-right: 16px; } +.create-org .steps-container { + text-align: center; +} + +.create-org .steps { + + background: #222; + + display: inline-block; + margin-top: 16px; + margin-left: 0px; + border-radius: 4px; + padding: 0px; + list-style: none; + height: 46px; + width: 675px; + text-align: left; +} + + +.create-org .steps .step { + width: 225px; + float: left; + padding: 10px; + border-right: 1px solid #222; + margin: 0px; + background: rgba(255, 255, 255, 0.2); + color: #aaa; + border-left: 4px solid transparent; +} + +.create-org .steps .step i { + font-size: 26px; + margin-right: 6px; + vertical-align: middle; +} + +.create-org .steps .step.active { + color: white; + border-left: 4px solid steelblue; + background: transparent; +} + +.create-org .steps .step:last-child { + border-right: 0px; +} + +.create-org .steps .step b { + display: block; +} + +.create-org .button-bar { + margin-bottom: 40px; +} + +.create-org .form-group { + margin-bottom: 32px; +} + +.create-org .plan-group { + padding-left: 10px; +} + +.create-org .plan-group table { + margin: 20px; + border: 1px solid #eee; +} + +.create-org .plan-group strong { + margin-bottom: 10px; +} + +.create-org .plan-group td { + vertical-align: middle; +} + +.create-org .plan-group .plan-price { + font-size: 16px; +} + +.create-org .step-container .description { + margin-top: 10px; + display: block; + color: #888; + font-size: 12px; + margin-left: 10px; +} + +.create-org .form-group input { + margin-top: 10px; + margin-left: 10px; +} + +.create-org h3 { + margin-bottom: 20px; +} + .plan-manager-element .plans-table thead td { color: #aaa; font-weight: bold; diff --git a/static/directives/signin-form.html b/static/directives/signin-form.html new file mode 100644 index 000000000..ef0b5f795 --- /dev/null +++ b/static/directives/signin-form.html @@ -0,0 +1,25 @@ + diff --git a/static/js/app.js b/static/js/app.js index 8d7bf2aa9..a4d65c357 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -343,6 +343,50 @@ quayApp.directive('repoCircle', function () { }); +quayApp.directive('signinForm', function () { + var directiveDefinitionObject = { + priority: 0, + templateUrl: '/static/directives/signin-form.html', + replace: false, + transclude: true, + restrict: 'C', + scope: { + 'redirectUrl': '=redirectUrl' + }, + controller: function($scope, $location, $timeout, Restangular, KeyService, UserService) { + $scope.githubClientId = KeyService.githubClientId; + + var appendMixpanelId = function() { + if (mixpanel.get_distinct_id !== undefined) { + $scope.mixpanelDistinctIdClause = "&state=" + mixpanel.get_distinct_id(); + } else { + // Mixpanel not yet loaded, try again later + $timeout(appendMixpanelId, 200); + } + }; + + appendMixpanelId(); + + $scope.signin = function() { + var signinPost = Restangular.one('signin'); + signinPost.customPOST($scope.user).then(function() { + $scope.needsEmailVerification = false; + $scope.invalidCredentials = false; + + // Redirect to the specified page or the landing page + UserService.load(); + $location.path($scope.redirectUrl ? $scope.redirectUrl : '/'); + }, function(result) { + $scope.needsEmailVerification = result.data.needsEmailVerification; + $scope.invalidCredentials = result.data.invalidCredentials; + }); + }; + } + }; + return directiveDefinitionObject; +}); + + quayApp.directive('organizationHeader', function () { var directiveDefinitionObject = { priority: 0, diff --git a/static/js/controllers.js b/static/js/controllers.js index 971073b94..a4773fefe 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -75,35 +75,6 @@ function HeaderCtrl($scope, $location, UserService, Restangular) { } function SigninCtrl($scope, $location, $timeout, Restangular, KeyService, UserService) { - $scope.githubClientId = KeyService.githubClientId; - - var appendMixpanelId = function() { - if (mixpanel.get_distinct_id !== undefined) { - $scope.mixpanelDistinctIdClause = "&state=" + mixpanel.get_distinct_id(); - } else { - // Mixpanel not yet loaded, try again later - $timeout(appendMixpanelId, 200); - } - }; - - appendMixpanelId(); - - $scope.signin = function() { - var signinPost = Restangular.one('signin'); - signinPost.customPOST($scope.user).then(function() { - $scope.needsEmailVerification = false; - $scope.invalidCredentials = false; - - // Redirect to the landing page - UserService.load(); - $location.path('/'); - }, function(result) { - $scope.needsEmailVerification = result.data.needsEmailVerification; - $scope.invalidCredentials = result.data.invalidCredentials; - }); - - }; - $scope.sendRecovery = function() { var signinPost = Restangular.one('recovery'); signinPost.customPOST($scope.recovery).then(function() { @@ -1282,6 +1253,66 @@ function OrgsCtrl($scope, UserService) { browserchrome.update(); } -function NewOrgCtrl($scope, UserService) { +function NewOrgCtrl($scope, $timeout, $location, UserService, PlanService, Restangular) { + $scope.loading = true; + $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) { + $scope.user = currentUser; + $scope.loading = false; + }, true); + + // Load the list of plans. + PlanService.getPlans(function(plans) { + $scope.plans = plans.business; + $scope.currentPlan = null; + }); + + $scope.setPlan = function(plan) { + $scope.currentPlan = plan; + }; + + $scope.createNewOrg = function() { + $('#orgName').popover('hide'); + + $scope.creating = true; + var org = $scope.org; + var data = { + 'name': org.name, + 'email': org.email + }; + + var createPost = Restangular.one('organization/'); + createPost.customPOST(data).then(function(created) { + $scope.creating = false; + $scope.created = created; + + // Reset the organizations list. + UserService.load(); + + // If the selected plan is free, simply move to the org page. + if ($scope.currentPlan.price == 0) { + $location.path('/organization/' + org.name + '/'); + return; + } + + // Otherwise, show the subscribe for the plan. + PlanService.changePlan($scope, org.name, $scope.currentPlan.stripeId, false, function() { + // Started. + $scope.creating = true; + }, function(sub) { + // Success. + $location.path('/organization/' + org.name + '/'); + }, function() { + // Failure. + $location.path('/organization/' + org.name + '/'); + }); + + }, function(result) { + $scope.creating = false; + $scope.createError = result.data.message || result.data; + $timeout(function() { + $('#orgName').popover('show'); + }); + }); + }; } \ No newline at end of file diff --git a/static/js/graphing.js b/static/js/graphing.js index 5ba91b879..d6ae25db7 100644 --- a/static/js/graphing.js +++ b/static/js/graphing.js @@ -1173,7 +1173,7 @@ RepositoryUsageChart.prototype.drawInternal_ = function() { var count = this.count_; var total = this.total_; - var data = [count, Math.max(0, total - count)]; + var data = [Math.max(count, 1), Math.max(0, total - count)]; var arcTween = function(a) { var i = d3.interpolate(this._current, a); diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html index 8fd32cd45..2e2828a9b 100644 --- a/static/partials/new-organization.html +++ b/static/partials/new-organization.html @@ -1 +1,113 @@ -new org +
+ +
+ +
+ +
+
+
+

Create Organization

+ +
+
    +
  • + + Login with an account +
    • +
  • + + Setup your organization +
    • +
  • + + Create teams +
    • +
+
+ +
+
+ + +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+

Setup the new organization

+ +
+
+ + + This will also be the namespace for your repositories +
+ +
+ + + This address must be different from your account's email +
+ + +
+ Choose your organization's plan + + + + + + + + + + + + + + +
PlanPrivate RepositoriesPrice
{{ plan.title }}{{ plan.privateRepos }}
${{ plan.price / 100 }}
 + + {{ currentPlan == plan ? 'Selected' : 'Choose' }} + +
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+

Organization Created

+

Manage Teams Now

+
+
+
+
diff --git a/static/partials/signin.html b/static/partials/signin.html index 71821ec0a..b4b5f7685 100644 --- a/static/partials/signin.html +++ b/static/partials/signin.html @@ -12,22 +12,7 @@
- - -
Invalid username or password.
- -
You must verify your email address before you can sign in.
+
@@ -56,17 +41,3 @@ - - From d45de5a8dd5d1eef9b48830e7aad7f79ff16a53e Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 7 Nov 2013 15:22:15 -0500 Subject: [PATCH 2/4] required_json_args is gone --- endpoints/api.py | 1 - 1 file changed, 1 deletion(-) diff --git a/endpoints/api.py b/endpoints/api.py index f2b5874c2..3e544bc08 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -265,7 +265,6 @@ def team_view(orgname, t): @app.route('/api/organization/', methods=['POST']) -@required_json_args('name', 'email') @api_login_required def create_organization_api(): org_data = request.get_json() From a7415ef4d3cb6c5c20455c5e019b2063592a6626 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 7 Nov 2013 15:33:56 -0500 Subject: [PATCH 3/4] =?UTF-8?q?Have=20the=20org=20plans=20on=20the=20plans?= =?UTF-8?q?=20page=20link=20to=20new=20organization,=20with=20the=20select?= =?UTF-8?q?ed=20plan,=20well=E2=80=A6=20selected=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/app.js | 5 +++-- static/js/controllers.js | 19 +++++++++++++++++-- static/partials/plans.html | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/static/js/app.js b/static/js/app.js index a4d65c357..fc8f25dc0 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -648,16 +648,17 @@ quayApp.directive('planManager', function () { }; var loadPlans = function() { - if ($scope.plans) { return; } + if ($scope.plans || $scope.loadingPlans) { return; } if (!$scope.user && !$scope.organization) { return; } + $scope.loadingPlans = true; PlanService.getPlans(function(plans) { $scope.plans = plans[$scope.organization ? 'business' : 'user']; update(); if ($scope.readyForPlan) { var planRequested = $scope.readyForPlan(); - if (planRequested) { + if (planRequested && planRequested != getFreePlan()) { $scope.changeSubscription(planRequested); } } diff --git a/static/js/controllers.js b/static/js/controllers.js index a4773fefe..34426d187 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -89,7 +89,7 @@ function SigninCtrl($scope, $location, $timeout, Restangular, KeyService, UserSe $scope.status = 'ready'; }; -function PlansCtrl($scope, UserService, PlanService) { +function PlansCtrl($scope, $location, UserService, PlanService) { // Load the list of plans. PlanService.getPlans(function(plans) { $scope.plans = plans; @@ -107,6 +107,14 @@ function PlansCtrl($scope, UserService, PlanService) { $('#signinModal').modal({}); } }; + + $scope.createOrg = function(plan) { + if ($scope.user && !$scope.user.anonymous) { + document.location = '/organizations/new/?plan=' + plan; + } else { + $('#signinModal').modal({}); + } + }; } function GuideCtrl($scope) { @@ -1253,7 +1261,7 @@ function OrgsCtrl($scope, UserService) { browserchrome.update(); } -function NewOrgCtrl($scope, $timeout, $location, UserService, PlanService, Restangular) { +function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, PlanService, Restangular) { $scope.loading = true; $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) { @@ -1261,10 +1269,17 @@ function NewOrgCtrl($scope, $timeout, $location, UserService, PlanService, Resta $scope.loading = false; }, true); + requested = $routeParams['plan']; + // Load the list of plans. PlanService.getPlans(function(plans) { $scope.plans = plans.business; $scope.currentPlan = null; + if (requested) { + PlanService.getPlan(requested, function(plan) { + $scope.currentPlan = plan; + }); + } }); $scope.setPlan = function(plan) { diff --git a/static/partials/plans.html b/static/partials/plans.html index 0f34fe018..24ac8b1e4 100644 --- a/static/partials/plans.html +++ b/static/partials/plans.html @@ -38,7 +38,7 @@
{{ plan.privateRepos }} private repositories
{{ plan.audience }}
SSL secured connections
- + From 3f2d51651ea7844b9253ebb033ac0421554b26b1 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 7 Nov 2013 16:33:56 -0500 Subject: [PATCH 4/4] Start on organization conversion. Note that this does not yet move over the user's plan to an org plan --- data/model.py | 16 +++++ endpoints/api.py | 36 ++++++++++ static/css/quay.css | 40 ++++++++++++ static/js/controllers.js | 38 ++++++++++- static/partials/user-admin.html | 112 ++++++++++++++++++++++++++++++++ 5 files changed, 241 insertions(+), 1 deletion(-) diff --git a/data/model.py b/data/model.py index 05d9ff681..47aed251e 100644 --- a/data/model.py +++ b/data/model.py @@ -99,6 +99,22 @@ def create_organization(name, email, creating_user): raise InvalidOrganizationException('Invalid organization name: %s' % name) +def convert_user_to_organization(user, admin_user): + # Change the user to an organization. + user.organization = True + + # TODO: disable this account for login. + user.password = '' + user.save() + + # Create a team for the owners + owners_team = create_team('owners', user, 'admin') + + # Add the user who will admin the org to the owners team + add_user_to_team(admin_user, owners_team) + + return user + def create_team(name, org, team_role_name, description=''): if not validate_username(name): raise InvalidTeamException('Invalid team name: %s' % name) diff --git a/endpoints/api.py b/endpoints/api.py index 3e544bc08..5e22fa359 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -96,6 +96,38 @@ def get_logged_in_user(): }) +@app.route('/api/user/convert', methods=['POST']) +@api_login_required +def convert_user_to_organization(): + user = current_user.db_user() + convert_data = request.get_json() + + # Ensure that the new admin user is the not user being converted. + admin_username = convert_data['adminUser'] + if admin_username == user.username: + error_resp = jsonify({ + 'reason': 'invaliduser' + }) + error_resp.status_code = 400 + return error_resp + + # Ensure that the sign in credentials work. + admin_password = convert_data['adminPassword'] + if not model.verify_user(admin_username, admin_password): + error_resp = jsonify({ + 'reason': 'invaliduser' + }) + error_resp.status_code = 400 + return error_resp + + # Convert the user to an organization. + model.convert_user_to_organization(user, model.get_user(admin_username)) + + # And finally login with the admin credentials. + return conduct_signin(admin_username, admin_password) + + + @app.route('/api/user/', methods=['PUT']) @api_login_required def change_user_details(): @@ -157,6 +189,10 @@ def signin_api(): username = signin_data['username'] password = signin_data['password'] + return conduct_signin(username, password) + + +def conduct_signin(username, password): #TODO Allow email login needs_email_verification = False invalid_credentials = False diff --git a/static/css/quay.css b/static/css/quay.css index ff6f9ab68..ecf6b08c2 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1276,6 +1276,11 @@ p.editable:hover i { border: inherit; } +.user-admin #migrate .panel { + max-width: 600px; + text-align: center; +} + .user-admin .panel-plan { text-align: center; } @@ -1295,6 +1300,41 @@ p.editable:hover i { margin-bottom: 12px; } +.user-admin .convert-form h3 { + margin-bottom: 20px; +} + +.user-admin #convertForm { + max-width: 500px; +} + +.user-admin #convertForm .form-group { + margin-bottom: 20px; +} + +.user-admin #convertForm input { + margin-bottom: 10px; + margin-left: 20px; +} + +.user-admin #convertForm .existing-data { + font-size: 16px; + font-weight: bold; +} + +.user-admin #convertForm .description { + margin-top: 10px; + display: block; + color: #888; + font-size: 12px; + margin-left: 20px; +} + +.user-admin #convertForm .existing-data { + display: block; + padding-left: 20px; + margin-top: 10px; +} #image-history-container { overflow: hidden; diff --git a/static/js/controllers.js b/static/js/controllers.js index 34426d187..5501ac9ad 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -690,7 +690,7 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) { } -function UserAdminCtrl($scope, $timeout, Restangular, PlanService, UserService, KeyService, $routeParams) { +function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, UserService, KeyService, $routeParams) { $scope.$watch(function () { return UserService.currentUser(); }, function (currentUser) { $scope.askForPassword = currentUser.askForPassword; if (!currentUser.anonymous) { @@ -704,12 +704,48 @@ function UserAdminCtrl($scope, $timeout, Restangular, PlanService, UserService, return $routeParams['plan']; }; + if ($routeParams['migrate']) { + $('#migrateTab').tab('show') + } + $scope.loading = true; $scope.updatingUser = false; $scope.changePasswordSuccess = false; + $scope.convertStep = 0; + $('.form-change-pw').popover(); + $scope.showConvertForm = function() { + $scope.convertStep = 1; + }; + + $scope.convertToOrg = function() { + $('#reallyconvertModal').modal({}); + }; + + $scope.reallyConvert = function() { + $scope.loading = true; + + var data = { + 'adminUser': $scope.org.adminUser, + 'adminPassword': $scope.org.adminPassword + }; + + var convertAccount = Restangular.one('user/convert'); + convertAccount.customPOST(data).then(function(resp) { + UserService.load(); + $location.path('/'); + }, function(resp) { + $scope.loading = false; + if (resp.data.reason == 'invaliduser') { + $('#invalidadminModal').modal({}); + } else { + $('#cannotconvertModal').modal({}); + } + }); + }; + $scope.changePassword = function() { $('.form-change-pw').popover('hide'); $scope.updatingUser = true; diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html index f3371e001..aa40ec8d1 100644 --- a/static/partials/user-admin.html +++ b/static/partials/user-admin.html @@ -28,6 +28,7 @@ @@ -55,8 +56,119 @@ Password changed successfully + + +
+ +
+
+
+ Cannot convert this account into an organization, as it is a member of {{user.organizations.length}} other + organization{{user.organizations.length > 1 ? 's' : ''}}. Please leave + {{user.organizations.length > 1 ? 'those organizations' : 'that organization'}} first. +
+
+ +
+
+ Converting a user account into an organization cannot be undone.
Here be many fire-breathing dragons! +
+ + +
+
+ + +
+

Convert to organization

+ +
+
+ +
+ + {{ user.username }}
+ This will continue to be the namespace for your repositories +
+ +
+ + + + The username and password for an existing account that will become administrator of the organization +
+ +
+ +
+
+
+
+ + + + + + + + + + + +