diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 2200a804..2781fbb3 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@baselime/node-opentelemetry": "^0.5.8", - "@clerk/nextjs": "^5.0.2", + "@clerk/nextjs": "^5.0.12", "@clickhouse/client": "^0.2.9", "@hookform/resolvers": "^3.3.4", "@openpanel/common": "workspace:^", diff --git a/apps/dashboard/src/app/(auth)/sso-callback/page.tsx b/apps/dashboard/src/app/(auth)/sso-callback/page.tsx index 7d069ecf..3a38e6b5 100644 --- a/apps/dashboard/src/app/(auth)/sso-callback/page.tsx +++ b/apps/dashboard/src/app/(auth)/sso-callback/page.tsx @@ -3,12 +3,7 @@ import { AuthenticateWithRedirectCallback } from '@clerk/nextjs'; export const dynamic = 'force-dynamic'; const SSOCallback = () => { - return ( - - ); + return ; }; export default SSOCallback; diff --git a/apps/dashboard/src/middleware.ts b/apps/dashboard/src/middleware.ts index c4875166..df7f338e 100644 --- a/apps/dashboard/src/middleware.ts +++ b/apps/dashboard/src/middleware.ts @@ -8,6 +8,7 @@ const isPublicRoute = createRouteMatcher([ '/api/clerk/(.*)?', '/login', '/register', + '/sso-callback(.*)?', ]); export default clerkMiddleware( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a358667..6376cc12 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,8 +145,8 @@ importers: specifier: ^0.5.8 version: 0.5.8(@trpc/server@10.45.1) '@clerk/nextjs': - specifier: ^5.0.2 - version: 5.0.2(eslint@8.56.0)(next@14.2.1)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) + specifier: ^5.0.12 + version: 5.0.12(next@14.2.1)(react-dom@18.2.0)(react@18.2.0) '@clickhouse/client': specifier: ^0.2.9 version: 0.2.9 @@ -3036,6 +3036,19 @@ packages: - react-dom dev: false + /@clerk/backend@1.1.5(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-e1CD4A5y+H4NbGdGJSE1ZnLGAYaFssrG7NStMmpwaOJry7zF0AbcMMrTzPGWoeu9xrrIRllcOMnAzhehe0/kYg==} + engines: {node: '>=18.17.0'} + dependencies: + '@clerk/shared': 2.1.1(react-dom@18.2.0)(react@18.2.0) + cookie: 0.5.0 + snakecase-keys: 5.4.4 + tslib: 2.4.1 + transitivePeerDependencies: + - react + - react-dom + dev: false + /@clerk/clerk-react@5.0.1(eslint@8.56.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): resolution: {integrity: sha512-JMwOtFFYGfEOI7Ux3Hg5QbuSYSUN1srf3rL6ORK6hgNuTbS1Cd24v6XZz3c7xfMo6yL70o870gXi20FecdeYYw==} engines: {node: '>=18.17.0'} @@ -3056,6 +3069,20 @@ packages: - typescript dev: false + /@clerk/clerk-react@5.1.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-drc/V0J+h9Jsz32QsL7WmuUhhhkU21KbNz5mwLPbSzBMoLg43sx6aRjJGCfBQYPxPsuFZWDlKoJhX6LZ8yxHcA==} + engines: {node: '>=18.17.0'} + peerDependencies: + react: '>=18' + react-dom: '>=18' + dependencies: + '@clerk/shared': 2.1.1(react-dom@18.2.0)(react@18.2.0) + '@clerk/types': 4.4.0 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + tslib: 2.4.1 + dev: false + /@clerk/fastify@1.0.0(fastify-plugin@4.5.1)(fastify@4.26.1)(react@18.2.0): resolution: {integrity: sha512-/GoMp5prCJZJWWyc8mv5kPcsu3o1yOsZl5JabBzuG4d7EZwI5+8SUqrAXxfbGfha5LpMYS32Iv+PnOIY4Kt9Dw==} engines: {node: '>=18.17.0'} @@ -3074,6 +3101,25 @@ packages: - react-dom dev: false + /@clerk/nextjs@5.0.12(next@14.2.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-uRbt31bfPOhQw14wJUThVGlP1HT2v7Ii+UY00MWFuyx7RmOUgqDnBax2FhUcCEJJhICSU0Xf/TqrWOkQUTEg/A==} + engines: {node: '>=18.17.0'} + peerDependencies: + next: ^13.5.4 || ^14.0.3 + react: '>=18' + react-dom: '>=18' + dependencies: + '@clerk/backend': 1.1.5(react-dom@18.2.0)(react@18.2.0) + '@clerk/clerk-react': 5.1.0(react-dom@18.2.0)(react@18.2.0) + '@clerk/shared': 2.1.1(react-dom@18.2.0)(react@18.2.0) + crypto-js: 4.2.0 + next: 14.2.1(@opentelemetry/api@1.8.0)(react-dom@18.2.0)(react@18.2.0) + path-to-regexp: 6.2.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + tslib: 2.4.1 + dev: false + /@clerk/nextjs@5.0.2(eslint@8.56.0)(next@14.2.1)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): resolution: {integrity: sha512-7FNV7tEzy1xMm+hG/lLT0Dh69xkd009PAZfqMQ9AHbjvrKWOTfUZOVkQTgwO7vUcj2V8DlmEmhFLIxfWie6ezA==} engines: {node: '>=18.17.0'} @@ -3119,6 +3165,27 @@ packages: swr: 2.2.0(react@18.2.0) dev: false + /@clerk/shared@2.1.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-cj8VZdEtuqghHBFApl2fFgBtjYZ0NN085uXPqSvdBS62EIKpSENCqm7Ug1H5R2WSuCIv819ZZEBxPiYZM0TNFg==} + engines: {node: '>=18.17.0'} + requiresBuild: true + peerDependencies: + react: '>=18' + react-dom: '>=18' + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + glob-to-regexp: 0.4.1 + js-cookie: 3.0.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + std-env: 3.7.0 + swr: 2.2.0(react@18.2.0) + dev: false + /@clerk/types@4.0.0: resolution: {integrity: sha512-my/uNzHflLYvoLR8RT3LBmYulYGkz+SOVYMdzWt14LpRHajQotnfDSq/GEkfjrBm2HXuZ82GxEDMyYtqHUKv8w==} engines: {node: '>=18.17.0'} @@ -3133,6 +3200,13 @@ packages: csstype: 3.1.1 dev: false + /@clerk/types@4.4.0: + resolution: {integrity: sha512-OaT02uLG1P/jBFNyoPM3n9nLdV4H0etTpa/l3iTW4IgOLiAINToLpMOvEpWzKWUq9nvmOouZlBzPVMozu7dwDg==} + engines: {node: '>=18.17.0'} + dependencies: + csstype: 3.1.1 + dev: false + /@clickhouse/client-common@0.2.9: resolution: {integrity: sha512-ecXcegMbT4HYNWtGcfyidW6lNVRqPogbFMY5kfjJmz4IXJ4WZbQMwj2IQgemwFwE7jyia2OEwPIVfw1sNfDHRA==} dev: false @@ -10237,7 +10311,7 @@ packages: eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 eslint-import-resolver-typescript: 2.7.1(eslint-plugin-import@2.29.1)(eslint@8.56.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@2.7.1)(eslint@8.56.0) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0) eslint-plugin-react: 7.33.2(eslint@8.56.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) @@ -10318,7 +10392,7 @@ packages: dependencies: debug: 4.3.4 eslint: 8.56.0 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@2.7.1)(eslint@8.56.0) glob: 7.2.3 is-glob: 4.0.3 resolve: 1.22.8 @@ -10380,7 +10454,7 @@ packages: - supports-color dev: false - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0): + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@2.7.1)(eslint@8.56.0): resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} peerDependencies: @@ -10390,7 +10464,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.3.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.4 array.prototype.flat: 1.3.2 @@ -10415,7 +10489,7 @@ packages: - supports-color dev: false - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0): + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0): resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} peerDependencies: