merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 0 insertions, 59 deletions

diff --git a/opendc-web/opendc-web-api/opendc/api/v2/users/userId/endpoint.py b/opendc-web/opendc-web-api/opendc/api/v2/users/userId/endpoint.py
deleted file mode 100644
index be3462c0..00000000
--- a/opendc-web/opendc-web-api/opendc/api/v2/users/userId/endpoint.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from opendc.models.project import Project
-from opendc.models.user import User
-from opendc.util.rest import Response
-
-
-def GET(request):
-    """Get this User."""
-
-    request.check_required_parameters(path={'userId': 'string'})
-
-    user = User.from_id(request.params_path['userId'])
-
-    user.check_exists()
-
-    return Response(200, 'Successfully retrieved user.', user.obj)
-
-
-def PUT(request):
-    """Update this User's given name and/or family name."""
-
-    request.check_required_parameters(body={'user': {
-        'givenName': 'string',
-        'familyName': 'string'
-    }},
-                                      path={'userId': 'string'})
-
-    user = User.from_id(request.params_path['userId'])
-
-    user.check_exists()
-    user.check_correct_user(request.google_id)
-
-    user.set_property('givenName', request.params_body['user']['givenName'])
-    user.set_property('familyName', request.params_body['user']['familyName'])
-
-    user.update()
-
-    return Response(200, 'Successfully updated user.', user.obj)
-
-
-def DELETE(request):
-    """Delete this User."""
-
-    request.check_required_parameters(path={'userId': 'string'})
-
-    user = User.from_id(request.params_path['userId'])
-
-    user.check_exists()
-    user.check_correct_user(request.google_id)
-
-    for authorization in user.obj['authorizations']:
-        if authorization['authorizationLevel'] != 'OWN':
-            continue
-
-        project = Project.from_id(authorization['projectId'])
-        project.delete()
-
-    old_object = user.delete()
-
-    return Response(200, 'Successfully deleted user.', old_object)