Merge branch 'orgs' of ssh://bitbucket.org/yackob03/quay into orgs

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
@@ -264,6 +300,36 @@ def team_view(orgname, t):
   }
 
 
+@app.route('/api/organization/', methods=['POST'])
+@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/<orgname>', methods=['GET'])
 @api_login_required
 def get_organization(orgname):