From e7b341fc2dee4fd1fe707418e19a457d9957e648 Mon Sep 17 00:00:00 2001
From: MTG2000 <mtg0987654321@gmail.com>
Date: Thu, 9 Jun 2022 13:37:38 +0300
Subject: [PATCH] logs

---
 api/functions/graphql/index.js             | 13 ++++++++-----
 api/functions/is-logged-in/is-logged-in.js |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/api/functions/graphql/index.js b/api/functions/graphql/index.js
index db81a34..5361558 100644
--- a/api/functions/graphql/index.js
+++ b/api/functions/graphql/index.js
@@ -2,17 +2,20 @@ const { ApolloServer } = require("apollo-server-lambda");
 const schema = require('./schema')
 const cookie = require('cookie')
 const jose = require('jose');
-const { createExpressApp } = require("../../modules");
 const { JWT_SECRET } = require("../../utils/consts");
 
 const extractKey = async (cookieHeader) => {
   const cookies = cookie.parse(cookieHeader ?? '');
   const token = cookies.Authorization;
   if (token) {
-    const { payload } = await jose.jwtVerify(token, Buffer.from(JWT_SECRET), {
-      algorithms: ['HS256'],
-    })
-    return payload.pubKey
+    try {
+      const { payload } = await jose.jwtVerify(token, Buffer.from(JWT_SECRET), {
+        algorithms: ['HS256'],
+      })
+      return payload.pubKey
+    } catch (error) {
+      return null
+    }
   }
   return null;
 }
diff --git a/api/functions/is-logged-in/is-logged-in.js b/api/functions/is-logged-in/is-logged-in.js
index 42439d0..4799757 100644
--- a/api/functions/is-logged-in/is-logged-in.js
+++ b/api/functions/is-logged-in/is-logged-in.js
@@ -19,20 +19,21 @@ const isLoggedInHandler = async (req, res) => {
                 algorithms: ['HS256'],
             });
             const hash = payload.hash;
+            console.log(hash);
             const token = await getAuthTokenByHash(hash);
-
+            console.log(token);
 
             lnurlService.removeHash(hash).catch();
             lnurlService.removeExpiredHashes().catch();
 
             res
                 .status(200)
-                .cookie('Authorization', token, {
-                    maxAge: 3600000 * 24 * 30,
+                .clearCookie('login_session', {
                     secure: true,
                     httpOnly: true,
                 })
-                .clearCookie('login_session', {
+                .cookie('Authorization', token, {
+                    maxAge: 3600000 * 24 * 30,
                     secure: true,
                     httpOnly: true,
                 })