Use aliases by default

BYK · BYK · commit 516c1be3dd32 · 2022-01-06T16:11:57.000+03:00
diff --git a/constants.ts b/constants.ts
@@ -9,3 +9,11 @@ export const MAILING_DOMAIN = "to.pocketletter.cc";
 
 export const SIGNING_METHOD = "SHA256";
 export const CODE_COOKIE_NAME = "code";
+
+export type IPocketLetterEnv = {
+  POCKET_CONSUMER_KEY: string;
+  POCKET_TOKEN_KEY: string;
+  SIGNING_SECRET: string;
+  DATA: KVNamespace;
+  ALIASES: KVNamespace;
+};
diff --git a/functions/digest.ts b/functions/digest.ts
@@ -1,5 +1,5 @@
 import Toucan from "toucan-js";
-import {POCKET_ADD_URL} from "../constants";
+import {POCKET_ADD_URL, IPocketLetterEnv} from "../constants";
 import {signature, decrypt} from "../crypto";
 
 // Adapted from https://stackoverflow.com/a/66481918/90297
@@ -13,14 +13,6 @@ const makeHTML = (title: string, body: string) =>
   `<!DOCTYPE html>\n<html><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>${title}</title></head><body>${body}</body></html>`;
 const SUBJECT_CLEANER = /^((Re|Fwd?):\s*)+/i;
 
-type IPocketLetterEnv = {
-  POCKET_CONSUMER_KEY: string;
-  POCKET_TOKEN_KEY: string;
-  SIGNING_SECRET: string;
-  DATA: KVNamespace;
-  ALIASES: KVNamespace;
-};
-
 class LinkFinder {
   textMatcher =
     /(?:read|view) (?:\w+ )*(?:browser|online|web(?: ?page)?)|webpage|Share/i;
@@ -123,9 +115,10 @@ export const onRequest: PagesFunction<IPocketLetterEnv> = async ({
   ][0].split("@", 1);
   sentry.setUser({id: fromName});
 
-  const resolvedName = (await env.ALIASES.get(fromName)) || fromName;
+  const access_token =
+    (await env.ALIASES.get(fromName)) ||
+    decrypt(fromName, env.POCKET_TOKEN_KEY);
 
-  const pocketToken = decrypt(resolvedName, env.POCKET_TOKEN_KEY);
   const {html, directLink} = await processHTML(rawHtml);
 
   const url = directLink || (await storeLetter({env, request}, html));
@@ -134,8 +127,8 @@ export const onRequest: PagesFunction<IPocketLetterEnv> = async ({
   const postData = {
     url,
     title,
+    access_token,
     tags: "pocketletter",
-    access_token: pocketToken,
     consumer_key: env.POCKET_CONSUMER_KEY,
   };
 
diff --git a/functions/token/callback.ts b/functions/token/callback.ts
@@ -2,13 +2,13 @@ import {
   POCKET_OAUTH_AUTHORIZE_URL,
   CODE_COOKIE_NAME,
   MAILING_DOMAIN,
+  IPocketLetterEnv,
 } from "../../constants";
-import {encrypt} from "../../crypto";
 
-export const onRequest: PagesFunction<{
-  POCKET_CONSUMER_KEY: string;
-  POCKET_TOKEN_KEY: string;
-}> = async ({request, env}) => {
+export const onRequest: PagesFunction<IPocketLetterEnv> = async ({
+  request,
+  env,
+}) => {
   const cookies = Object.fromEntries(
     request.headers
       .get("Cookie")
@@ -32,13 +32,11 @@ export const onRequest: PagesFunction<{
   });
 
   const {username, access_token} = await response.json();
-  const address = `${encrypt(
-    access_token,
-    env.POCKET_TOKEN_KEY,
-  )}@${MAILING_DOMAIN}`;
+  await env.ALIASES.put(username, access_token);
+  const address = `${username}@${MAILING_DOMAIN}`;
 
   return new Response(
-    `Hi ${username}, your PocketLetter address is ${address}`,
+    `Hi ${username}, your just registered your PocketLetter address: ${address}`,
     {
       headers: {
         "Set-Cookie": `${CODE_COOKIE_NAME}=deleted; expires=Thu, 01 Jan 1970 00:00:00 GMT`,
