rename endpoint

Author: GalMunGral

backend/app/routers/authentication.py

@@ -67,7 +67,37 @@ async def save_user(userIn: UserIn):
     return user.dict()
 
 
-@router.patch("/users", response_model=UserOut)
+@router.post("/login")
+async def login(userIn: UserLogin):
+    try:
+        token = keycloak_openid.token(userIn.email, userIn.password)
+        return {"token": token["access_token"]}
+    # bad credentials
+    except KeycloakAuthenticationError as e:
+        raise HTTPException(
+            status_code=e.response_code,
+            detail=json.loads(e.error_message),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    # account not fully setup (for example if new password is set to temporary)
+    except KeycloakGetError as e:
+        raise HTTPException(
+            status_code=e.response_code,
+            detail=json.loads(e.error_message),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+
+async def authenticate_user(email: str, password: str):
+    user = await UserDB.find_one({"email": email})
+    if not user:
+        return None
+    if not user.verify_password(password):
+        return None
+    return user
+
+
+@router.patch("/users/me", response_model=UserOut)
 async def update_current_user(
     userUpdate: UserUpdate, current_user=Depends(get_current_user)
 ):
@@ -108,36 +138,6 @@ async def update_current_user(
     return user.dict()
 
 
-@router.post("/login")
-async def login(userIn: UserLogin):
-    try:
-        token = keycloak_openid.token(userIn.email, userIn.password)
-        return {"token": token["access_token"]}
-    # bad credentials
-    except KeycloakAuthenticationError as e:
-        raise HTTPException(
-            status_code=e.response_code,
-            detail=json.loads(e.error_message),
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-    # account not fully setup (for example if new password is set to temporary)
-    except KeycloakGetError as e:
-        raise HTTPException(
-            status_code=e.response_code,
-            detail=json.loads(e.error_message),
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-
-
-async def authenticate_user(email: str, password: str):
-    user = await UserDB.find_one({"email": email})
-    if not user:
-        return None
-    if not user.verify_password(password):
-        return None
-    return user
-
-
 @router.get("/users/me/is_admin", response_model=bool)
 async def get_admin(
     dataset_id: str = None, current_username=Depends(get_current_user)

frontend/src/openapi/v2/services/LoginService.ts

@@ -31,17 +31,17 @@ export class LoginService {
     }
 
     /**
-     * Update Current User
+     * Login
      * @param requestBody
-     * @returns UserOut Successful Response
+     * @returns any Successful Response
      * @throws ApiError
      */
-    public static updateCurrentUserApiV2UsersPatch(
-        requestBody: UserUpdate,
-    ): CancelablePromise<UserOut> {
+    public static loginApiV2LoginPost(
+        requestBody: UserLogin,
+    ): CancelablePromise<any> {
         return __request({
-            method: 'PATCH',
-            path: `/api/v2/users`,
+            method: 'POST',
+            path: `/api/v2/login`,
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -51,17 +51,17 @@ export class LoginService {
     }
 
     /**
-     * Login
+     * Update Current User
      * @param requestBody
-     * @returns any Successful Response
+     * @returns UserOut Successful Response
      * @throws ApiError
      */
-    public static loginApiV2LoginPost(
-        requestBody: UserLogin,
-    ): CancelablePromise<any> {
+    public static updateCurrentUserApiV2UsersMePatch(
+        requestBody: UserUpdate,
+    ): CancelablePromise<UserOut> {
         return __request({
-            method: 'POST',
-            path: `/api/v2/login`,
+            method: 'PATCH',
+            path: `/api/v2/users/me`,
             body: requestBody,
             mediaType: 'application/json',
             errors: {

openapi.json

@@ -115,18 +115,20 @@
             }
           }
         }
-      },
-      "patch": {
+      }
+    },
+    "/api/v2/login": {
+      "post": {
         "tags": [
           "login"
         ],
-        "summary": "Update Current User",
-        "operationId": "update_current_user_api_v2_users_patch",
+        "summary": "Login",
+        "operationId": "login_api_v2_login_post",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UserUpdate"
+                "$ref": "#/components/schemas/UserLogin"
               }
             }
           },
@@ -137,9 +139,7 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UserOut"
-                }
+                "schema": {}
               }
             }
           },
@@ -153,32 +153,21 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "OAuth2AuthorizationCodeBearer": []
-          },
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "APIKeyCookie": []
-          }
-        ]
+        }
       }
     },
-    "/api/v2/login": {
-      "post": {
+    "/api/v2/users/me": {
+      "patch": {
         "tags": [
           "login"
         ],
-        "summary": "Login",
-        "operationId": "login_api_v2_login_post",
+        "summary": "Update Current User",
+        "operationId": "update_current_user_api_v2_users_me_patch",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UserLogin"
+                "$ref": "#/components/schemas/UserUpdate"
               }
             }
           },
@@ -189,7 +178,9 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {}
+                "schema": {
+                  "$ref": "#/components/schemas/UserOut"
+                }
               }
             }
           },
@@ -203,7 +194,18 @@
               }
             }
           }
-        }
+        },
+        "security": [
+          {
+            "OAuth2AuthorizationCodeBearer": []
+          },
+          {
+            "APIKeyHeader": []
+          },
+          {
+            "APIKeyCookie": []
+          }
+        ]
       }
     },
     "/api/v2/users/me/is_admin": {