Merge pull request #10 from Code-Hex/update/packages

Code-Hex · web-flow · commit 0f05c3f9b347 · 2023-11-12T01:35:32.000+09:00
update any packages
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,3 @@
-dist
+dist
+vitest.config.ts
+.eslintrc.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -17,7 +17,7 @@ module.exports = defineConfig({
   },
   rules: {
     quotes: ['error', 'single'],
-    semi: ['error', 'never'],
+    semi: 'off',
     'no-debugger': ['error'],
     'no-empty': ['warn', { allowEmptyCatch: true }],
     'no-process-exit': 'off',
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,37 +8,25 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 17
-      - name: Cache Yarn
-        uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          node-version: 18
+          cache: 'yarn'
       - run: yarn install --frozen-lockfile
       - run: yarn test
         env:
           CI: true
   eslint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 18
-      - name: Cache Yarn
-        uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: 'yarn'
       - run: yarn install --frozen-lockfile
       - run: yarn lint-fix
       - run: yarn prettier
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -2,5 +2,6 @@
   "trailingComma": "es5",
   "printWidth": 120,
   "singleQuote": true,
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "semi": true
 }
diff --git a/jest.config.js b/jest.config.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase-auth-cloudflare-workers",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Zero-dependencies firebase auth library for Cloudflare Workers.",
   "author": "codehex",
   "license": "MIT",
@@ -13,7 +13,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "jest",
+    "test": "vitest run",
     "build": "run-p build:*",
     "build:main": "tsc -p tsconfig.main.json",
     "build:module": "tsc -p tsconfig.module.json",
@@ -27,24 +27,22 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@cloudflare/workers-types": "^3.14.0",
-    "@types/jest": "^28.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.30.5",
-    "@typescript-eslint/parser": "^5.30.5",
-    "eslint": "^8.19.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-define-config": "^1.5.1",
-    "eslint-import-resolver-typescript": "^3.2.4",
+    "@cloudflare/workers-types": "^4.20231025.0",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-define-config": "^1.24.1",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.26.0",
-    "firebase-tools": "^11.2.0",
-    "jest": "^28.1.2",
-    "jest-environment-miniflare": "^2.5.1",
+    "eslint-plugin-import": "^2.29.0",
+    "firebase-tools": "^12.8.1",
+    "miniflare": "^3.20231025.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.7.1",
-    "ts-jest": "^28.0.5",
-    "typescript": "^4.7.4",
-    "wrangler": "^2.0.16"
+    "prettier": "^3.0.3",
+    "typescript": "^5.2.2",
+    "vitest": "^0.34.6",
+    "wrangler": "^3.15.0"
   },
   "keywords": [
     "web",
diff --git a/src/base64.ts b/src/base64.ts
@@ -1,9 +1,9 @@
 export const decodeBase64Url = (str: string): Uint8Array => {
-  return decodeBase64(str.replace(/_|-/g, m => ({ _: '/', '-': '+' }[m] ?? m)));
+  return decodeBase64(str.replace(/_|-/g, m => ({ _: '/', '-': '+' })[m] ?? m));
 };
 
 export const encodeBase64Url = (buf: ArrayBufferLike): string =>
-  encodeBase64(buf).replace(/\/|\+/g, m => ({ '/': '_', '+': '-' }[m] ?? m));
+  encodeBase64(buf).replace(/\/|\+/g, m => ({ '/': '_', '+': '-' })[m] ?? m);
 
 // This approach is written in MDN.
 // btoa does not support utf-8 characters. So we need a little bit hack.
diff --git a/src/errors.ts b/src/errors.ts
@@ -6,7 +6,10 @@
  * @constructor
  */
 export class JwtError extends Error {
-  constructor(readonly code: JwtErrorCode, readonly message: string) {
+  constructor(
+    readonly code: JwtErrorCode,
+    readonly message: string
+  ) {
     super(message);
     (this as any).__proto__ = JwtError.prototype;
   }
@@ -160,7 +163,11 @@ export interface ErrorInfo {
  * @constructor
  */
 export class PrefixedFirebaseError extends FirebaseError {
-  constructor(private codePrefix: string, code: string, message: string) {
+  constructor(
+    private codePrefix: string,
+    code: string,
+    message: string
+  ) {
     super({
       code: `${codePrefix}/${code}`,
       message,
diff --git a/src/jwk-fetcher.ts b/src/jwk-fetcher.ts
@@ -17,7 +17,10 @@ const isJWKMetadata = (value: any): value is JWKMetadata =>
  * Class to fetch public keys from a client certificates URL.
  */
 export class UrlKeyFetcher implements KeyFetcher {
-  constructor(private readonly fetcher: Fetcher, private readonly keyStorer: KeyStorer) {}
+  constructor(
+    private readonly fetcher: Fetcher,
+    private readonly keyStorer: KeyStorer
+  ) {}
 
   /**
    * Fetches the public keys for the Google certs.
diff --git a/src/jwt-decoder.ts b/src/jwt-decoder.ts
@@ -28,7 +28,10 @@ export type DecodedToken = {
 };
 
 export class RS256Token {
-  constructor(private rawToken: string, public readonly decodedToken: DecodedToken) {}
+  constructor(
+    private rawToken: string,
+    public readonly decodedToken: DecodedToken
+  ) {}
   /**
    *
    * @param token - The JWT to verify.
diff --git a/src/key-store.ts b/src/key-store.ts
@@ -7,7 +7,10 @@ export interface KeyStorer {
  * Class to get or store fetched public keys from a client certificates URL.
  */
 export class WorkersKVStore implements KeyStorer {
-  constructor(private readonly cacheKey: string, private readonly cfKVNamespace: KVNamespace) {}
+  constructor(
+    private readonly cacheKey: string,
+    private readonly cfKVNamespace: KVNamespace
+  ) {}
 
   public async get<ExpectedValue = unknown>(): Promise<ExpectedValue | null> {
     return await this.cfKVNamespace.get<ExpectedValue>(this.cacheKey, 'json');
diff --git a/tests/base64.test.ts b/tests/base64.test.ts
@@ -1,7 +1,8 @@
+import { describe, it, expect } from 'vitest';
 import { decodeBase64Url, encodeBase64Url } from '../src/base64';
 import { utf8Encoder } from '../src/utf8';
 
-const urlRef = (s: string): string => s.replace(/\+|\//g, m => ({ '+': '-', '/': '_' }[m] ?? m));
+const urlRef = (s: string): string => s.replace(/\+|\//g, m => ({ '+': '-', '/': '_' })[m] ?? m);
 
 const str2UInt8Array = (s: string): Uint8Array => {
   const buffer = new Uint8Array(new ArrayBuffer(s.length));
diff --git a/tests/global.d.ts b/tests/global.d.ts
diff --git a/tests/jwk-fetcher.test.ts b/tests/jwk-fetcher.test.ts
@@ -1,3 +1,5 @@
+import { Miniflare } from 'miniflare';
+import { describe, it, expect, vi } from 'vitest';
 import type { Fetcher } from '../src/jwk-fetcher';
 import { parseMaxAge, UrlKeyFetcher } from '../src/jwk-fetcher';
 import { WorkersKVStore } from '../src/key-store';
@@ -10,7 +12,12 @@ class HTTPMockFetcher implements Fetcher {
   }
 }
 
-const { TEST_NAMESPACE } = getMiniflareBindings();
+const nullScript = 'export default { fetch: () => new Response(null, { status: 404 }) };';
+const mf = new Miniflare({
+  modules: true,
+  script: nullScript,
+  kvNamespaces: ['TEST_NAMESPACE'],
+});
 
 const validResponseJSON = `{
   "keys": [
@@ -62,9 +69,10 @@ describe('UrlKeyFetcher', () => {
         },
       })
     );
+    const TEST_NAMESPACE = await mf.getKVNamespace('TEST_NAMESPACE');
     const urlKeyFetcher = new UrlKeyFetcher(mockedFetcher, new WorkersKVStore(cacheKey, TEST_NAMESPACE));
 
-    const httpFetcherSpy = jest.spyOn(mockedFetcher, 'fetch');
+    const httpFetcherSpy = vi.spyOn(mockedFetcher, 'fetch');
 
     // first call (no-cache in KV)
     const firstKeys = await urlKeyFetcher.fetchPublicKeys();
@@ -92,9 +100,10 @@ describe('UrlKeyFetcher', () => {
         headers: {},
       })
     );
+    const TEST_NAMESPACE = await mf.getKVNamespace('TEST_NAMESPACE');
     const urlKeyFetcher = new UrlKeyFetcher(mockedFetcher, new WorkersKVStore(cacheKey, TEST_NAMESPACE));
 
-    const httpFetcherSpy = jest.spyOn(mockedFetcher, 'fetch');
+    const httpFetcherSpy = vi.spyOn(mockedFetcher, 'fetch');
 
     // first call (no-cache in KV)
     const firstKeys = await urlKeyFetcher.fetchPublicKeys();
@@ -107,36 +116,38 @@ describe('UrlKeyFetcher', () => {
     expect(httpFetcherSpy).toBeCalledTimes(2);
   });
 
-  it('internal server error fetch', () => {
+  it('internal server error fetch', async () => {
     const cacheKey = 'failed-fetch-flow-key';
     const internalServerMsg = 'Internal Server Error';
     const mockedFetcher = new HTTPMockFetcher(
       new Response(internalServerMsg, {
         status: 500,
       })
     );
+    const TEST_NAMESPACE = await mf.getKVNamespace('TEST_NAMESPACE');
     const urlKeyFetcher = new UrlKeyFetcher(mockedFetcher, new WorkersKVStore(cacheKey, TEST_NAMESPACE));
 
     expect(() => urlKeyFetcher.fetchPublicKeys()).rejects.toThrowError(
       'Error fetching public keys for Google certs: ' + internalServerMsg
     );
   });
 
-  it('ok fetch but got text response', () => {
+  it('ok fetch but got text response', async () => {
     const cacheKey = 'ok-fetch-non-json-flow-key';
     const mockedFetcher = new HTTPMockFetcher(
       new Response('{}', {
         status: 200,
       })
     );
+    const TEST_NAMESPACE = await mf.getKVNamespace('TEST_NAMESPACE');
     const urlKeyFetcher = new UrlKeyFetcher(mockedFetcher, new WorkersKVStore(cacheKey, TEST_NAMESPACE));
 
     expect(() => urlKeyFetcher.fetchPublicKeys()).rejects.toThrowError('The public keys are not an object or null:');
   });
 });
 
 describe('parseMaxAge', () => {
-  test.each([
+  it.each([
     ['valid simple', 'max-age=604800', 604800],
     ['valid with other directives', 'public, max-age=18793, must-revalidate, no-transform', 18793],
     ['invalid cache-control header is null', null, NaN],
diff --git a/tests/jwk-utils.ts b/tests/jwk-utils.ts
@@ -5,7 +5,10 @@ import type { DecodedHeader, DecodedPayload, JsonWebKeyWithKid } from '../src/jw
 import { utf8Encoder } from '../src/utf8';
 
 export class TestingKeyFetcher implements KeyFetcher {
-  constructor(public readonly kid: string, private readonly keyPair: CryptoKeyPair) {}
+  constructor(
+    public readonly kid: string,
+    private readonly keyPair: CryptoKeyPair
+  ) {}
 
   public static async withKeyPairGeneration(kid: string): Promise<TestingKeyFetcher> {
     const keyPair = await crypto.subtle.generateKey(rs256alg, true, ['sign', 'verify']);
diff --git a/tests/jws-verifier.test.ts b/tests/jws-verifier.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { JwtError, JwtErrorCode } from '../src/errors';
 import { PublicKeySignatureVerifier, rs256alg } from '../src/jws-verifier';
 import type { DecodedPayload } from '../src/jwt-decoder';
diff --git a/tests/jwt-decoder.test.ts b/tests/jwt-decoder.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { JwtError, JwtErrorCode } from '../src/errors';
 import type { DecodedHeader, DecodedPayload } from '../src/jwt-decoder';
 import { RS256Token } from '../src/jwt-decoder';
@@ -51,7 +52,7 @@ describe('TokenDecoder', () => {
   });
 
   describe('payload', () => {
-    test.each([
+    it.each([
       [
         'aud',
         {
diff --git a/tests/setup.ts b/tests/setup.ts
@@ -0,0 +1,4 @@
+import crypto from 'node:crypto';
+import { vi } from 'vitest';
+
+vi.stubGlobal('crypto', crypto);
diff --git a/tests/token-verifier.test.ts b/tests/token-verifier.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { PublicKeySignatureVerifier, rs256alg } from '../src/jws-verifier';
 import type { FirebaseIdToken } from '../src/token-verifier';
 import { createFirebaseTokenVerifier, FIREBASE_AUDIENCE } from '../src/token-verifier';
@@ -22,7 +23,7 @@ describe('FirebaseTokenVerifier', () => {
     },
   };
 
-  test.each([
+  it.each([
     ['valid without firebase emulator', payload],
     [
       'valid custom token without firebase emulator',
@@ -60,7 +61,7 @@ describe('FirebaseTokenVerifier', () => {
     expect(token).toStrictEqual(payload);
   });
 
-  test.each([
+  it.each([
     [
       'aud',
       {
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
diff --git a/tests/validator.test.ts b/tests/validator.test.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/vitest.config.ts b/vitest.config.ts
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -dist
 +dist
 +vitest.config.ts
 +.eslintrc.js
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"trailingComma": "es5",`
`3`	`3`	`"printWidth": 120,`
`4`	`4`	`"singleQuote": true,`
`5`		`- "arrowParens": "avoid"`
	`5`	`+ "arrowParens": "avoid",`
	`6`	`+ "semi": true`
`6`	`7`	`}`