Merge pull request #113 from ufabc-next/fix/bugs-sig-facebook

Ajuste para devolver login facebook + Correçoes na tabela de alunos
ufabc-next · Feb 10, 2025 · ede0191 · ede0191
2 parents 5289c40 + a96f756
commit ede0191
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 34 deletions.
diff --git a/apps/core/src/models/Student.ts b/apps/core/src/models/Student.ts
@@ -19,7 +19,7 @@ const studentSchema = new Schema(
   {
     ra: { type: Number },
     login: { type: String, required: true },
-    aluno_id: { type: Number, required: true, default: null },
+    aluno_id: { type: Number, required: false },
     cursos: [coursesSchema],
     year: { type: Number, required: false },
     quad: {

diff --git a/apps/core/src/routes/autohooks.ts b/apps/core/src/routes/autohooks.ts
@@ -15,6 +15,7 @@ const PUBLIC_ROUTES = [
   '/entities/students',
   '/public/stats/components',
   '/users/check-email',
+  '/users/facebook/email',
 ];
 
 const isPublicRoute = (url: string): boolean => {

diff --git a/apps/core/src/routes/entities/students/service.ts b/apps/core/src/routes/entities/students/service.ts
@@ -107,7 +107,7 @@ type CreateStudent = {
 type UpdateStudent = {
   ra: number;
   login: string;
-  studentId: number;
+  studentId: number | null | undefined;
 };
 
 export async function createOrInsert({
@@ -117,6 +117,7 @@ export async function createOrInsert({
   graduations,
 }: CreateStudent) {
   const season = currentQuad();
+
   const student = await StudentModel.findOneAndUpdate(
     {
       aluno_id: studentId,
@@ -141,6 +142,10 @@ export async function update({ ra, login, studentId }: UpdateStudent) {
     return null;
   }
 
+  if (student.aluno_id) {
+    return student;
+  }
+
   student.aluno_id = studentId;
 
   await student.save();

diff --git a/apps/core/src/routes/users/index.ts b/apps/core/src/routes/users/index.ts
@@ -8,6 +8,8 @@ import {
 import {
   confirmUserSchema,
   deactivateUserSchema,
+  getFacebookUserEmailSchema,
+  loginFacebookSchema,
   resendEmailSchema,
   validateUserEmailSchema,
 } from '@/schemas/user.js';
@@ -42,32 +44,57 @@ const plugin: FastifyPluginAsyncZodOpenApi = async (app) => {
     return userInfo;
   });
 
-  // app.post(
-  //   '/facebook',
-  //   { schema: loginFacebookSchema },
-  //   async (request, reply) => {
-  //     const user = await UserModel.findOne({
-  //       ra: request.body.ra,
-  //       'oauth.emailFacebook': request.body.email,
-  //     });
-
-  //     if (!user) {
-  //       return reply.notFound('User not found');
-  //     }
-
-  //     const jwtToken = app.jwt.sign(
-  //       {
-  //         studentId: user._id.toJSON(),
-  //         active: user.active,
-  //         confirmed: user.confirmed,
-  //         email: user.email,
-  //       },
-  //       { expiresIn: '2d' },
-  //     );
-
-  //     return { success: true, token: jwtToken };
-  //   },
-  // );
+  app.get(
+    '/facebook/email',
+    { schema: getFacebookUserEmailSchema },
+    async (request, reply) => {
+      const { ra } = request.query;
+
+      const user = await UserModel.findOne({
+        ra,
+      }).lean();
+
+      if (!user) {
+        return reply.notFound('Usuario não encontrado');
+      }
+
+      if (!user.oauth?.emailFacebook || !user.oauth.email) {
+        return reply.badRequest('Usuario nao possui conta do facebook');
+      }
+
+      return {
+        email: user.email,
+      };
+    },
+  );
+
+  app.post(
+    '/facebook',
+    { schema: loginFacebookSchema },
+    async (request, reply) => {
+      const user = await UserModel.findOne({
+        ra: request.body.ra,
+        email: request.body.email,
+        'oauth.facebook': { $exists: true },
+      });
+
+      if (!user) {
+        return reply.notFound('Usuario não encontrado');
+      }
+
+      const jwtToken = app.jwt.sign(
+        {
+          studentId: user._id.toJSON(),
+          active: user.active,
+          confirmed: user.confirmed,
+          email: user.email,
+        },
+        { expiresIn: '2d' },
+      );
+
+      return { success: true, token: jwtToken };
+    },
+  );
 
   app.post('/resend', { schema: resendEmailSchema }, async (request, reply) => {
     const user = await UserModel.findOne({

diff --git a/apps/core/src/schemas/entities/students.ts b/apps/core/src/schemas/entities/students.ts
@@ -5,7 +5,7 @@ import type { FastifyZodOpenApiSchema } from 'fastify-zod-openapi';
 const tags = ['Students'];
 
 const listMatriculaStudentSchema = z.object({
-  studentId: z.number().int().nullable(),
+  studentId: z.number().int().nullish(),
   graduations: z
     .object({
       courseId: z.number().int(),
@@ -68,7 +68,7 @@ export const listStudentSchema = {
       content: {
         'application/json': {
           schema: z.object({
-            studentId: z.number().int(),
+            studentId: z.number().int().nullish(),
             login: z.string(),
           }),
         },
@@ -108,10 +108,10 @@ export const updateStudentSchema = {
     login: z.string().openapi({
       example: 'john.doe',
     }),
-    studentId: z.number().int(),
+    studentId: z.number().int().nullable(),
   }),
   response: {
-    204: {
+    200: {
       content: {
         'application/json': {
           schema: z.object({

diff --git a/apps/core/src/schemas/user.ts b/apps/core/src/schemas/user.ts
@@ -1,8 +1,10 @@
 import type { FastifyZodOpenApiSchema } from 'fastify-zod-openapi';
 import { z } from 'zod';
 
+const tags = ['User'];
+
 export const deactivateUserSchema = {
-  tags: ['User'],
+  tags,
   response: {
     200: {
       content: {
@@ -29,7 +31,7 @@ export const deactivateUserSchema = {
 } satisfies FastifyZodOpenApiSchema;
 
 export const resendEmailSchema = {
-  tags: ['User'],
+  tags,
   response: {
     200: {
       content: {
@@ -81,6 +83,7 @@ export const confirmUserSchema = {
 } satisfies FastifyZodOpenApiSchema;
 
 export const validateUserEmailSchema = {
+  tags,
   querystring: z.object({
     ra: z.string().describe('Student ID (RA) of the user to validate'),
   }),
@@ -109,3 +112,39 @@ export const validateUserEmailSchema = {
     },
   },
 } satisfies FastifyZodOpenApiSchema;
+
+export const getFacebookUserEmailSchema = {
+  tags,
+  querystring: z.object({
+    ra: z.string(),
+  }),
+  response: {
+    400: {
+      content: {
+        'application/json': {
+          schema: z.object({
+            message: z.string(),
+          }),
+        },
+      },
+    },
+    404: {
+      content: {
+        'application/json': {
+          schema: z.object({
+            message: z.string(),
+          }),
+        },
+      },
+    },
+    200: {
+      content: {
+        'application/json': {
+          schema: z.object({
+            email: z.string().email(),
+          }),
+        },
+      },
+    },
+  },
+} satisfies FastifyZodOpenApiSchema;