change preHandler on preValidation and change scheme on signOut

mk1020 · Jun 15, 2021 · da5de89 · da5de89
1 parent a1dc4c7
commit da5de89
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/app/components/auth/signOut.ts b/app/components/auth/signOut.ts
@@ -1,27 +1,21 @@
-import {
-  FastifyInstance,
-  FastifyReply,
-  FastifyRequest,
-  RouteShorthandOptions,
-} from 'fastify';
-
-export const options: RouteShorthandOptions = {
-  schema: {
-    body: {
-      type: 'object',
-      required: ['token'],
-      properties: {
-        token: {type: 'string'},
-      },
+import {FastifyInstance, FastifySchema} from 'fastify';
+import {checkToken} from '@/hooks';
+//todo во всех схемах добавить описание хедеров как тут
+export const options: FastifySchema = {
+  headers: {
+    type: 'object',
+    required: ['token'],
+    properties: {
+      token: {type: 'string'},
     },
-    response: {
-      200: {
-        type: 'string',
-      },
-      404: {
-        type: 'string'
-      }
+  },
+  response: {
+    200: {
+      type: 'boolean',
     },
+    404: {
+      type: 'boolean'
+    }
   },
 };
 interface IBody {
@@ -30,11 +24,11 @@ interface IBody {
 export const signOut = async (server: FastifyInstance) => {
   server.delete<{Body: IBody}>(
     '/signout',
-    options,
+    {schema: options, preValidation: checkToken},
     async (req, reply) => {
       const {rowCount} = await server.pg.query('delete from root.users_access where token = $1 AND expires > current_timestamp', [req.body.token]);
 
-      rowCount ? reply.send() : reply.status(500).send();
+      rowCount ? reply.send(false) : reply.status(500).send(true);
     }
   );
 };
diff --git a/app/components/children/children.ts b/app/components/children/children.ts
@@ -23,7 +23,7 @@ interface IHeaders {
 export const children = async (server: FastifyInstance) => {
   server.post<{ Body: IBodyPost, Headers: IHeaders }>(
     '/children',
-    {schema: schemePost, preHandler: checkToken},
+    {schema: schemePost, preValidation: checkToken},
     async (req, reply) => {
       const {children} = req.body;
       const {userId} = req.headers;
@@ -54,7 +54,7 @@ export const children = async (server: FastifyInstance) => {
 
   server.delete<{ Params: IParamsDelete }>(
     '/children/:id',
-    {schema: schemeDelete, preHandler: checkToken},
+    {schema: schemeDelete, preValidation: checkToken},
     async (req, reply) => {
       const {id} = req.params;
 

diff --git a/app/components/diary/note.ts b/app/components/diary/note.ts
@@ -11,7 +11,7 @@ interface IHeaders {
 export const note = async (server: FastifyInstance) => {
   server.post<{ Body: INoteBodyPost, Headers: IHeaders }>(
     '/diary-note',
-    {schema: noteSchemePost, preHandler: checkToken},
+    {schema: noteSchemePost, preValidation: checkToken},
     async (req, reply) => {
       const {userId} = req.headers;
       const {note} = req.body;
@@ -53,7 +53,7 @@ export const note = async (server: FastifyInstance) => {
 
   server.patch<{ Body: INoteBodyPatch, Headers: IHeaders }>(
     '/diary-note',
-    {schema: noteSchemePost, preHandler: checkToken},
+    {schema: noteSchemePost, preValidation: checkToken},
     async (req, reply) => {
       const {userId} = req.headers;
       const {note} = req.body;

diff --git a/app/components/mainScreen/mainScreen.ts b/app/components/mainScreen/mainScreen.ts
@@ -9,7 +9,7 @@ interface IHeaders {
 export const mainScreen = async (server: FastifyInstance) => {
   server.get<{ Headers: IHeaders }>(
     '/mainScreen',
-    {schema: schemeGet, preHandler: checkToken},
+    {schema: schemeGet, preValidation: checkToken},
     async (req, reply) => {
       const {userId} = req.headers;
 

diff --git a/app/components/users/users.ts b/app/components/users/users.ts
@@ -15,7 +15,7 @@ interface IBodyPatch {
 export const users = async (server: FastifyInstance) => {
   server.patch<{ Body: IBodyPatch }>(
     '/users',
-    {schema: schemePatch, preHandler: checkToken},
+    {schema: schemePatch, preValidation: checkToken},
     async (req, reply) => {
       const {conceptionDate, dateEnd, gestationalAge, lastMenstruationDate, userId, cycleDuration, deletePregnant} = req.body;
 

diff --git a/app/hooks/index.ts b/app/hooks/index.ts
@@ -13,7 +13,7 @@ interface IHeaders {
   userId?: number
 }
 export const checkToken = async <A, B, C, RouteGeneric> (req: FastifyRequest<RouteGeneric & {Body?: IBody, Headers?: IHeaders}>, reply: FastifyReply) => {
-  const token = req.body?.token || req.headers?.token;
+  const token = req.headers?.token;
 
   if (token) {
     const {rows} = await server.pg.query('select user_id from root.users_access where token=$1 AND expires > current_timestamp', [token]);