run generate-client.sh

Author: sinkozs

backend/app/api/routes/users.py

@@ -56,6 +56,7 @@ def create_user(*, session: SessionDep, user_in: UserCreate) -> Any:
     """
     Create new user.
     """
+    print(f"CREATING new user: {user_in}")
     user = crud.get_user_by_email(session=session, email=user_in.email)
     if user:
         raise HTTPException(

frontend/src/client/core/ApiRequestOptions.ts

@@ -18,5 +18,4 @@ export type ApiRequestOptions<T = unknown> = {
   readonly responseHeader?: string
   readonly responseTransformer?: (data: unknown) => Promise<T>
   readonly url: string
-  readonly withCredentials?: boolean 
 }

frontend/src/client/core/request.ts

@@ -178,8 +178,6 @@ export const getHeaders = async <T>(
   } else if (options.formData !== undefined) {
     if (options.mediaType) {
       headers["Content-Type"] = options.mediaType
-    } else {
-      headers["Content-Type"] = "application/x-www-form-urlencoded"
     }
   }
 
@@ -205,31 +203,15 @@ export const sendRequest = async <T>(
 ): Promise<AxiosResponse<T>> => {
   const controller = new AbortController()
 
-  let data = body;
-  
-  // If we have formData but it's not a FormData instance,
-  // and Content-Type is application/x-www-form-urlencoded
-  if (options.formData && !isFormData(options.formData) && 
-      headers["Content-Type"] === "application/x-www-form-urlencoded") {
-    const params = new URLSearchParams();
-    Object.entries(options.formData).forEach(([key, value]) => {
-      if (value !== undefined && value !== null) {
-        params.append(key, String(value));
-      }
-    });
-    data = params;
-  } else {
-    data = body ?? formData;
-  }
-
   let requestConfig: AxiosRequestConfig = {
-    data: data,
+    data: body ?? formData,
     headers,
     method: options.method,
     signal: controller.signal,
     url,
-    withCredentials: options.withCredentials ?? config.WITH_CREDENTIALS,
+    withCredentials: config.WITH_CREDENTIALS,
   }
+
   onCancel(() => controller.abort())
 
   for (const fn of config.interceptors.request._fns) {
@@ -385,13 +367,15 @@ export const request = <T>(
         if (options.responseTransformer && isSuccess(response.status)) {
           transformedBody = await options.responseTransformer(responseBody)
         }
+
         const result: ApiResult = {
           url,
           ok: isSuccess(response.status),
           status: response.status,
           statusText: response.statusText,
           body: responseHeader ?? transformedBody,
         }
+
         catchErrorCodes(options, result)
 
         resolve(result.body)

frontend/src/client/sdk.gen.ts

@@ -15,7 +15,6 @@ import type {
   ItemsDeleteItemData,
   ItemsDeleteItemResponse,
   LoginLoginAccessTokenData,
-  LogoutResponse,
   LoginLoginAccessTokenResponse,
   LoginTestTokenResponse,
   LoginRecoverPasswordData,
@@ -24,6 +23,9 @@ import type {
   LoginResetPasswordResponse,
   LoginRecoverPasswordHtmlContentData,
   LoginRecoverPasswordHtmlContentResponse,
+  LoginLogoutResponse,
+  PrivateCreateUserData,
+  PrivateCreateUserResponse,
   UsersReadUsersData,
   UsersReadUsersResponse,
   UsersCreateUserData,
@@ -67,7 +69,6 @@ export class ItemsService {
         skip: data.skip,
         limit: data.limit,
       },
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -90,7 +91,6 @@ export class ItemsService {
       url: "/api/v1/items/",
       body: data.requestBody,
       mediaType: "application/json",
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -114,7 +114,6 @@ export class ItemsService {
       path: {
         id: data.id,
       },
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -139,7 +138,6 @@ export class ItemsService {
       path: {
         id: data.id,
       },
-      withCredentials: true,
       body: data.requestBody,
       mediaType: "application/json",
       errors: {
@@ -165,7 +163,6 @@ export class ItemsService {
       path: {
         id: data.id,
       },
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -176,10 +173,10 @@ export class ItemsService {
 export class LoginService {
   /**
    * Login Access Token
-   * OAuth2 compatible token login, get an access token for future requests
+   * OAuth2-compatible token login: get an access token for future requests (sent in an HTTP-only cookie)
    * @param data The data for the request.
    * @param data.formData
-   * @returns Token Successful Response
+   * @returns unknown Successful Response
    * @throws ApiError
    */
   public static loginAccessToken(
@@ -189,42 +186,13 @@ export class LoginService {
       method: "POST",
       url: "/api/v1/login/access-token",
       formData: data.formData,
-      headers:  {
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
       mediaType: "application/x-www-form-urlencoded",
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
     })
   }
 
-
-    /**
-   * Login Access Token
-   * OAuth2 compatible token login, get an access token for future requests
-   * @param data The data for the request.
-   * @param data.formData
-   * @returns Token Successful Response
-   * @throws ApiError
-   */
-    public static logout(): CancelablePromise<LogoutResponse> {
-      return __request(OpenAPI, {
-        method: "POST",
-        url: "/api/v1/logout",
-        headers:  {
-          "Content-Type": "application/x-www-form-urlencoded",
-        },
-        mediaType: "application/x-www-form-urlencoded",
-        withCredentials: true,
-        errors: {
-          422: "Validation Error",
-        },
-      })
-    }
-  
-
   /**
    * Test Token
    * Test access token
@@ -235,7 +203,6 @@ export class LoginService {
     return __request(OpenAPI, {
       method: "POST",
       url: "/api/v1/login/test-token",
-      withCredentials: true,
     })
   }
 
@@ -306,6 +273,43 @@ export class LoginService {
       },
     })
   }
+
+  /**
+   * Logout
+   * Delete the HTTP-only cookie during logout
+   * @returns unknown Successful Response
+   * @throws ApiError
+   */
+  public static logout(): CancelablePromise<LoginLogoutResponse> {
+    return __request(OpenAPI, {
+      method: "POST",
+      url: "/api/v1/logout",
+    })
+  }
+}
+
+export class PrivateService {
+  /**
+   * Create User
+   * Create a new user.
+   * @param data The data for the request.
+   * @param data.requestBody
+   * @returns UserPublic Successful Response
+   * @throws ApiError
+   */
+  public static createUser(
+    data: PrivateCreateUserData,
+  ): CancelablePromise<PrivateCreateUserResponse> {
+    return __request(OpenAPI, {
+      method: "POST",
+      url: "/api/v1/private/users/",
+      body: data.requestBody,
+      mediaType: "application/json",
+      errors: {
+        422: "Validation Error",
+      },
+    })
+  }
 }
 
 export class UsersService {
@@ -366,7 +370,6 @@ export class UsersService {
     return __request(OpenAPI, {
       method: "GET",
       url: "/api/v1/users/me",
-      withCredentials: true,
     })
   }
 
@@ -380,7 +383,6 @@ export class UsersService {
     return __request(OpenAPI, {
       method: "DELETE",
       url: "/api/v1/users/me",
-      withCredentials: true,
     })
   }
 
@@ -400,7 +402,6 @@ export class UsersService {
       url: "/api/v1/users/me",
       body: data.requestBody,
       mediaType: "application/json",
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -423,7 +424,6 @@ export class UsersService {
       url: "/api/v1/users/me/password",
       body: data.requestBody,
       mediaType: "application/json",
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -495,7 +495,6 @@ export class UsersService {
       },
       body: data.requestBody,
       mediaType: "application/json",
-      withCredentials: true,
       errors: {
         422: "Validation Error",
       },
@@ -516,7 +515,6 @@ export class UsersService {
     return __request(OpenAPI, {
       method: "DELETE",
       url: "/api/v1/users/{user_id}",
-      withCredentials: true,
       path: {
         user_id: data.userId,
       },

frontend/src/client/types.gen.ts

@@ -44,14 +44,13 @@ export type NewPassword = {
   new_password: string
 }
 
-export type Token = {
-  access_token: string
-  token_type?: string
+export type PrivateUserCreate = {
+  email: string
+  password: string
+  full_name: string
+  is_verified?: boolean
 }
 
-export type HTTPOnlyCookie = {
-  message: string
-}
 export type UpdatePassword = {
   current_password: string
   new_password: string
@@ -139,9 +138,7 @@ export type LoginLoginAccessTokenData = {
   formData: Body_login_login_access_token
 }
 
-export type LoginLoginAccessTokenResponse = HTTPOnlyCookie
-
-export type LogoutResponse = HTTPOnlyCookie
+export type LoginLoginAccessTokenResponse = unknown
 
 export type LoginTestTokenResponse = UserPublic
 
@@ -163,6 +160,14 @@ export type LoginRecoverPasswordHtmlContentData = {
 
 export type LoginRecoverPasswordHtmlContentResponse = string
 
+export type LoginLogoutResponse = unknown
+
+export type PrivateCreateUserData = {
+  requestBody: PrivateUserCreate
+}
+
+export type PrivateCreateUserResponse = UserPublic
+
 export type UsersReadUsersData = {
   limit?: number
   skip?: number

frontend/tests/utils/privateApi.ts

@@ -18,6 +18,5 @@ export const createUser = async ({
       is_verified: true,
       full_name: "Test User",
     },
-    credentials: 'include'
   })
 }