modification signUot and token preHandler checkToken

Author: mk1020

app/components/auth/signOut.ts

@@ -32,8 +32,9 @@ export const signOut = async (server: FastifyInstance) => {
     '/signout',
     options,
     async (req, reply) => {
-      await server.pg.query('delete from root.users_access where token = $1', [req.body.token]);
-      reply.send();
+      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();
     }
   );
 };

app/hooks/index.ts

@@ -16,12 +16,12 @@ export const checkToken = async <A, B, C, RouteGeneric> (req: FastifyRequest<Rou
   const token = req.body?.token || req.headers?.token;
 
   if (token) {
-    const {rows} = await server.pg.query('select user_id from root.users_access where token=$1', [token]);
+    const {rows} = await server.pg.query('select user_id from root.users_access where token=$1 AND expires > current_timestamp', [token]);
     if (!rows.length) {
       reply.status(401).send();
       return reply;
     }
-    req.headers.userId = rows[0].user_id;
+    req.headers.userId = rows[0].user_id;//todo проверить что отдается в ответе от сервера
   } else {
     reply.status(401).send();
     return reply;