Merge pull request #150 from CanDIG/daisieh/remove-user-email

ingest_openapi.yaml

@@ -206,40 +206,6 @@ paths:
             application/json:
               schema:
                 type: object
-  /program/{program_id}/email/{email}:
-    parameters:
-      - in: path
-        name: program_id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: email
-        schema:
-          type: string
-        required: true
-    post:
-      summary: Add user access for a dataset
-      description: Add user access for a dataset
-      operationId: ingest_operations.add_user_access
-      responses:
-        200:
-          description: Success
-          content:
-            application/json:
-              schema:
-                type: object
-    delete:
-      summary: Delete user access for a dataset
-      description: Delete user access for a dataset
-      operationId: ingest_operations.remove_user_access
-      responses:
-        200:
-          description: Success
-          content:
-            application/json:
-              schema:
-                type: object
   /user/pending/request:
     post:
       summary: Add pending user

ingest_operations.py

@@ -281,27 +281,8 @@ def remove_program(program_id):
     return response, 500
 
 
-@app.route('/program/<path:program_id>/email/<path:email>')
-def add_user_access(program_id, email):
-    token = connexion.request.headers['Authorization'].split("Bearer ")[1]
-    try:
-        result, status_code = add_user_to_dataset(email, program_id, token)
-        return result, status_code
-    except Exception as e:
-        return {"error": str(e)}, 500
-
-
-@app.route('/program/<path:program_id>/email/<path:email>')
-def remove_user_access(program_id, email):
-    token = connexion.request.headers['Authorization'].split("Bearer ")[1]
-    try:
-        result, status_code = remove_user_from_dataset(email, program_id, token)
-        return result, status_code
-    except Exception as e:
-        return {"error": str(e)}, 500
-
 ####
-# Pending users
+# Pending users: approving a pending user creates a CanDIG-authorized user
 ####
 
 def add_pending_user():
@@ -358,6 +339,7 @@ def clear_pending_users():
     response, status_code = auth.clear_pending_users_in_opa(token)
     return response, status_code
 
+
 ####
 # DAC authorization for users
 ####
@@ -441,6 +423,7 @@ def remove_program_for_user(user_id, program_id):
             return response, status_code
     return {"error": f"No program {program_id} found for user"}, status_code
 
+
 @app.route('/get-token')
 def get_token():
     # Attempt to grab the token via session_id