Merge pull request #17 from ShadowFox88/main

Fix a bug not allowing users to sign in properly

Author: slashtechno

backend/podium/db/user.py

@@ -58,7 +58,7 @@ def model_dump(self, *args, **kwargs):
 
 
 
-class UserPrivate(UserBase):
+class UserPrivate(UserSignupPayload):
     id: Annotated[str, StringConstraints(pattern=constants.RECORD_REGEX)]
     votes: constants.MultiRecordField = []
     projects: constants.MultiRecordField = []

backend/podium/routers/users.py

@@ -14,6 +14,15 @@
 
 router = APIRouter(prefix="/users", tags=["users"])
 
+class UserExistsResponse(BaseModel):
+    exists: bool
+
+
+@router.get("/exists")
+def user_exists(email: Annotated[EmailStr, Query(...)]) -> UserExistsResponse:
+    email = email.strip().lower()
+    exists = True if db.user.get_user_record_id_by_email(email) else False
+    return UserExistsResponse(exists=exists)
 
 @router.get("/{user_id}")
 def get_user_public(user_id: Annotated[str, Path(title="User Airtable ID")]) -> UserPublic:
@@ -47,12 +56,3 @@ def create_user(user: UserSignupPayload):
     db.users.create(user.model_dump())
 
 
-class UserExistsResponse(BaseModel):
-    exists: bool
-
-
-@router.get("/exists")
-def user_exists(email: Annotated[EmailStr, Query(...)]) -> UserExistsResponse:
-    email = email.strip().lower()
-    exists = True if db.user.get_user_record_id_by_email(email) else False
-    return UserExistsResponse(exists=exists)

frontend/src/lib/client/sdk.gen.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { createClient, createConfig, type OptionsLegacyParser } from '@hey-api/client-fetch';
-import type { RequestLoginRequestLoginPostData, RequestLoginRequestLoginPostError, RequestLoginRequestLoginPostResponse, VerifyTokenVerifyGetData, VerifyTokenVerifyGetError, VerifyTokenVerifyGetResponse, ProtectedRouteProtectedRouteGetError, ProtectedRouteProtectedRouteGetResponse, GetEventEventsEventIdGetData, GetEventEventsEventIdGetError, GetEventEventsEventIdGetResponse, UpdateEventEventsEventIdPutData, UpdateEventEventsEventIdPutError, UpdateEventEventsEventIdPutResponse, DeleteEventEventsEventIdDeleteData, DeleteEventEventsEventIdDeleteError, DeleteEventEventsEventIdDeleteResponse, GetAttendingEventsEventsGetError, GetAttendingEventsEventsGetResponse, CreateEventEventsPostData, CreateEventEventsPostError, CreateEventEventsPostResponse, AttendEventEventsAttendPostData, AttendEventEventsAttendPostError, AttendEventEventsAttendPostResponse, VoteEventsVotePostData, VoteEventsVotePostError, VoteEventsVotePostResponse, GetLeaderboardEventsEventIdLeaderboardGetData, GetLeaderboardEventsEventIdLeaderboardGetError, GetLeaderboardEventsEventIdLeaderboardGetResponse, GetEventProjectsEventsEventIdProjectsGetData, GetEventProjectsEventsEventIdProjectsGetError, GetEventProjectsEventsEventIdProjectsGetResponse, GetProjectsProjectsMineGetError, GetProjectsProjectsMineGetResponse, CreateProjectProjectsPostData, CreateProjectProjectsPostError, CreateProjectProjectsPostResponse, JoinProjectProjectsJoinPostData, JoinProjectProjectsJoinPostError, JoinProjectProjectsJoinPostResponse, UpdateProjectProjectsProjectIdPutData, UpdateProjectProjectsProjectIdPutError, UpdateProjectProjectsProjectIdPutResponse, DeleteProjectProjectsProjectIdDeleteData, DeleteProjectProjectsProjectIdDeleteError, DeleteProjectProjectsProjectIdDeleteResponse, GetProjectProjectsProjectIdGetData, GetProjectProjectsProjectIdGetError, GetProjectProjectsProjectIdGetResponse, GetUserPublicUsersUserIdGetData, GetUserPublicUsersUserIdGetError, GetUserPublicUsersUserIdGetResponse, GetCurrentUserUsersCurrentGetError, GetCurrentUserUsersCurrentGetResponse, CreateUserUsersPostData, CreateUserUsersPostError, CreateUserUsersPostResponse, UserExistsUsersExistsGetData, UserExistsUsersExistsGetError, UserExistsUsersExistsGetResponse } from './types.gen';
+import type { RequestLoginRequestLoginPostData, RequestLoginRequestLoginPostError, RequestLoginRequestLoginPostResponse, VerifyTokenVerifyGetData, VerifyTokenVerifyGetError, VerifyTokenVerifyGetResponse, ProtectedRouteProtectedRouteGetError, ProtectedRouteProtectedRouteGetResponse, GetEventEventsEventIdGetData, GetEventEventsEventIdGetError, GetEventEventsEventIdGetResponse, UpdateEventEventsEventIdPutData, UpdateEventEventsEventIdPutError, UpdateEventEventsEventIdPutResponse, DeleteEventEventsEventIdDeleteData, DeleteEventEventsEventIdDeleteError, DeleteEventEventsEventIdDeleteResponse, GetAttendingEventsEventsGetError, GetAttendingEventsEventsGetResponse, CreateEventEventsPostData, CreateEventEventsPostError, CreateEventEventsPostResponse, AttendEventEventsAttendPostData, AttendEventEventsAttendPostError, AttendEventEventsAttendPostResponse, VoteEventsVotePostData, VoteEventsVotePostError, VoteEventsVotePostResponse, GetLeaderboardEventsEventIdLeaderboardGetData, GetLeaderboardEventsEventIdLeaderboardGetError, GetLeaderboardEventsEventIdLeaderboardGetResponse, GetEventProjectsEventsEventIdProjectsGetData, GetEventProjectsEventsEventIdProjectsGetError, GetEventProjectsEventsEventIdProjectsGetResponse, GetProjectsProjectsMineGetError, GetProjectsProjectsMineGetResponse, CreateProjectProjectsPostData, CreateProjectProjectsPostError, CreateProjectProjectsPostResponse, JoinProjectProjectsJoinPostData, JoinProjectProjectsJoinPostError, JoinProjectProjectsJoinPostResponse, UpdateProjectProjectsProjectIdPutData, UpdateProjectProjectsProjectIdPutError, UpdateProjectProjectsProjectIdPutResponse, DeleteProjectProjectsProjectIdDeleteData, DeleteProjectProjectsProjectIdDeleteError, DeleteProjectProjectsProjectIdDeleteResponse, GetProjectProjectsProjectIdGetData, GetProjectProjectsProjectIdGetError, GetProjectProjectsProjectIdGetResponse, UserExistsUsersExistsGetData, UserExistsUsersExistsGetError, UserExistsUsersExistsGetResponse, GetUserPublicUsersUserIdGetData, GetUserPublicUsersUserIdGetError, GetUserPublicUsersUserIdGetResponse, GetCurrentUserUsersCurrentGetError, GetCurrentUserUsersCurrentGetResponse, CreateUserUsersPostData, CreateUserUsersPostError, CreateUserUsersPostResponse } from './types.gen';
 
 export const client = createClient(createConfig());
 
