Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions packages/backend/src/auth/controllers/auth.controller.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Response } from "express";
import { GaxiosError } from "gaxios";
import { TokenPayload } from "google-auth-library";
import { WithId } from "mongodb";
import { ObjectId, WithId } from "mongodb";
import supertokens from "supertokens-node";
import { SessionRequest } from "supertokens-node/framework/express";
import Session from "supertokens-node/recipe/session";
Expand All @@ -10,7 +10,6 @@ import { Logger } from "@core/logger/winston.logger";
import {
Result_Auth_Compass,
Result_VerifyGToken,
UserInfo_Compass,
} from "@core/types/auth.types";
import { gCalendar } from "@core/types/gcal";
import { Schema_User } from "@core/types/user.types";
Expand Down Expand Up @@ -38,28 +37,34 @@ import { initGoogleClient } from "../services/auth.utils";
const logger = Logger("app:auth.controller");

class AuthController {
createSession = async (req: ReqBody<UserInfo_Compass>, res: Res_Promise) => {
const { cUserId, email } = req.body;
createSession = async (
req: ReqBody<{ cUserId: string }>,
res: Res_Promise,
) => {
const { cUserId } = req.body;

if (!ObjectId.isValid(cUserId)) {
res.promise({ error: "Invalid user ID" });
return;
}

if (cUserId) {
const sUserId = supertokens.convertToRecipeUserId(cUserId);
await Session.createNewSession(req, res, "public", sUserId);
}

if (email) {
const user = await findCompassUserBy("email", email);

if (!user) {
res.promise({ error: "user doesn't exist" });
return;
}
const user = await findCompassUserBy("_id", cUserId);

const sUserId = supertokens.convertToRecipeUserId(user._id.toString());
await Session.createNewSession(req, res, "public", sUserId);
if (!user) {
res.promise({ error: "User doesn't exist" });
return;
}

const sUserId = supertokens.convertToRecipeUserId(user._id.toString());
await Session.createNewSession(req, res, "public", sUserId);

res.promise({
message: `user session created for ${JSON.stringify(req.body)}`,
message: `User session created for ${cUserId}`,
});
};

Expand Down
4 changes: 0 additions & 4 deletions packages/core/src/types/auth.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ export interface User_Google {
tokens: Credentials;
}

export interface UserInfo_Compass {
cUserId?: string;
email?: string;
}
export interface UserInfo_Google {
gUser: TokenPayload;
tokens: Credentials;
Expand Down