Merge pull request #188 from takker99:csrf

refactor(REST API): Set the default CSRF token in `getCSRFToken`

Author: takker99

rest/auth.ts

@@ -2,7 +2,7 @@ import { createOk, mapForResult, type Result } from "option-t/plain_result";
 import { getProfile } from "./profile.ts";
 import type { HTTPError } from "./responseIntoResult.ts";
 import type { AbortError, NetworkError } from "./robustFetch.ts";
-import type { BaseOptions } from "./options.ts";
+import type { ExtendedOptions } from "./options.ts";
 
 /** HTTP headerのCookieに入れる文字列を作る
  *
@@ -15,13 +15,12 @@ export const cookie = (sid: string): string => `connect.sid=${sid}`;
  * @param init 認証情報など
  */
 export const getCSRFToken = async (
-  init?: BaseOptions,
-): Promise<Result<string, NetworkError | AbortError | HTTPError>> =>
+  init?: ExtendedOptions,
+): Promise<Result<string, NetworkError | AbortError | HTTPError>> => {
   // deno-lint-ignore no-explicit-any
-  (globalThis as any)._csrf
-    // deno-lint-ignore no-explicit-any
-    ? createOk((globalThis as any)._csrf)
-    : mapForResult(
-      await getProfile(init),
-      (user) => user.csrfToken,
-    );
+  const csrf = init?.csrf ?? (globalThis as any)._csrf;
+  return csrf ? createOk(csrf) : mapForResult(
+    await getProfile(init),
+    (user) => user.csrfToken,
+  );
+};

rest/getTweetInfo.ts

@@ -2,11 +2,9 @@ import {
   isErr,
   mapAsyncForResult,
   mapErrAsyncForResult,
-  orElseAsyncForResult,
   type Result,
   unwrapOk,
 } from "option-t/plain_result";
-import { toResultOkFromMaybe } from "option-t/maybe";
 import type {
   BadRequestError,
   InvalidURLError,
@@ -35,12 +33,9 @@ export const getTweetInfo = async (
   url: string | URL,
   init?: ExtendedOptions,
 ): Promise<Result<TweetInfo, TweetInfoError | FetchError>> => {
-  const { sid, hostName, fetch, csrf } = setDefaults(init ?? {});
+  const { sid, hostName, fetch } = setDefaults(init ?? {});
 
-  const csrfResult = await orElseAsyncForResult(
-    toResultOkFromMaybe(csrf),
-    () => getCSRFToken(init),
-  );
+  const csrfResult = await getCSRFToken(init);
   if (isErr(csrfResult)) return csrfResult;
 
   const req = new Request(

rest/getWebPageTitle.ts

@@ -2,11 +2,9 @@ import {
   isErr,
   mapAsyncForResult,
   mapErrAsyncForResult,
-  orElseAsyncForResult,
   type Result,
   unwrapOk,
 } from "option-t/plain_result";
-import { toResultOkFromMaybe } from "option-t/maybe";
 import type {
   BadRequestError,
   InvalidURLError,
@@ -34,12 +32,9 @@ export const getWebPageTitle = async (
   url: string | URL,
   init?: ExtendedOptions,
 ): Promise<Result<string, WebPageTitleError | FetchError>> => {
-  const { sid, hostName, fetch, csrf } = setDefaults(init ?? {});
+  const { sid, hostName, fetch } = setDefaults(init ?? {});
 
-  const csrfResult = await orElseAsyncForResult(
-    toResultOkFromMaybe(csrf),
-    () => getCSRFToken(init),
-  );
+  const csrfResult = await getCSRFToken(init);
   if (isErr(csrfResult)) return csrfResult;
 
   const req = new Request(

rest/page-data.ts

@@ -3,11 +3,9 @@ import {
   isErr,
   mapAsyncForResult,
   mapErrAsyncForResult,
-  orElseAsyncForResult,
   type Result,
   unwrapOk,
 } from "option-t/plain_result";
-import { toResultOkFromMaybe } from "option-t/maybe";
 import type {
   ExportedData,
   ImportedData,
@@ -41,7 +39,7 @@ export const importPages = async (
 > => {
   if (data.pages.length === 0) return createOk("No pages to import.");
 
-  const { sid, hostName, fetch, csrf } = setDefaults(init ?? {});
+  const { sid, hostName, fetch } = setDefaults(init ?? {});
   const formData = new FormData();
   formData.append(
     "import-file",
@@ -51,10 +49,7 @@ export const importPages = async (
   );
   formData.append("name", "undefined");
 
-  const csrfResult = await orElseAsyncForResult(
-    toResultOkFromMaybe(csrf),
-    () => getCSRFToken(init),
-  );
+  const csrfResult = await getCSRFToken(init);
   if (isErr(csrfResult)) return csrfResult;
 
   const req = new Request(

rest/replaceLinks.ts

@@ -2,11 +2,9 @@ import {
   isErr,
   mapAsyncForResult,
   mapErrAsyncForResult,
-  orElseAsyncForResult,
   type Result,
   unwrapOk,
 } from "option-t/plain_result";
-import { toResultOkFromMaybe } from "option-t/maybe";
 import type {
   NotFoundError,
   NotLoggedInError,
@@ -41,12 +39,9 @@ export const replaceLinks = async (
   to: string,
   init?: ExtendedOptions,
 ): Promise<Result<number, ReplaceLinksError | FetchError>> => {
-  const { sid, hostName, fetch, csrf } = setDefaults(init ?? {});
+  const { sid, hostName, fetch } = setDefaults(init ?? {});
 
-  const csrfResult = await orElseAsyncForResult(
-    toResultOkFromMaybe(csrf),
-    () => getCSRFToken(init),
-  );
+  const csrfResult = await getCSRFToken(init);
   if (isErr(csrfResult)) return csrfResult;
 
   const req = new Request(