@@ -208,6 +208,16 @@ export class ProjectsService {
 }
 
 export class UsersService {
+    /**
+     * User Exists
+     */
+    public static userExistsUsersExistsGet<ThrowOnError extends boolean = false>(options: OptionsLegacyParser<UserExistsUsersExistsGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<UserExistsUsersExistsGetResponse, UserExistsUsersExistsGetError, ThrowOnError>({
+            ...options,
+            url: '/users/exists'
+        });
+    }
+    
     /**
      * Get User Public
      */
@@ -238,14 +248,4 @@ export class UsersService {
         });
     }
 
-    /**
-     * User Exists
-     */
-    public static userExistsUsersExistsGet<ThrowOnError extends boolean = false>(options: OptionsLegacyParser<UserExistsUsersExistsGetData, ThrowOnError>) {
-        return (options?.client ?? client).get<UserExistsUsersExistsGetResponse, UserExistsUsersExistsGetError, ThrowOnError>({
-            ...options,
-            url: '/users/exists'
-        });
-    }
-    
 }

frontend/src/lib/client/types.gen.ts

@@ -160,6 +160,15 @@ export type UserLoginPayload = {
 export type UserPrivate = {
     first_name: string;
     last_name?: string;
+    email: string;
+    phone?: string;
+    street_1?: (string | null);
+    street_2?: (string | null);
+    city?: (string | null);
+    state?: (string | null);
+    zip_code?: (string | null);
+    country?: (string | null);
+    dob?: (string | null);
     id: string;
     votes?: Array<(string)>;
     projects?: Array<(string)>;
@@ -363,6 +372,16 @@ export type GetProjectProjectsProjectIdGetResponse = (unknown);
 
 export type GetProjectProjectsProjectIdGetError = (HTTPValidationError);
 
+export type UserExistsUsersExistsGetData = {
+    query: {
+        email: string;
+    };
+};
+
+export type UserExistsUsersExistsGetResponse = (UserExistsResponse);
+
+export type UserExistsUsersExistsGetError = (HTTPValidationError);
+
 export type GetUserPublicUsersUserIdGetData = {
     path: {
         user_id: string;
@@ -383,14 +402,4 @@ export type CreateUserUsersPostData = {
 
 export type CreateUserUsersPostResponse = (unknown);
 
-export type CreateUserUsersPostError = (HTTPValidationError);
-
-export type UserExistsUsersExistsGetData = {
-    query: {
-        email: string;
-    };
-};
-
-export type UserExistsUsersExistsGetResponse = (UserExistsResponse);
-
-export type UserExistsUsersExistsGetError = (HTTPValidationError);
+export type CreateUserUsersPostError = (HTTPValidationError);