chore: update session

fastrodev · Sep 8, 2024 · 8be6c2c · 8be6c2c
1 parent a7cb824
commit 8be6c2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/modules/auth/mod.tsx b/modules/auth/mod.tsx
@@ -87,23 +87,23 @@ async function getUser(accessToken: string) {
   return data;
 }
 
-export const callbackHandler = async (req: HttpRequest) => {
+export const callbackHandler = async (req: HttpRequest, ctx: Context) => {
   try {
     const { response, sessionId, tokens } = await handleCallback(
       req,
     );
     const user = await getUser(tokens.accessToken);
-    kv.set([sessionId], user, { expireIn: 60 * 60 * 1000 });
+    ctx.server.serverOptions[sessionId] = user;
     return response;
   } catch {
     return new Response(null, { status: STATUS_CODE.InternalServerError });
   }
 };
 
-export const signoutHandler = async (req: HttpRequest) => {
+export const signoutHandler = async (req: HttpRequest, ctx: Context) => {
   const sessionId = await getSessionId(req);
   if (!sessionId) throw new Error("session ID is undefined");
-  await kv.delete([sessionId]);
+  ctx.server.serverOptions[sessionId] = undefined;
   return await signOut(req);
 };
 

diff --git a/modules/blog/mod.ts b/modules/blog/mod.ts
@@ -2,7 +2,6 @@ import { Fastro } from "@app/mod.ts";
 import tocLayout from "@app/modules/toc/toc.layout.tsx";
 import tocApp from "@app/modules/toc/toc.page.tsx";
 import { getSessionId } from "@app/modules/auth/mod.tsx";
-import { kv } from "@app/utils/db.ts";
 
 export default function (s: Fastro) {
     s.page("/blog", {
@@ -16,8 +15,7 @@ export default function (s: Fastro) {
             let avatar_url = "";
             let html_url = "";
             if (sessionId) {
-                // deno-lint-ignore no-explicit-any
-                const r = await kv.get([sessionId]) as any;
+                const r = ctx.server.serverOptions[sessionId];
                 if (r && r.value) {
                     avatar_url = r.value.avatar_url;
                     html_url = r.value.html_url;

diff --git a/modules/docs/mod.ts b/modules/docs/mod.ts
@@ -3,7 +3,6 @@ import tocLayout from "@app/modules/toc/toc.layout.tsx";
 import tocApp from "@app/modules/toc/toc.page.tsx";
 import { docToc } from "@app/modules/docs/docs.layout.tsx";
 import { getSessionId } from "@app/modules/auth/mod.tsx";
-import { kv } from "@app/utils/db.ts";
 
 export default function (s: Fastro) {
     s.page("/docs", {
@@ -17,8 +16,7 @@ export default function (s: Fastro) {
             let avatar_url = "";
             let html_url = "";
             if (sessionId) {
-                // deno-lint-ignore no-explicit-any
-                const r = await kv.get([sessionId]) as any;
+                const r = ctx.server.serverOptions[sessionId];
                 if (r && r.value) {
                     avatar_url = r.value.avatar_url;
                     html_url = r.value.html_url;

diff --git a/modules/index/mod.ts b/modules/index/mod.ts
@@ -2,7 +2,6 @@ import { Fastro, HttpRequest } from "@app/mod.ts";
 import indexApp from "@app/modules/index/index.page.tsx";
 import index from "@app/modules/index/index.layout.tsx";
 import { getSessionId } from "@app/modules/auth/mod.tsx";
-import { kv } from "@app/utils/db.ts";
 
 function init() {
     const basePath = Deno.env.get("DENO_DEPLOYMENT_ID")
@@ -42,9 +41,7 @@ export default function (s: Fastro) {
             let avatar_url = "";
             let html_url = "";
             if (sessionId) {
-                // deno-lint-ignore no-explicit-any
-                const r = await kv.get([sessionId]) as any;
-                console.log("r ==>", r);
+                const r = ctx.server.serverOptions[sessionId];
                 if (r && r.value) {
                     avatar_url = r.value.avatar_url;
                     html_url = r.value.html_url;