From 327962432aa9c79732d8df4383c3ee1edf977240 Mon Sep 17 00:00:00 2001 From: Dream Hunter Date: Sat, 26 Apr 2025 20:56:47 +0800 Subject: [PATCH] fix: some oauth2 need redirect_uri when get token (#643) --- frontend/package.json | 4 +- frontend/pnpm-lock.yaml | 118 +++++++++--------- .../src/views/admin/UserOauth2Settings.vue | 2 +- pages/package.json | 2 +- scripts/update-dependencies.sh | 2 +- vitepress-docs/package.json | 2 +- vitepress-docs/pnpm-lock.yaml | 76 +++++------ worker/package.json | 6 +- worker/pnpm-lock.yaml | 110 ++++++++-------- worker/src/user_api/oauth2.ts | 1 + 10 files changed, 162 insertions(+), 161 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 7086876e..9ae698e4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,12 +41,12 @@ "@vitejs/plugin-vue": "^5.2.3", "unplugin-auto-import": "^19.1.2", "unplugin-vue-components": "^28.5.0", - "vite": "^6.3.2", + "vite": "^6.3.3", "vite-plugin-pwa": "^1.0.0", "vite-plugin-top-level-await": "^1.5.0", "vite-plugin-wasm": "^3.4.1", "workbox-build": "^7.3.0", "workbox-window": "^7.3.0", - "wrangler": "^4.13.0" + "wrangler": "^4.13.1" } } diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 82e825bf..a57e2370 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -62,7 +62,7 @@ importers: version: 0.13.0 '@vitejs/plugin-vue': specifier: ^5.2.3 - version: 5.2.3(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0))(vue@3.5.13(typescript@5.4.5)) + version: 5.2.3(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0))(vue@3.5.13(typescript@5.4.5)) unplugin-auto-import: specifier: ^19.1.2 version: 19.1.2(@vueuse/core@12.8.2(typescript@5.4.5)) @@ -70,17 +70,17 @@ importers: specifier: ^28.5.0 version: 28.5.0(@babel/parser@7.27.0)(vue@3.5.13(typescript@5.4.5)) vite: - specifier: ^6.3.2 - version: 6.3.2(@types/node@22.10.5)(terser@5.39.0) + specifier: ^6.3.3 + version: 6.3.3(@types/node@22.10.5)(terser@5.39.0) vite-plugin-pwa: specifier: ^1.0.0 - version: 1.0.0(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0) + version: 1.0.0(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0) vite-plugin-top-level-await: specifier: ^1.5.0 - version: 1.5.0(rollup@2.79.2)(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0)) + version: 1.5.0(rollup@2.79.2)(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0)) vite-plugin-wasm: specifier: ^3.4.1 - version: 3.4.1(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0)) + version: 3.4.1(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0)) workbox-build: specifier: ^7.3.0 version: 7.3.0 @@ -88,8 +88,8 @@ importers: specifier: ^7.3.0 version: 7.3.0 wrangler: - specifier: ^4.13.0 - version: 4.13.0 + specifier: ^4.13.1 + version: 4.13.1 packages: @@ -601,32 +601,32 @@ packages: workerd: optional: true - '@cloudflare/workerd-darwin-64@1.20250422.0': - resolution: {integrity: sha512-2FWl8TLpC4Knuyw8GmNgUSoJCNJNNGJ7Xv90j2n8FiXR5Clp9jSpm2ovK8RP9P751yX1/iIp8e7QufR/XDB6ow==} + '@cloudflare/workerd-darwin-64@1.20250424.0': + resolution: {integrity: sha512-E+9tyQfwKwg7iz+vI50UeF9m9MhO6uCTnn6VPBTobhgi0rKcfmCteUGz6YJejG6ex9OIfFHg/tIcr1+ywGZtiA==} engines: {node: '>=16'} cpu: [x64] os: [darwin] - '@cloudflare/workerd-darwin-arm64@1.20250422.0': - resolution: {integrity: sha512-GY3W74ivqxsYldacEbMtcSbG7LsS9hPo5UybKIw4RO9GzP7UC5WGnPfuI4PE2SnJOnw7nwSrBLuhGRPe/QQHkQ==} + '@cloudflare/workerd-darwin-arm64@1.20250424.0': + resolution: {integrity: sha512-5vReSs+Gx4vPNR3zoU3a7BVBoTEc7aoe2gGcaxSSQKMOvVkp3bo9poOGZbISodhYnCCRXltZcl8Vgyi0l/YZLA==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] - '@cloudflare/workerd-linux-64@1.20250422.0': - resolution: {integrity: sha512-mtNkEygKtlRq9pMRlm9J4nX4uVHU1AtJ3mSkdNwPwhisTpo989O5Zd0SH9CYwAk8+NmlZsXELpODUVQxQ7FJgw==} + '@cloudflare/workerd-linux-64@1.20250424.0': + resolution: {integrity: sha512-8kBNy7LpW/E4XKGrx/1Xql3Hfy8viDb+tFudu+sN/b6A2tNczNoOzDyNeWeWa99/zfyzncah1l0Wl2RBmVvY+Q==} engines: {node: '>=16'} cpu: [x64] os: [linux] - '@cloudflare/workerd-linux-arm64@1.20250422.0': - resolution: {integrity: sha512-ILlW4/kAoFJvSryrr/QJsiHBdMTf/fjUrIM0hxeuQue8zIEvAVqM1tzpUh8bPJT6AQEbk5ziwkfucA939Z6Tnw==} + '@cloudflare/workerd-linux-arm64@1.20250424.0': + resolution: {integrity: sha512-R4wLZNobQo5K96e3BEaTwCbZhyspeoW81k/yrkSRseLpSoIpLNguw6ckk5sGCjUkXEZQyu9TG6PzdYqlQo70gw==} engines: {node: '>=16'} cpu: [arm64] os: [linux] - '@cloudflare/workerd-windows-64@1.20250422.0': - resolution: {integrity: sha512-O2f6f7oxU/oaWX/3/5d/9qvzNSKsw72RsQFjpew2va7KwnnUciI2LnbYR6KYOqRGYrEoiMJxpWPQaYaFVj8t1w==} + '@cloudflare/workerd-windows-64@1.20250424.0': + resolution: {integrity: sha512-uwzZhNaKjJKq6NGFPd0hQWecpf5OTZCrlWKQZm4kkufZ7uIzkn5t3kOjh/J3L9puM/GvIPxCiDUE2aG66P6YxA==} engines: {node: '>=16'} cpu: [x64] os: [win32] @@ -1812,8 +1812,8 @@ packages: engines: {node: '>=0.10.0'} hasBin: true - electron-to-chromium@1.5.140: - resolution: {integrity: sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==} + electron-to-chromium@1.5.142: + resolution: {integrity: sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w==} entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} @@ -2329,8 +2329,8 @@ packages: engines: {node: '>=10.0.0'} hasBin: true - miniflare@4.20250422.0: - resolution: {integrity: sha512-3frXK9EZEWQkHMDyppeIbUKwd7OQkNOm2gBtQQzjQ4gtzQmh+yxkyJiiylf+fGbz86djQTLKKQdQ1FC4yM3AMg==} + miniflare@4.20250424.0: + resolution: {integrity: sha512-eROPDAx4KCIFtfRyRV9d3FJaF94UjW57gRUZz7gk2wyyOuHYVVJnWWyWrZfvRqzd4WfoJLDZlczhlZ9aZgJ2cQ==} engines: {node: '>=18.0.0'} hasBin: true @@ -2886,8 +2886,8 @@ packages: peerDependencies: vite: ^2 || ^3 || ^4 || ^5 || ^6 - vite@6.3.2: - resolution: {integrity: sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==} + vite@6.3.3: + resolution: {integrity: sha512-5nXH+QsELbFKhsEfWLkHrvgRpTdGJzqOZ+utSdmPTvwHmvU6ITTm3xx+mRusihkcI8GeC7lCDyn3kDtiki9scw==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -3035,17 +3035,17 @@ packages: workbox-window@7.3.0: resolution: {integrity: sha512-qW8PDy16OV1UBaUNGlTVcepzrlzyzNW/ZJvFQQs2j2TzGsg6IKjcpZC1RSquqQnTOafl5pCj5bGfAHlCjOOjdA==} - workerd@1.20250422.0: - resolution: {integrity: sha512-q3ws6MIa9GJQqq1Q52qoD7vCx1203fjKNPmtRV1vvplrsfYphjr5pOAnZGUODFB1BnsDWypr71Luy7OonT0vug==} + workerd@1.20250424.0: + resolution: {integrity: sha512-3Nb69De9pfC21vLMW8Xpp5JXEPYd7e8MGcaEfo/6z1jOX9CFJVaqrAXr8RwYxDgN528ZahHqM51YQEcVlOu1Cw==} engines: {node: '>=16'} hasBin: true - wrangler@4.13.0: - resolution: {integrity: sha512-CVRNL0unLmzhVeUkW+9neZHFITSo7UDROz8VYxi8YhitV9Rr1xMojS1cGjQTaQX8F3nAEsTRJXTwwTZ0JoJm6g==} + wrangler@4.13.1: + resolution: {integrity: sha512-ofF1QAoRYwmg/8ukoW6235ig2oGw187ETDN99ATIf+i0RZ+iYc+5ykzNxomY+T7fvRHKs+xh3at3LdFlwTdPQQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@cloudflare/workers-types': ^4.20250422.0 + '@cloudflare/workers-types': ^4.20250424.0 peerDependenciesMeta: '@cloudflare/workers-types': optional: true @@ -3734,25 +3734,25 @@ snapshots: dependencies: mime: 3.0.0 - '@cloudflare/unenv-preset@2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250422.0)': + '@cloudflare/unenv-preset@2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250424.0)': dependencies: unenv: 2.0.0-rc.15 optionalDependencies: - workerd: 1.20250422.0 + workerd: 1.20250424.0 - '@cloudflare/workerd-darwin-64@1.20250422.0': + '@cloudflare/workerd-darwin-64@1.20250424.0': optional: true - '@cloudflare/workerd-darwin-arm64@1.20250422.0': + '@cloudflare/workerd-darwin-arm64@1.20250424.0': optional: true - '@cloudflare/workerd-linux-64@1.20250422.0': + '@cloudflare/workerd-linux-64@1.20250424.0': optional: true - '@cloudflare/workerd-linux-arm64@1.20250422.0': + '@cloudflare/workerd-linux-arm64@1.20250424.0': optional: true - '@cloudflare/workerd-windows-64@1.20250422.0': + '@cloudflare/workerd-windows-64@1.20250424.0': optional: true '@cspotcode/source-map-support@0.8.1': @@ -4302,9 +4302,9 @@ snapshots: '@vicons/material@0.13.0': {} - '@vitejs/plugin-vue@5.2.3(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0))(vue@3.5.13(typescript@5.4.5))': + '@vitejs/plugin-vue@5.2.3(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0))(vue@3.5.13(typescript@5.4.5))': dependencies: - vite: 6.3.2(@types/node@22.10.5)(terser@5.39.0) + vite: 6.3.3(@types/node@22.10.5)(terser@5.39.0) vue: 3.5.13(typescript@5.4.5) '@vue/compiler-core@3.5.13': @@ -4597,7 +4597,7 @@ snapshots: browserslist@4.24.4: dependencies: caniuse-lite: 1.0.30001715 - electron-to-chromium: 1.5.140 + electron-to-chromium: 1.5.142 node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.24.4) @@ -4772,7 +4772,7 @@ snapshots: dependencies: jake: 10.9.2 - electron-to-chromium@1.5.140: {} + electron-to-chromium@1.5.142: {} entities@4.5.0: {} @@ -5357,7 +5357,7 @@ snapshots: mime@3.0.0: {} - miniflare@4.20250422.0: + miniflare@4.20250424.0: dependencies: '@cspotcode/source-map-support': 0.8.1 acorn: 8.14.0 @@ -5366,7 +5366,7 @@ snapshots: glob-to-regexp: 0.4.1 stoppable: 1.1.0 undici: 5.29.0 - workerd: 1.20250422.0 + workerd: 1.20250424.0 ws: 8.18.0 youch: 3.3.4 zod: 3.22.3 @@ -6036,32 +6036,32 @@ snapshots: evtd: 0.2.4 vue: 3.5.13(typescript@5.4.5) - vite-plugin-pwa@1.0.0(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0): + vite-plugin-pwa@1.0.0(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0): dependencies: debug: 4.4.0 pretty-bytes: 6.1.1 tinyglobby: 0.2.13 - vite: 6.3.2(@types/node@22.10.5)(terser@5.39.0) + vite: 6.3.3(@types/node@22.10.5)(terser@5.39.0) workbox-build: 7.3.0 workbox-window: 7.3.0 transitivePeerDependencies: - supports-color - vite-plugin-top-level-await@1.5.0(rollup@2.79.2)(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0)): + vite-plugin-top-level-await@1.5.0(rollup@2.79.2)(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0)): dependencies: '@rollup/plugin-virtual': 3.0.2(rollup@2.79.2) '@swc/core': 1.11.22 uuid: 10.0.0 - vite: 6.3.2(@types/node@22.10.5)(terser@5.39.0) + vite: 6.3.3(@types/node@22.10.5)(terser@5.39.0) transitivePeerDependencies: - '@swc/helpers' - rollup - vite-plugin-wasm@3.4.1(vite@6.3.2(@types/node@22.10.5)(terser@5.39.0)): + vite-plugin-wasm@3.4.1(vite@6.3.3(@types/node@22.10.5)(terser@5.39.0)): dependencies: - vite: 6.3.2(@types/node@22.10.5)(terser@5.39.0) + vite: 6.3.3(@types/node@22.10.5)(terser@5.39.0) - vite@6.3.2(@types/node@22.10.5)(terser@5.39.0): + vite@6.3.3(@types/node@22.10.5)(terser@5.39.0): dependencies: esbuild: 0.25.3 fdir: 6.4.4(picomatch@4.0.2) @@ -6282,24 +6282,24 @@ snapshots: '@types/trusted-types': 2.0.7 workbox-core: 7.3.0 - workerd@1.20250422.0: + workerd@1.20250424.0: optionalDependencies: - '@cloudflare/workerd-darwin-64': 1.20250422.0 - '@cloudflare/workerd-darwin-arm64': 1.20250422.0 - '@cloudflare/workerd-linux-64': 1.20250422.0 - '@cloudflare/workerd-linux-arm64': 1.20250422.0 - '@cloudflare/workerd-windows-64': 1.20250422.0 + '@cloudflare/workerd-darwin-64': 1.20250424.0 + '@cloudflare/workerd-darwin-arm64': 1.20250424.0 + '@cloudflare/workerd-linux-64': 1.20250424.0 + '@cloudflare/workerd-linux-arm64': 1.20250424.0 + '@cloudflare/workerd-windows-64': 1.20250424.0 - wrangler@4.13.0: + wrangler@4.13.1: dependencies: '@cloudflare/kv-asset-handler': 0.4.0 - '@cloudflare/unenv-preset': 2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250422.0) + '@cloudflare/unenv-preset': 2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250424.0) blake3-wasm: 2.1.5 esbuild: 0.25.2 - miniflare: 4.20250422.0 + miniflare: 4.20250424.0 path-to-regexp: 6.3.0 unenv: 2.0.0-rc.15 - workerd: 1.20250422.0 + workerd: 1.20250424.0 optionalDependencies: fsevents: 2.3.3 sharp: 0.33.5 diff --git a/frontend/src/views/admin/UserOauth2Settings.vue b/frontend/src/views/admin/UserOauth2Settings.vue index f58edcf0..52f4144f 100644 --- a/frontend/src/views/admin/UserOauth2Settings.vue +++ b/frontend/src/views/admin/UserOauth2Settings.vue @@ -224,7 +224,7 @@ onMounted(async () => { - + diff --git a/pages/package.json b/pages/package.json index 4c7e872b..5db24f4b 100644 --- a/pages/package.json +++ b/pages/package.json @@ -11,6 +11,6 @@ "author": "", "license": "ISC", "devDependencies": { - "wrangler": "^4.13.0" + "wrangler": "^4.13.1" } } diff --git a/scripts/update-dependencies.sh b/scripts/update-dependencies.sh index c446ee48..4eae50f4 100755 --- a/scripts/update-dependencies.sh +++ b/scripts/update-dependencies.sh @@ -14,6 +14,6 @@ pnpm add -D wrangler@latest cd .. cd vitepress-docs/ -pnpm up +pnpm up --latest pnpm add -D wrangler@latest cd .. diff --git a/vitepress-docs/package.json b/vitepress-docs/package.json index e809d890..fb8b1834 100644 --- a/vitepress-docs/package.json +++ b/vitepress-docs/package.json @@ -6,7 +6,7 @@ "devDependencies": { "@types/node": "^22.14.1", "vitepress": "^1.6.3", - "wrangler": "^4.13.0" + "wrangler": "^4.13.1" }, "scripts": { "dev": "vitepress dev docs", diff --git a/vitepress-docs/pnpm-lock.yaml b/vitepress-docs/pnpm-lock.yaml index d9f766dc..5ee50870 100644 --- a/vitepress-docs/pnpm-lock.yaml +++ b/vitepress-docs/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: ^1.6.3 version: 1.6.3(@algolia/client-search@5.23.4)(@types/node@22.14.1)(postcss@8.5.3)(search-insights@2.13.0)(typescript@5.4.5) wrangler: - specifier: ^4.13.0 - version: 4.13.0 + specifier: ^4.13.1 + version: 4.13.1 packages: @@ -126,32 +126,32 @@ packages: workerd: optional: true - '@cloudflare/workerd-darwin-64@1.20250422.0': - resolution: {integrity: sha512-2FWl8TLpC4Knuyw8GmNgUSoJCNJNNGJ7Xv90j2n8FiXR5Clp9jSpm2ovK8RP9P751yX1/iIp8e7QufR/XDB6ow==} + '@cloudflare/workerd-darwin-64@1.20250424.0': + resolution: {integrity: sha512-E+9tyQfwKwg7iz+vI50UeF9m9MhO6uCTnn6VPBTobhgi0rKcfmCteUGz6YJejG6ex9OIfFHg/tIcr1+ywGZtiA==} engines: {node: '>=16'} cpu: [x64] os: [darwin] - '@cloudflare/workerd-darwin-arm64@1.20250422.0': - resolution: {integrity: sha512-GY3W74ivqxsYldacEbMtcSbG7LsS9hPo5UybKIw4RO9GzP7UC5WGnPfuI4PE2SnJOnw7nwSrBLuhGRPe/QQHkQ==} + '@cloudflare/workerd-darwin-arm64@1.20250424.0': + resolution: {integrity: sha512-5vReSs+Gx4vPNR3zoU3a7BVBoTEc7aoe2gGcaxSSQKMOvVkp3bo9poOGZbISodhYnCCRXltZcl8Vgyi0l/YZLA==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] - '@cloudflare/workerd-linux-64@1.20250422.0': - resolution: {integrity: sha512-mtNkEygKtlRq9pMRlm9J4nX4uVHU1AtJ3mSkdNwPwhisTpo989O5Zd0SH9CYwAk8+NmlZsXELpODUVQxQ7FJgw==} + '@cloudflare/workerd-linux-64@1.20250424.0': + resolution: {integrity: sha512-8kBNy7LpW/E4XKGrx/1Xql3Hfy8viDb+tFudu+sN/b6A2tNczNoOzDyNeWeWa99/zfyzncah1l0Wl2RBmVvY+Q==} engines: {node: '>=16'} cpu: [x64] os: [linux] - '@cloudflare/workerd-linux-arm64@1.20250422.0': - resolution: {integrity: sha512-ILlW4/kAoFJvSryrr/QJsiHBdMTf/fjUrIM0hxeuQue8zIEvAVqM1tzpUh8bPJT6AQEbk5ziwkfucA939Z6Tnw==} + '@cloudflare/workerd-linux-arm64@1.20250424.0': + resolution: {integrity: sha512-R4wLZNobQo5K96e3BEaTwCbZhyspeoW81k/yrkSRseLpSoIpLNguw6ckk5sGCjUkXEZQyu9TG6PzdYqlQo70gw==} engines: {node: '>=16'} cpu: [arm64] os: [linux] - '@cloudflare/workerd-windows-64@1.20250422.0': - resolution: {integrity: sha512-O2f6f7oxU/oaWX/3/5d/9qvzNSKsw72RsQFjpew2va7KwnnUciI2LnbYR6KYOqRGYrEoiMJxpWPQaYaFVj8t1w==} + '@cloudflare/workerd-windows-64@1.20250424.0': + resolution: {integrity: sha512-uwzZhNaKjJKq6NGFPd0hQWecpf5OTZCrlWKQZm4kkufZ7uIzkn5t3kOjh/J3L9puM/GvIPxCiDUE2aG66P6YxA==} engines: {node: '>=16'} cpu: [x64] os: [win32] @@ -1031,8 +1031,8 @@ packages: engines: {node: '>=10.0.0'} hasBin: true - miniflare@4.20250422.0: - resolution: {integrity: sha512-3frXK9EZEWQkHMDyppeIbUKwd7OQkNOm2gBtQQzjQ4gtzQmh+yxkyJiiylf+fGbz86djQTLKKQdQ1FC4yM3AMg==} + miniflare@4.20250424.0: + resolution: {integrity: sha512-eROPDAx4KCIFtfRyRV9d3FJaF94UjW57gRUZz7gk2wyyOuHYVVJnWWyWrZfvRqzd4WfoJLDZlczhlZ9aZgJ2cQ==} engines: {node: '>=18.0.0'} hasBin: true @@ -1266,17 +1266,17 @@ packages: typescript: optional: true - workerd@1.20250422.0: - resolution: {integrity: sha512-q3ws6MIa9GJQqq1Q52qoD7vCx1203fjKNPmtRV1vvplrsfYphjr5pOAnZGUODFB1BnsDWypr71Luy7OonT0vug==} + workerd@1.20250424.0: + resolution: {integrity: sha512-3Nb69De9pfC21vLMW8Xpp5JXEPYd7e8MGcaEfo/6z1jOX9CFJVaqrAXr8RwYxDgN528ZahHqM51YQEcVlOu1Cw==} engines: {node: '>=16'} hasBin: true - wrangler@4.13.0: - resolution: {integrity: sha512-CVRNL0unLmzhVeUkW+9neZHFITSo7UDROz8VYxi8YhitV9Rr1xMojS1cGjQTaQX8F3nAEsTRJXTwwTZ0JoJm6g==} + wrangler@4.13.1: + resolution: {integrity: sha512-ofF1QAoRYwmg/8ukoW6235ig2oGw187ETDN99ATIf+i0RZ+iYc+5ykzNxomY+T7fvRHKs+xh3at3LdFlwTdPQQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@cloudflare/workers-types': ^4.20250422.0 + '@cloudflare/workers-types': ^4.20250424.0 peerDependenciesMeta: '@cloudflare/workers-types': optional: true @@ -1426,25 +1426,25 @@ snapshots: dependencies: mime: 3.0.0 - '@cloudflare/unenv-preset@2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250422.0)': + '@cloudflare/unenv-preset@2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250424.0)': dependencies: unenv: 2.0.0-rc.15 optionalDependencies: - workerd: 1.20250422.0 + workerd: 1.20250424.0 - '@cloudflare/workerd-darwin-64@1.20250422.0': + '@cloudflare/workerd-darwin-64@1.20250424.0': optional: true - '@cloudflare/workerd-darwin-arm64@1.20250422.0': + '@cloudflare/workerd-darwin-arm64@1.20250424.0': optional: true - '@cloudflare/workerd-linux-64@1.20250422.0': + '@cloudflare/workerd-linux-64@1.20250424.0': optional: true - '@cloudflare/workerd-linux-arm64@1.20250422.0': + '@cloudflare/workerd-linux-arm64@1.20250424.0': optional: true - '@cloudflare/workerd-windows-64@1.20250422.0': + '@cloudflare/workerd-windows-64@1.20250424.0': optional: true '@cspotcode/source-map-support@0.8.1': @@ -2187,7 +2187,7 @@ snapshots: mime@3.0.0: {} - miniflare@4.20250422.0: + miniflare@4.20250424.0: dependencies: '@cspotcode/source-map-support': 0.8.1 acorn: 8.14.0 @@ -2196,7 +2196,7 @@ snapshots: glob-to-regexp: 0.4.1 stoppable: 1.1.0 undici: 5.29.0 - workerd: 1.20250422.0 + workerd: 1.20250424.0 ws: 8.18.0 youch: 3.3.4 zod: 3.22.3 @@ -2501,24 +2501,24 @@ snapshots: optionalDependencies: typescript: 5.4.5 - workerd@1.20250422.0: + workerd@1.20250424.0: optionalDependencies: - '@cloudflare/workerd-darwin-64': 1.20250422.0 - '@cloudflare/workerd-darwin-arm64': 1.20250422.0 - '@cloudflare/workerd-linux-64': 1.20250422.0 - '@cloudflare/workerd-linux-arm64': 1.20250422.0 - '@cloudflare/workerd-windows-64': 1.20250422.0 + '@cloudflare/workerd-darwin-64': 1.20250424.0 + '@cloudflare/workerd-darwin-arm64': 1.20250424.0 + '@cloudflare/workerd-linux-64': 1.20250424.0 + '@cloudflare/workerd-linux-arm64': 1.20250424.0 + '@cloudflare/workerd-windows-64': 1.20250424.0 - wrangler@4.13.0: + wrangler@4.13.1: dependencies: '@cloudflare/kv-asset-handler': 0.4.0 - '@cloudflare/unenv-preset': 2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250422.0) + '@cloudflare/unenv-preset': 2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250424.0) blake3-wasm: 2.1.5 esbuild: 0.25.2 - miniflare: 4.20250422.0 + miniflare: 4.20250424.0 path-to-regexp: 6.3.0 unenv: 2.0.0-rc.15 - workerd: 1.20250422.0 + workerd: 1.20250424.0 optionalDependencies: fsevents: 2.3.3 sharp: 0.33.5 diff --git a/worker/package.json b/worker/package.json index 2d62d0fe..a0bcc038 100644 --- a/worker/package.json +++ b/worker/package.json @@ -11,13 +11,13 @@ "build": "wrangler deploy --dry-run --outdir dist --minify" }, "devDependencies": { - "@cloudflare/workers-types": "^4.20250423.0", + "@cloudflare/workers-types": "^4.20250424.0", "@eslint/js": "9.18.0", "@simplewebauthn/types": "10.0.0", "eslint": "9.18.0", "globals": "^15.15.0", "typescript-eslint": "^8.31.0", - "wrangler": "^4.13.0" + "wrangler": "^4.13.1" }, "dependencies": { "@aws-sdk/client-s3": "^3.787.0", @@ -27,7 +27,7 @@ "jsonpath-plus": "^10.3.0", "mimetext": "^3.0.27", "postal-mime": "^2.4.3", - "resend": "^4.4.0", + "resend": "^4.4.1", "telegraf": "4.16.3", "worker-mailer": "^1.1.3" }, diff --git a/worker/pnpm-lock.yaml b/worker/pnpm-lock.yaml index 0c2b4136..2096822a 100644 --- a/worker/pnpm-lock.yaml +++ b/worker/pnpm-lock.yaml @@ -35,8 +35,8 @@ importers: specifier: ^2.4.3 version: 2.4.3 resend: - specifier: ^4.4.0 - version: 4.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^4.4.1 + version: 4.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) telegraf: specifier: 4.16.3 version: 4.16.3(patch_hash=7d0a1784bb35f50fee25f26a14017734b9461612c635e71734b59527280c9563) @@ -45,8 +45,8 @@ importers: version: 1.1.3 devDependencies: '@cloudflare/workers-types': - specifier: ^4.20250423.0 - version: 4.20250423.0 + specifier: ^4.20250424.0 + version: 4.20250424.0 '@eslint/js': specifier: 9.18.0 version: 9.18.0 @@ -63,8 +63,8 @@ importers: specifier: ^8.31.0 version: 8.31.0(eslint@9.18.0)(typescript@5.4.5) wrangler: - specifier: ^4.13.0 - version: 4.13.0(@cloudflare/workers-types@4.20250423.0) + specifier: ^4.13.1 + version: 4.13.1(@cloudflare/workers-types@4.20250424.0) packages: @@ -248,38 +248,38 @@ packages: workerd: optional: true - '@cloudflare/workerd-darwin-64@1.20250422.0': - resolution: {integrity: sha512-2FWl8TLpC4Knuyw8GmNgUSoJCNJNNGJ7Xv90j2n8FiXR5Clp9jSpm2ovK8RP9P751yX1/iIp8e7QufR/XDB6ow==} + '@cloudflare/workerd-darwin-64@1.20250424.0': + resolution: {integrity: sha512-E+9tyQfwKwg7iz+vI50UeF9m9MhO6uCTnn6VPBTobhgi0rKcfmCteUGz6YJejG6ex9OIfFHg/tIcr1+ywGZtiA==} engines: {node: '>=16'} cpu: [x64] os: [darwin] - '@cloudflare/workerd-darwin-arm64@1.20250422.0': - resolution: {integrity: sha512-GY3W74ivqxsYldacEbMtcSbG7LsS9hPo5UybKIw4RO9GzP7UC5WGnPfuI4PE2SnJOnw7nwSrBLuhGRPe/QQHkQ==} + '@cloudflare/workerd-darwin-arm64@1.20250424.0': + resolution: {integrity: sha512-5vReSs+Gx4vPNR3zoU3a7BVBoTEc7aoe2gGcaxSSQKMOvVkp3bo9poOGZbISodhYnCCRXltZcl8Vgyi0l/YZLA==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] - '@cloudflare/workerd-linux-64@1.20250422.0': - resolution: {integrity: sha512-mtNkEygKtlRq9pMRlm9J4nX4uVHU1AtJ3mSkdNwPwhisTpo989O5Zd0SH9CYwAk8+NmlZsXELpODUVQxQ7FJgw==} + '@cloudflare/workerd-linux-64@1.20250424.0': + resolution: {integrity: sha512-8kBNy7LpW/E4XKGrx/1Xql3Hfy8viDb+tFudu+sN/b6A2tNczNoOzDyNeWeWa99/zfyzncah1l0Wl2RBmVvY+Q==} engines: {node: '>=16'} cpu: [x64] os: [linux] - '@cloudflare/workerd-linux-arm64@1.20250422.0': - resolution: {integrity: sha512-ILlW4/kAoFJvSryrr/QJsiHBdMTf/fjUrIM0hxeuQue8zIEvAVqM1tzpUh8bPJT6AQEbk5ziwkfucA939Z6Tnw==} + '@cloudflare/workerd-linux-arm64@1.20250424.0': + resolution: {integrity: sha512-R4wLZNobQo5K96e3BEaTwCbZhyspeoW81k/yrkSRseLpSoIpLNguw6ckk5sGCjUkXEZQyu9TG6PzdYqlQo70gw==} engines: {node: '>=16'} cpu: [arm64] os: [linux] - '@cloudflare/workerd-windows-64@1.20250422.0': - resolution: {integrity: sha512-O2f6f7oxU/oaWX/3/5d/9qvzNSKsw72RsQFjpew2va7KwnnUciI2LnbYR6KYOqRGYrEoiMJxpWPQaYaFVj8t1w==} + '@cloudflare/workerd-windows-64@1.20250424.0': + resolution: {integrity: sha512-uwzZhNaKjJKq6NGFPd0hQWecpf5OTZCrlWKQZm4kkufZ7uIzkn5t3kOjh/J3L9puM/GvIPxCiDUE2aG66P6YxA==} engines: {node: '>=16'} cpu: [x64] os: [win32] - '@cloudflare/workers-types@4.20250423.0': - resolution: {integrity: sha512-uzy7fvgYIs9YCEaPScC+RnZvd+yJJCqLCEe/n/6p2PZTxWbDmiZjtJQiP5Zx6G0p64ZD/0ZRmtALfDZDNYBDHg==} + '@cloudflare/workers-types@4.20250424.0': + resolution: {integrity: sha512-tolHPBVlYSIZq5GWlGbbSqXg1P79u059YJ19cFULwRCF/KpElb9YDq/D9oPxqpw/niS9AvzVBCR5RCxsWv4LDQ==} '@cspotcode/source-map-support@0.8.1': resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} @@ -805,8 +805,8 @@ packages: resolution: {integrity: sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==} engines: {node: '>=18.0.0'} - '@smithy/signature-v4@5.0.2': - resolution: {integrity: sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw==} + '@smithy/signature-v4@5.1.0': + resolution: {integrity: sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==} engines: {node: '>=18.0.0'} '@smithy/smithy-client@4.2.0': @@ -1347,8 +1347,8 @@ packages: mimetext@3.0.27: resolution: {integrity: sha512-mUhWAsZD1N/K6dbN4+a5Yq78OPnYQw1ubOSMasBntsLQ2S7KVNlvDEA8dwpr4a7PszWMzeslKahAprtwYMgaBA==} - miniflare@4.20250422.0: - resolution: {integrity: sha512-3frXK9EZEWQkHMDyppeIbUKwd7OQkNOm2gBtQQzjQ4gtzQmh+yxkyJiiylf+fGbz86djQTLKKQdQ1FC4yM3AMg==} + miniflare@4.20250424.0: + resolution: {integrity: sha512-eROPDAx4KCIFtfRyRV9d3FJaF94UjW57gRUZz7gk2wyyOuHYVVJnWWyWrZfvRqzd4WfoJLDZlczhlZ9aZgJ2cQ==} engines: {node: '>=18.0.0'} hasBin: true @@ -1473,8 +1473,8 @@ packages: regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - resend@4.4.0: - resolution: {integrity: sha512-SmVI3JCpgPNt4/m3Uy403LjoSeeleUE2X+KwPYQZcw+jiBCFsqL6vdf1r/XuQ7yOjvxYmlI8GD/oIWonFF9t9w==} + resend@4.4.1: + resolution: {integrity: sha512-FR22bzMW3VfoyZSBc8ScGo8ShrMWHmWB0G3FrispzWCnYSEEK5M7pyRvZtInKmM/09lsJETKc2q66mX+dXPSmg==} engines: {node: '>=18'} resolve-from@4.0.0: @@ -1615,17 +1615,17 @@ packages: worker-mailer@1.1.3: resolution: {integrity: sha512-8jkbf843tAV9KMWQESrduMt6LKolYXJ9rmWO0W8ZM3CW0Mb+qaVaktXhqvAo7cLvYnYSxYBS8oJl0pgr75XipQ==} - workerd@1.20250422.0: - resolution: {integrity: sha512-q3ws6MIa9GJQqq1Q52qoD7vCx1203fjKNPmtRV1vvplrsfYphjr5pOAnZGUODFB1BnsDWypr71Luy7OonT0vug==} + workerd@1.20250424.0: + resolution: {integrity: sha512-3Nb69De9pfC21vLMW8Xpp5JXEPYd7e8MGcaEfo/6z1jOX9CFJVaqrAXr8RwYxDgN528ZahHqM51YQEcVlOu1Cw==} engines: {node: '>=16'} hasBin: true - wrangler@4.13.0: - resolution: {integrity: sha512-CVRNL0unLmzhVeUkW+9neZHFITSo7UDROz8VYxi8YhitV9Rr1xMojS1cGjQTaQX8F3nAEsTRJXTwwTZ0JoJm6g==} + wrangler@4.13.1: + resolution: {integrity: sha512-ofF1QAoRYwmg/8ukoW6235ig2oGw187ETDN99ATIf+i0RZ+iYc+5ykzNxomY+T7fvRHKs+xh3at3LdFlwTdPQQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@cloudflare/workers-types': ^4.20250422.0 + '@cloudflare/workers-types': ^4.20250424.0 peerDependenciesMeta: '@cloudflare/workers-types': optional: true @@ -1812,7 +1812,7 @@ snapshots: '@smithy/node-config-provider': 4.0.2 '@smithy/property-provider': 4.0.2 '@smithy/protocol-http': 5.1.0 - '@smithy/signature-v4': 5.0.2 + '@smithy/signature-v4': 5.1.0 '@smithy/smithy-client': 4.2.0 '@smithy/types': 4.2.0 '@smithy/util-middleware': 4.0.2 @@ -1975,7 +1975,7 @@ snapshots: '@smithy/core': 3.2.0 '@smithy/node-config-provider': 4.0.2 '@smithy/protocol-http': 5.1.0 - '@smithy/signature-v4': 5.0.2 + '@smithy/signature-v4': 5.1.0 '@smithy/smithy-client': 4.2.0 '@smithy/types': 4.2.0 '@smithy/util-config-provider': 4.0.0 @@ -2068,7 +2068,7 @@ snapshots: '@aws-sdk/middleware-sdk-s3': 3.775.0 '@aws-sdk/types': 3.775.0 '@smithy/protocol-http': 5.1.0 - '@smithy/signature-v4': 5.0.2 + '@smithy/signature-v4': 5.1.0 '@smithy/types': 4.2.0 tslib: 2.8.1 @@ -2143,28 +2143,28 @@ snapshots: dependencies: mime: 3.0.0 - '@cloudflare/unenv-preset@2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250422.0)': + '@cloudflare/unenv-preset@2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250424.0)': dependencies: unenv: 2.0.0-rc.15 optionalDependencies: - workerd: 1.20250422.0 + workerd: 1.20250424.0 - '@cloudflare/workerd-darwin-64@1.20250422.0': + '@cloudflare/workerd-darwin-64@1.20250424.0': optional: true - '@cloudflare/workerd-darwin-arm64@1.20250422.0': + '@cloudflare/workerd-darwin-arm64@1.20250424.0': optional: true - '@cloudflare/workerd-linux-64@1.20250422.0': + '@cloudflare/workerd-linux-64@1.20250424.0': optional: true - '@cloudflare/workerd-linux-arm64@1.20250422.0': + '@cloudflare/workerd-linux-arm64@1.20250424.0': optional: true - '@cloudflare/workerd-windows-64@1.20250422.0': + '@cloudflare/workerd-windows-64@1.20250424.0': optional: true - '@cloudflare/workers-types@4.20250423.0': {} + '@cloudflare/workers-types@4.20250424.0': {} '@cspotcode/source-map-support@0.8.1': dependencies: @@ -2683,7 +2683,7 @@ snapshots: '@smithy/types': 4.2.0 tslib: 2.8.1 - '@smithy/signature-v4@5.0.2': + '@smithy/signature-v4@5.1.0': dependencies: '@smithy/is-array-buffer': 4.0.0 '@smithy/protocol-http': 5.1.0 @@ -3314,7 +3314,7 @@ snapshots: js-base64: 3.7.7 mime-types: 2.1.35 - miniflare@4.20250422.0: + miniflare@4.20250424.0: dependencies: '@cspotcode/source-map-support': 0.8.1 acorn: 8.14.0 @@ -3323,7 +3323,7 @@ snapshots: glob-to-regexp: 0.4.1 stoppable: 1.1.0 undici: 5.29.0 - workerd: 1.20250422.0 + workerd: 1.20250424.0 ws: 8.18.0 youch: 3.3.4 zod: 3.22.3 @@ -3427,7 +3427,7 @@ snapshots: regenerator-runtime@0.14.1: {} - resend@4.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + resend@4.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@react-email/render': 1.0.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: @@ -3590,26 +3590,26 @@ snapshots: worker-mailer@1.1.3: {} - workerd@1.20250422.0: + workerd@1.20250424.0: optionalDependencies: - '@cloudflare/workerd-darwin-64': 1.20250422.0 - '@cloudflare/workerd-darwin-arm64': 1.20250422.0 - '@cloudflare/workerd-linux-64': 1.20250422.0 - '@cloudflare/workerd-linux-arm64': 1.20250422.0 - '@cloudflare/workerd-windows-64': 1.20250422.0 + '@cloudflare/workerd-darwin-64': 1.20250424.0 + '@cloudflare/workerd-darwin-arm64': 1.20250424.0 + '@cloudflare/workerd-linux-64': 1.20250424.0 + '@cloudflare/workerd-linux-arm64': 1.20250424.0 + '@cloudflare/workerd-windows-64': 1.20250424.0 - wrangler@4.13.0(@cloudflare/workers-types@4.20250423.0): + wrangler@4.13.1(@cloudflare/workers-types@4.20250424.0): dependencies: '@cloudflare/kv-asset-handler': 0.4.0 - '@cloudflare/unenv-preset': 2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250422.0) + '@cloudflare/unenv-preset': 2.3.1(unenv@2.0.0-rc.15)(workerd@1.20250424.0) blake3-wasm: 2.1.5 esbuild: 0.25.2 - miniflare: 4.20250422.0 + miniflare: 4.20250424.0 path-to-regexp: 6.3.0 unenv: 2.0.0-rc.15 - workerd: 1.20250422.0 + workerd: 1.20250424.0 optionalDependencies: - '@cloudflare/workers-types': 4.20250423.0 + '@cloudflare/workers-types': 4.20250424.0 fsevents: 2.3.3 sharp: 0.33.5 transitivePeerDependencies: diff --git a/worker/src/user_api/oauth2.ts b/worker/src/user_api/oauth2.ts index 7220fb80..9c6c841a 100644 --- a/worker/src/user_api/oauth2.ts +++ b/worker/src/user_api/oauth2.ts @@ -38,6 +38,7 @@ export default { client_id: setting.clientID, client_secret: setting.clientSecret, grant_type: 'authorization_code', + redirect_uri: setting.redirectURL, } const res = await fetch(setting.accessTokenURL, { method: 'POST',