diff --git a/packages/api/routes/user.ts b/packages/api/routes/user.ts index f83ad39..c45f143 100644 --- a/packages/api/routes/user.ts +++ b/packages/api/routes/user.ts @@ -93,18 +93,17 @@ async function login(req: Request, res: Response) { ); // create initial user model object + const newUser = new User( googleUserId, userInfo.email, - userInfo.verifiedEmail, userInfo.name, userInfo.given_name, userInfo.family_name, - userInfo.picture, - userInfo.locale, new Date(), - UserStatus.ONLINE, - new Date() + userInfo.picture, + userInfo.verifiedEmail, + userInfo.locale ); // create user if not exists diff --git a/packages/core/models/user.model.ts b/packages/core/models/user.model.ts index 6556b40..94aea6c 100644 --- a/packages/core/models/user.model.ts +++ b/packages/core/models/user.model.ts @@ -4,17 +4,18 @@ export class User { constructor( public googleId: string, // our Google id that every google user has unique that we are going to use for now public email: string, - public verifiedEmail: boolean, + public name: string, public givenName: string, public familyName: string, - public picture: string, - public locale: string, + public createdDate: Date, + public picture?: string, + public verifiedEmail: boolean = false, + + public locale?: string, // additional properties specific to our users collection - - public createdDate: Date, - public status: UserStatus, + public status?: UserStatus, public lastUpdatedDate?: Date, public _id?: ObjectId ) {} diff --git a/packages/desktop/src/controller/index.tsx b/packages/desktop/src/controller/index.tsx index 15f240e..3f68e88 100644 --- a/packages/desktop/src/controller/index.tsx +++ b/packages/desktop/src/controller/index.tsx @@ -7,6 +7,8 @@ export function useAuthCheck(jwtToken?: string) { retry: false, refetchOnWindowFocus: false, enabled: jwtToken ? true : false, + + refetchInterval: 10000, }); }