refactor(remix-deno): implement crypto-dependent interface functions

remix-run · Mar 19, 2022 · be83e02 · be83e02
1 parent e83ae52
commit be83e02
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 29 deletions.
diff --git a/...lates/deno-ts/remix-deno/cookieSigning.ts → templates/deno-ts/remix-deno/crypto.ts b/...lates/deno-ts/remix-deno/cookieSigning.ts → templates/deno-ts/remix-deno/crypto.ts
@@ -1,6 +1,8 @@
+import type { SignFunction, UnsignFunction } from "./deps/@remix-run/server-runtime.ts"
+
 const encoder = new TextEncoder();
 
-export async function sign(value: string, secret: string): Promise<string> {
+export const sign: SignFunction = async (value, secret) => {
   const key = await crypto.subtle.importKey(
     "raw",
     encoder.encode(secret),
@@ -19,10 +21,7 @@ export async function sign(value: string, secret: string): Promise<string> {
   return value + "." + hash;
 }
 
-export async function unsign(
-  cookie: string,
-  secret: string
-): Promise<string | false> {
+export const unsign: UnsignFunction = async (cookie, secret) => {
   const key = await crypto.subtle.importKey(
     "raw",
     encoder.encode(secret),

diff --git a/templates/deno-ts/remix-deno/deps/@remix-run/server-runtime.ts b/templates/deno-ts/remix-deno/deps/@remix-run/server-runtime.ts
@@ -2,8 +2,13 @@ export type {
   ServerBuild,
   SessionIdStorageStrategy,
   SessionStorage,
+  Sign,
+  Unsign,
 } from "https://esm.sh/@remix-run/server-runtime?pin=v68";
 export {
+  createCookieFactory,
+  createCookieSessionStorageFactory,
+  createMemorySessionStorageFactory,
+  createSessionStorageFactory,
   createRequestHandler,
-  createSessionStorage,
 } from "https://esm.sh/@remix-run/server-runtime?pin=v68";
diff --git a/templates/deno-ts/remix-deno/globals.ts b/templates/deno-ts/remix-deno/globals.ts
diff --git a/templates/deno-ts/remix-deno/implementations.ts b/templates/deno-ts/remix-deno/implementations.ts
@@ -0,0 +1,13 @@
+import {
+  createCookieFactory,
+  createCookieSessionStorageFactory,
+  createMemorySessionStorageFactory,
+  createSessionStorageFactory,
+} from "./deps/@remix-run/server-runtime.ts";
+
+import { sign, unsign } from "./crypto.ts";
+
+export const createCookie = createCookieFactory({ sign, unsign });
+export const createCookieSessionStorage = createCookieSessionStorageFactory(createCookie);
+export const createSessionStorage = createSessionStorageFactory(createCookie);
+export const createMemorySessionStorage = createMemorySessionStorageFactory(createSessionStorage);
diff --git a/templates/deno-ts/remix-deno/index.ts b/templates/deno-ts/remix-deno/index.ts
@@ -1,13 +1,15 @@
-export { installGlobals } from './globals.ts'
 export { createFileSessionStorage } from './sessions/fileStorage.ts'
 export { createRequestHandler, createRequestHandlerWithStaticFiles, serveStaticFiles } from './server.ts'
 
 export {
   createCookie,
   createCookieSessionStorage,
   createMemorySessionStorage,
-  createSession,
   createSessionStorage,
+} from './implementations.ts';
+
+export {
+  createSession,
   isCookie,
   isSession,
   json,

diff --git a/templates/deno-ts/remix-deno/sessions/fileStorage.ts b/templates/deno-ts/remix-deno/sessions/fileStorage.ts
@@ -3,7 +3,7 @@ import type {
   SessionStorage,
   SessionIdStorageStrategy,
 } from "../deps/@remix-run/server-runtime.ts";
-import { createSessionStorage } from "../deps/@remix-run/server-runtime.ts";
+import { createSessionStorage } from "../implementations.ts";
 
 interface FileSessionStorageOptions {
   /**