Skip to content

Commit eab67a8

Browse files
committed
Some minor fixes needed for ouath and signin
1 parent 672bdb3 commit eab67a8

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/controllers/member.controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const listAllApprovedMembers = async (req: Request, res: Response) => {
1010

1111
const {email, password} = req.query;
1212

13-
if(email) {
13+
if(email && password) {
1414

1515
const user = await memberService.getUserByEmail(email as string, password as string);
1616

@@ -45,7 +45,7 @@ export const getUserDetails = async (req: Request, res: Response) => {
4545
// Create a new member
4646
export const createAMember =
4747
(supabase: SupabaseClient) => async (req: Request, res: Response) => {
48-
const { email, name, password, passoutYear } = req.body;
48+
const {email, name, password, passoutYear, provider} = req.body;
4949

5050
if (!email || !name || !password || !passoutYear) {
5151
throw new ApiError("Required fields absent", 400);
@@ -62,6 +62,7 @@ export const createAMember =
6262
password,
6363
passoutYear,
6464
imageUrl,
65+
provider,
6566
);
6667

6768
if (!user) throw new ApiError("Error creating user", 500);

src/services/member.service.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,25 @@ export const getDetails = async (memberId: string) => {
3939
export const createMember = async (
4040
email: string,
4141
name: string,
42-
password: string,
43-
passoutYear: number,
42+
provider: "google" | "github" | "credentials",
43+
passoutYear?: number,
4444
imageUrl?: string,
45+
password?: string
4546
) => {
4647
const newMember = await prisma.member.create({
4748
data: {
48-
email: email,
49-
name: name,
50-
passoutYear: new Date(passoutYear),
49+
email,
50+
name,
51+
passoutYear: passoutYear === undefined ? "" : new Date(passoutYear),
5152
profilePhoto: imageUrl,
5253
},
5354
});
5455

5556
await prisma.account.create({
5657
data: {
57-
provider: "credentials",
58+
provider,
5859
providerAccountId: email,
59-
password: password,
60+
password: provider === "credentials" ? password : null,
6061
memberId: newMember.id,
6162
},
6263
});

0 commit comments

Comments
 (0)