chore: upgrade to deno_kv_oauth@v0.2.4 (#283)

deno.json

@@ -29,7 +29,7 @@
     "stripe": "https://esm.sh/stripe@12.6.0",
     "feed": "https://esm.sh/feed@4.2.2",
     "fresh_charts/": "https://deno.land/x/fresh_charts@0.2.1/",
-    "deno_kv_oauth": "https://deno.land/x/deno_kv_oauth@v0.1.8-beta/mod.ts",
+    "kv_oauth": "https://deno.land/x/deno_kv_oauth@v0.2.4/mod.ts",
     "@twind/core": "https://esm.sh/@twind/core@1.1.3"
   }
 }

routes/_middleware.ts

@@ -1,7 +1,7 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
 import { MiddlewareHandlerContext } from "$fresh/server.ts";
 import { walk } from "std/fs/walk.ts";
-import { getSessionId } from "deno_kv_oauth";
+import { getSessionId } from "kv_oauth";
 import { setRedirectUrlCookie } from "@/utils/redirect.ts";
 
 export interface State {
@@ -24,7 +24,8 @@ export async function handler(
     return await ctx.next();
   }
 
-  ctx.state.sessionId = getSessionId(req);
+  /** @todo Review once https://github.com/denoland/deno_kv_oauth/pull/126 is closed */
+  ctx.state.sessionId = await getSessionId(req) ?? undefined;
 
   const res = await ctx.next();
 

routes/callback.ts

@@ -8,8 +8,8 @@ import {
 } from "@/utils/db.ts";
 import { stripe } from "@/utils/payments.ts";
 import { State } from "./_middleware.ts";
-import { handleCallback } from "deno_kv_oauth";
-import { client } from "@/utils/kv_oauth.ts";
+import { handleCallback } from "kv_oauth";
+import { oauth2Client } from "@/utils/oauth2_client.ts";
 import {
   deleteRedirectUrlCookie,
   getRedirectUrlCookie,
@@ -38,7 +38,7 @@ export const handler: Handlers<any, State> = {
   async GET(req) {
     const { response, accessToken, sessionId } = await handleCallback(
       req,
-      client,
+      oauth2Client,
       getRedirectUrlCookie(req.headers),
     );
 

routes/signin.ts

@@ -2,8 +2,8 @@
 import type { Handlers } from "$fresh/server.ts";
 import type { State } from "./_middleware.ts";
 import { redirect } from "@/utils/redirect.ts";
-import { signIn } from "deno_kv_oauth";
-import { client } from "@/utils/kv_oauth.ts";
+import { signIn } from "kv_oauth";
+import { oauth2Client } from "@/utils/oauth2_client.ts";
 
 // deno-lint-ignore no-explicit-any
 export const handler: Handlers<any, State> = {
@@ -12,6 +12,8 @@ export const handler: Handlers<any, State> = {
    * If not logged in, it continues to rendering the login page.
    */
   async GET(req, ctx) {
-    return ctx.state.sessionId ? redirect("/") : await signIn(req, client);
+    return ctx.state.sessionId
+      ? redirect("/")
+      : await signIn(req, oauth2Client);
   },
 };

routes/signout.ts

@@ -2,7 +2,7 @@
 import type { Handlers } from "$fresh/server.ts";
 import type { State } from "./_middleware.ts";
 import { deleteUserBySession } from "@/utils/db.ts";
-import { signOut } from "deno_kv_oauth";
+import { signOut } from "kv_oauth";
 
 // deno-lint-ignore no-explicit-any
 export const handler: Handlers<any, State> = {

utils/oauth2_client.ts

@@ -0,0 +1,4 @@
+// Copyright 2023 the Deno authors. All rights reserved. MIT license.
+import { createGitHubOAuth2Client } from "kv_oauth";
+
+export const oauth2Client = createGitHubOAuth2Client();