From d8f4662ce1a48b4426be9729c0acc0d32ff464a2 Mon Sep 17 00:00:00 2001 From: Steve Keep Date: Mon, 15 Jul 2024 15:36:51 +1000 Subject: [PATCH 1/3] use login with redirect --- .../components/auth-zero/login/component.tsx | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/src/packages/auth-ui-components/src/components/auth-zero/login/component.tsx b/src/packages/auth-ui-components/src/components/auth-zero/login/component.tsx index 4f1d426f5..eb5bf12a3 100644 --- a/src/packages/auth-ui-components/src/components/auth-zero/login/component.tsx +++ b/src/packages/auth-ui-components/src/components/auth-zero/login/component.tsx @@ -1,31 +1,59 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import { Button } from '@exogee/graphweaver-admin-ui-components'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate, useSearchParams } from 'react-router-dom'; import { getAuth0Client } from '../client'; export const Auth0 = () => { const [loading, setLoading] = useState(true); const [error, setError] = useState(); + + const [searchParams] = useSearchParams(); const shouldRedirect = useRef(true); const navigate = useNavigate(); + // In this effect we are checking if the user is coming back from the Auth0 login page or + // if the user is coming to the page for the first time. If the user is coming back from + // the Auth0 login page, we process the redirect. If the user is coming to the page for the + // first time, we redirect the user to the Auth0 login page. useEffect(() => { if (shouldRedirect.current) { shouldRedirect.current = false; - requestLogin(); + const code = searchParams.get('code'); + const state = searchParams.get('state'); + + if (code && state) { + // The user is coming back from the Auth0 login page + processRedirect(); + } else { + // The user is coming to the page for the first time + requestLogin(); + } } }, []); - useEffect(() => { - if (!loading && !error) { - navigate('/'); + // This function is called when the user clicks the login button or when the user is coming to the page for the first time + const requestLogin = useCallback(async () => { + try { + const client = await getAuth0Client(); + const options = { + authorizationParams: { + redirect_uri: window.location.toString(), + }, + }; + await client.loginWithRedirect(options); + } catch (e: any) { + if (e.message) setError(e.message); + setLoading(false); } - }, [loading, error]); + }, []); - const requestLogin = useCallback(async () => { + // This function is called when the user is coming back from the Auth0 login page and we need to process the redirect + // This function will handle the redirect and redirect the user to the home page + const processRedirect = useCallback(async () => { try { const client = await getAuth0Client(); - await client.loginWithPopup(); + await client.handleRedirectCallback(); + navigate('/'); } catch (e: any) { if (e.message) setError(e.message); } finally { @@ -33,16 +61,12 @@ export const Auth0 = () => { } }, []); - const handleRetry = () => { - requestLogin(); - }; - if (loading) return
Loading...
; return (
{error &&
{error}
} - +
); }; From 8f05a83e7ad4e4f09d12d75b0fd4a469e4054f1b Mon Sep 17 00:00:00 2001 From: Steve Keep Date: Mon, 15 Jul 2024 16:34:12 +1000 Subject: [PATCH 2/3] change order of logout requests --- .../auth-zero/src/admin-ui/custom-pages/index.tsx | 2 +- .../src/components/auth-zero/logout/component.tsx | 10 ++++++++-- .../src/components/logout/component.tsx | 8 +++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/examples/auth-zero/src/admin-ui/custom-pages/index.tsx b/src/examples/auth-zero/src/admin-ui/custom-pages/index.tsx index b45d81d40..404dafb6d 100644 --- a/src/examples/auth-zero/src/admin-ui/custom-pages/index.tsx +++ b/src/examples/auth-zero/src/admin-ui/custom-pages/index.tsx @@ -1,7 +1,7 @@ import { Auth, Auth0, Auth0Logout } from '@exogee/graphweaver-auth-ui-components'; export const customPages = { - sidebarFooter: () => , + sidebarFooter: () => , routes: () => [ { path: '/auth', diff --git a/src/packages/auth-ui-components/src/components/auth-zero/logout/component.tsx b/src/packages/auth-ui-components/src/components/auth-zero/logout/component.tsx index 23eeda39e..55ce82d17 100644 --- a/src/packages/auth-ui-components/src/components/auth-zero/logout/component.tsx +++ b/src/packages/auth-ui-components/src/components/auth-zero/logout/component.tsx @@ -1,10 +1,16 @@ import { Logout } from '../../logout'; import { getAuth0Client } from '../client'; -export const Auth0Logout = () => { +type Auth0LogoutProps = { + redirectTo?: string; +}; + +export const Auth0Logout = ({ redirectTo }: Auth0LogoutProps) => { const handleLogout = async () => { const client = await getAuth0Client(); - await client.logout(); + await client.logout({ + logoutParams: { returnTo: redirectTo ?? window.location.origin }, + }); }; return ; diff --git a/src/packages/auth-ui-components/src/components/logout/component.tsx b/src/packages/auth-ui-components/src/components/logout/component.tsx index d29840c8a..a77645810 100644 --- a/src/packages/auth-ui-components/src/components/logout/component.tsx +++ b/src/packages/auth-ui-components/src/components/logout/component.tsx @@ -18,11 +18,13 @@ export const Logout = ({ onLogout }: LogoutProps) => { const handleOnLogout = async () => { try { - if (onLogout) await onLogout(); localStorage.removeItem(localStorageAuthKey); await apolloClient.clearStore(); - await apolloClient.resetStore(); - navigate(0); + if (onLogout) { + await onLogout(); + } else { + navigate(0); + } } catch (error: any) { const message = error?.message || 'Unknown error.'; toast.error(`Failed to logout. Please try again. Error: ${message}`, { From 8a1bd89b90d13f591e8ab9c1e3eb8dbf79fbf29b Mon Sep 17 00:00:00 2001 From: Steve Keep Date: Tue, 16 Jul 2024 07:17:47 +1000 Subject: [PATCH 3/3] bump version --- src/examples/auth-zero/package.json | 2 +- src/examples/aws-cognito/package.json | 2 +- src/examples/databases/package.json | 2 +- src/examples/federation/package.json | 2 +- src/examples/rest/package.json | 2 +- src/examples/s3-storage/package.json | 2 +- src/examples/sqlite/package.json | 2 +- src/examples/xero/package.json | 2 +- src/packages/admin-ui-components/package.json | 2 +- src/packages/admin-ui/package.json | 2 +- src/packages/apollo-client/package.json | 2 +- src/packages/auth-ui-components/package.json | 2 +- src/packages/auth/package.json | 2 +- src/packages/aws-cognito/package.json | 2 +- src/packages/builder/package.json | 2 +- src/packages/cli/package.json | 2 +- src/packages/config/package.json | 2 +- src/packages/core/package.json | 2 +- src/packages/end-to-end/package.json | 2 +- src/packages/logger/package.json | 2 +- .../mikro-orm-sqlite-wasm/package.json | 2 +- src/packages/mikroorm/package.json | 2 +- src/packages/rest/package.json | 2 +- src/packages/scalars/package.json | 2 +- src/packages/server/package.json | 2 +- src/packages/storage-provider/package.json | 2 +- .../vite-plugin-graphweaver/package.json | 2 +- src/packages/xero/package.json | 2 +- src/pnpm-lock.yaml | 91 ++++++++++++------- 29 files changed, 84 insertions(+), 63 deletions(-) diff --git a/src/examples/auth-zero/package.json b/src/examples/auth-zero/package.json index 6e89ef91a..c893e6bfd 100644 --- a/src/examples/auth-zero/package.json +++ b/src/examples/auth-zero/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-example-auth-zero", - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "private": true, "description": "Example of connecting a SQLite database with Auth0.", diff --git a/src/examples/aws-cognito/package.json b/src/examples/aws-cognito/package.json index 3dd8aa33b..3f13875eb 100644 --- a/src/examples/aws-cognito/package.json +++ b/src/examples/aws-cognito/package.json @@ -1,7 +1,7 @@ { "name": "@exogee/graphweaver-example-aws-cognito", "private": true, - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "description": "Example of connecting to AWS Cognito", "main": "lib/index.js", diff --git a/src/examples/databases/package.json b/src/examples/databases/package.json index 4340b529a..7eb36b8be 100644 --- a/src/examples/databases/package.json +++ b/src/examples/databases/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-example-databases", - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "private": true, "description": "Example of connecting a MySQL and PostgreSQL database together.", diff --git a/src/examples/federation/package.json b/src/examples/federation/package.json index d5f50b442..d97de2634 100644 --- a/src/examples/federation/package.json +++ b/src/examples/federation/package.json @@ -1,7 +1,7 @@ { "name": "@exogee/graphweaver-example-federation", "private": true, - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "description": "Example app used to test federation compatibility", "main": "lib/index.js", diff --git a/src/examples/rest/package.json b/src/examples/rest/package.json index 3f2a4ecb1..82ee89e9f 100644 --- a/src/examples/rest/package.json +++ b/src/examples/rest/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-example-rest", - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "private": true, "description": "Example of connecting a Rest API with a MySQL database.", diff --git a/src/examples/s3-storage/package.json b/src/examples/s3-storage/package.json index 7b137c50a..a47739eb3 100644 --- a/src/examples/s3-storage/package.json +++ b/src/examples/s3-storage/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-example-s3-storage", - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "private": true, "description": "Example of connecting Graphweaver to an AWS S3 bucket.", diff --git a/src/examples/sqlite/package.json b/src/examples/sqlite/package.json index 38b33bd44..a6ce973c1 100644 --- a/src/examples/sqlite/package.json +++ b/src/examples/sqlite/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-example-sqlite", - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "private": true, "description": "Example of connecting a SQLite database.", diff --git a/src/examples/xero/package.json b/src/examples/xero/package.json index 93357e1de..94f5238b6 100644 --- a/src/examples/xero/package.json +++ b/src/examples/xero/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-example-xero", - "version": "2.0.3", + "version": "2.0.4", "license": "MIT", "private": true, "description": "Example of using @exogee/graphweaver to connect two Xero instances", diff --git a/src/packages/admin-ui-components/package.json b/src/packages/admin-ui-components/package.json index 3367b0f68..744f58277 100644 --- a/src/packages/admin-ui-components/package.json +++ b/src/packages/admin-ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-admin-ui-components", - "version": "2.0.3", + "version": "2.0.4", "description": "Components from Graphweaver's admin UI which you can use in your projects as you like", "license": "MIT", "type": "module", diff --git a/src/packages/admin-ui/package.json b/src/packages/admin-ui/package.json index 110467298..0d2d10a6d 100644 --- a/src/packages/admin-ui/package.json +++ b/src/packages/admin-ui/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-admin-ui", - "version": "2.0.3", + "version": "2.0.4", "type": "module", "main": "dist/main.js", "types": "src/main.tsx", diff --git a/src/packages/apollo-client/package.json b/src/packages/apollo-client/package.json index 52fed4d11..a151bdc41 100644 --- a/src/packages/apollo-client/package.json +++ b/src/packages/apollo-client/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-apollo-client", - "version": "2.0.3", + "version": "2.0.4", "description": "Useful helpers for working with Apollo Client and Graphweaver", "license": "MIT", "type": "module", diff --git a/src/packages/auth-ui-components/package.json b/src/packages/auth-ui-components/package.json index bf8a5e26d..aad4924fc 100644 --- a/src/packages/auth-ui-components/package.json +++ b/src/packages/auth-ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-auth-ui-components", - "version": "2.0.3", + "version": "2.0.4", "description": "Components from Graphweaver's Auth UI which you can use in your projects as you like", "license": "MIT", "type": "module", diff --git a/src/packages/auth/package.json b/src/packages/auth/package.json index 8617265fd..5e820a137 100644 --- a/src/packages/auth/package.json +++ b/src/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-auth", - "version": "2.0.3", + "version": "2.0.4", "description": "Row-Level Security support for @exogee/graphweaver", "license": "MIT", "scripts": { diff --git a/src/packages/aws-cognito/package.json b/src/packages/aws-cognito/package.json index dc7f8fce1..fb0ffd3a8 100644 --- a/src/packages/aws-cognito/package.json +++ b/src/packages/aws-cognito/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-aws", - "version": "2.0.3", + "version": "2.0.4", "main": "lib/index.js", "source": "src/index.ts", "directories": { diff --git a/src/packages/builder/package.json b/src/packages/builder/package.json index d5217c817..f79623757 100644 --- a/src/packages/builder/package.json +++ b/src/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-builder", - "version": "2.0.3", + "version": "2.0.4", "description": "A tool for building and running Graphweaver projects", "license": "MIT", "scripts": { diff --git a/src/packages/cli/package.json b/src/packages/cli/package.json index 69cd4eccf..72a6d8c77 100644 --- a/src/packages/cli/package.json +++ b/src/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "graphweaver", - "version": "2.0.3", + "version": "2.0.4", "description": "A tool for managing, running, debugging and building Graphweaver projects", "license": "MIT", "scripts": { diff --git a/src/packages/config/package.json b/src/packages/config/package.json index f8d141b8c..ec7134c0d 100644 --- a/src/packages/config/package.json +++ b/src/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-config", - "version": "2.0.3", + "version": "2.0.4", "description": "Retrieve and parse Graphweaver configurations", "license": "MIT", "scripts": { diff --git a/src/packages/core/package.json b/src/packages/core/package.json index 6b3c6fe2c..0bbea1a66 100644 --- a/src/packages/core/package.json +++ b/src/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver", - "version": "2.0.3", + "version": "2.0.4", "description": "Graphweaver Core Package", "license": "MIT", "scripts": { diff --git a/src/packages/end-to-end/package.json b/src/packages/end-to-end/package.json index 45f2c89bf..87693623a 100644 --- a/src/packages/end-to-end/package.json +++ b/src/packages/end-to-end/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-end-to-end", - "version": "2.0.3", + "version": "2.0.4", "description": "Graphweaver Test Suite", "license": "MIT", "scripts": { diff --git a/src/packages/logger/package.json b/src/packages/logger/package.json index 2f04be196..a50ce563b 100644 --- a/src/packages/logger/package.json +++ b/src/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/logger", - "version": "2.0.3", + "version": "2.0.4", "description": "Common logging output for Exogee projects", "license": "MIT", "directories": { diff --git a/src/packages/mikro-orm-sqlite-wasm/package.json b/src/packages/mikro-orm-sqlite-wasm/package.json index 5a85c83e6..360cc192f 100644 --- a/src/packages/mikro-orm-sqlite-wasm/package.json +++ b/src/packages/mikro-orm-sqlite-wasm/package.json @@ -1,6 +1,6 @@ { "name": "mikro-orm-sqlite-wasm", - "version": "2.0.3", + "version": "2.0.4", "description": "MikroORM SQLite Driver Wasm", "license": "MIT", "scripts": { diff --git a/src/packages/mikroorm/package.json b/src/packages/mikroorm/package.json index 813540d29..8756759e0 100644 --- a/src/packages/mikroorm/package.json +++ b/src/packages/mikroorm/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-mikroorm", - "version": "2.0.3", + "version": "2.0.4", "description": "MikroORM backend for @exogee/graphweaver", "license": "MIT", "scripts": { diff --git a/src/packages/rest/package.json b/src/packages/rest/package.json index 9787bf8b1..30286af47 100644 --- a/src/packages/rest/package.json +++ b/src/packages/rest/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-rest", - "version": "2.0.3", + "version": "2.0.4", "description": "RESTful backend for @exogee/graphweaver", "license": "MIT", "scripts": { diff --git a/src/packages/scalars/package.json b/src/packages/scalars/package.json index 92d2e77ba..722eae38b 100644 --- a/src/packages/scalars/package.json +++ b/src/packages/scalars/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-scalars", - "version": "2.0.3", + "version": "2.0.4", "description": "Common scalar types for use with @exogee/graphweaver", "license": "MIT", "main": "lib/index.js", diff --git a/src/packages/server/package.json b/src/packages/server/package.json index 95ae3ffc9..8d0eb49b0 100644 --- a/src/packages/server/package.json +++ b/src/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-server", - "version": "2.0.3", + "version": "2.0.4", "description": "Server support for @exogee/graphweaver", "license": "MIT", "scripts": { diff --git a/src/packages/storage-provider/package.json b/src/packages/storage-provider/package.json index e6abde031..cef423b1d 100644 --- a/src/packages/storage-provider/package.json +++ b/src/packages/storage-provider/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-storage-provider", - "version": "2.0.3", + "version": "2.0.4", "description": "Graphweaver Storage Provider Package", "license": "MIT", "scripts": { diff --git a/src/packages/vite-plugin-graphweaver/package.json b/src/packages/vite-plugin-graphweaver/package.json index 694959d21..2f833e446 100644 --- a/src/packages/vite-plugin-graphweaver/package.json +++ b/src/packages/vite-plugin-graphweaver/package.json @@ -1,6 +1,6 @@ { "name": "vite-plugin-graphweaver", - "version": "2.0.3", + "version": "2.0.4", "description": "A vite plugin for use with @exogee/graphweaver's admin UI", "license": "MIT", "main": "lib/index.js", diff --git a/src/packages/xero/package.json b/src/packages/xero/package.json index efdf399a6..e45395256 100644 --- a/src/packages/xero/package.json +++ b/src/packages/xero/package.json @@ -1,6 +1,6 @@ { "name": "@exogee/graphweaver-xero", - "version": "2.0.3", + "version": "2.0.4", "description": "Xero backend for @exogee/graphweaver", "license": "MIT", "scripts": { diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index b346861e5..9faf9ced0 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -74,7 +74,7 @@ importers: version: 6.2.9 '@mikro-orm/knex': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2)(pg@8.11.5) + version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0)(sqlite3@5.1.7) '@mikro-orm/sqlite': specifier: 6.2.9 version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0) @@ -273,7 +273,7 @@ importers: version: 6.2.9 '@mikro-orm/mysql': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0) + version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.11.5) dotenv: specifier: 16.4.5 version: 16.4.5 @@ -343,7 +343,7 @@ importers: version: 6.2.9 '@mikro-orm/postgresql': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2) + version: 6.2.9(@mikro-orm/core@6.2.9) graphql: specifier: 16.9.0 version: 16.9.0 @@ -395,7 +395,7 @@ importers: version: 6.2.9 '@mikro-orm/knex': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2)(pg@8.11.5) + version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0)(sqlite3@5.1.7) '@mikro-orm/sqlite': specifier: 6.2.9 version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0) @@ -1108,7 +1108,7 @@ importers: version: 6.2.9 '@mikro-orm/postgresql': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2) + version: 6.2.9(@mikro-orm/core@6.2.9) '@mikro-orm/sqlite': specifier: 6.2.9 version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0) @@ -1166,7 +1166,7 @@ importers: version: 1.1.4(graphql@16.9.0) ts-jest: specifier: 29.2.2 - version: 29.2.2(@babel/core@7.24.8)(jest@29.7.0)(typescript@5.5.3) + version: 29.2.2(@babel/core@7.24.9)(jest@29.7.0)(typescript@5.5.3) tsx: specifier: 4.16.2 version: 4.16.2 @@ -1197,7 +1197,7 @@ importers: dependencies: '@mikro-orm/knex': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2)(pg@8.11.5) + version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0)(sqlite3@5.1.7) '@mikro-orm/sqlite': specifier: 6.2.9 version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0) @@ -1253,13 +1253,13 @@ importers: optionalDependencies: '@mikro-orm/knex': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2)(pg@8.11.5) + version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.0)(pg@8.11.5) '@mikro-orm/mysql': specifier: 6.2.9 version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.11.5) '@mikro-orm/postgresql': specifier: 6.2.9 - version: 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2) + version: 6.2.9(@mikro-orm/core@6.2.9) '@mikro-orm/sqlite': specifier: 6.2.9 version: 6.2.9(@mikro-orm/core@6.2.9)(pg@8.11.5) @@ -2615,8 +2615,8 @@ packages: resolution: {integrity: sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==} engines: {node: '>=6.9.0'} - /@babel/compat-data@7.24.8: - resolution: {integrity: sha512-c4IM7OTg6k1Q+AJ153e2mc2QVTezTwnb4VzquwcyiEzGnW0Kedv4do/TrkU98qPeC5LNiMt/QXwIjzYXLBpyZg==} + /@babel/compat-data@7.24.9: + resolution: {integrity: sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==} engines: {node: '>=6.9.0'} dev: true @@ -2642,20 +2642,20 @@ packages: transitivePeerDependencies: - supports-color - /@babel/core@7.24.8: - resolution: {integrity: sha512-6AWcmZC/MZCO0yKys4uhg5NlxL0ESF3K6IAaoQ+xSXvPyPyxNWRafP+GDbI88Oh68O7QkJgmEtedWPM9U0pZNg==} + /@babel/core@7.24.9: + resolution: {integrity: sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.24.7 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.9 '@babel/helper-compilation-targets': 7.24.8 - '@babel/helper-module-transforms': 7.24.8(@babel/core@7.24.8) + '@babel/helper-module-transforms': 7.24.9(@babel/core@7.24.9) '@babel/helpers': 7.24.8 '@babel/parser': 7.24.8 '@babel/template': 7.24.7 '@babel/traverse': 7.23.2 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 convert-source-map: 2.0.0 debug: 4.3.5 gensync: 1.0.0-beta.2 @@ -2674,11 +2674,11 @@ packages: '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 - /@babel/generator@7.24.8: - resolution: {integrity: sha512-47DG+6F5SzOi0uEvK4wMShmn5yY0mVjVJoWTphdY2B4Rx9wHgjK7Yhtr0ru6nE+sn0v38mzrWOlah0p/YlHHOQ==} + /@babel/generator@7.24.9: + resolution: {integrity: sha512-G8v3jRg+z8IwY1jHFxvCNhOPYPterE4XljNgdGTYfSTtzzwjIswIzIaSPSLs3R7yFuqnqNeay5rjICfqVr+/6A==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 @@ -2705,7 +2705,7 @@ packages: resolution: {integrity: sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/compat-data': 7.24.8 + '@babel/compat-data': 7.24.9 '@babel/helper-validator-option': 7.24.8 browserslist: 4.23.2 lru-cache: 5.1.1 @@ -2785,13 +2785,13 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-module-transforms@7.24.8(@babel/core@7.24.8): - resolution: {integrity: sha512-m4vWKVqvkVAWLXfHCCfff2luJj86U+J0/x+0N3ArG/tP0Fq7zky2dYwMbtPmkc/oulkkbjdL3uWzuoBwQ8R00Q==} + /@babel/helper-module-transforms@7.24.9(@babel/core@7.24.9): + resolution: {integrity: sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.24.8 + '@babel/core': 7.24.9 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 @@ -2885,7 +2885,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.24.7 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 dev: true /@babel/highlight@7.24.7: @@ -2909,7 +2909,7 @@ packages: engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 dev: true /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.24.7): @@ -3376,8 +3376,8 @@ packages: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - /@babel/types@7.24.8: - resolution: {integrity: sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==} + /@babel/types@7.24.9: + resolution: {integrity: sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.8 @@ -5939,7 +5939,6 @@ packages: - supports-color - tedious dev: false - optional: true /@mikro-orm/knex@6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.0)(pg@8.12.0): resolution: {integrity: sha512-eSHPiS5em+RGv/jx5lP7a1xDVVlnrG+l90/7N7WAgTGcPOzyILVw9EJOZl2KR8dh8EfPI6Wm35Lo4qkO2LoDUg==} @@ -6082,7 +6081,6 @@ packages: - supports-color - tedious dev: false - optional: true /@mikro-orm/mysql@6.2.9(@mikro-orm/core@6.2.9)(pg@8.12.0): resolution: {integrity: sha512-q9lYdxNekAXB9ys8SRijYf5dAMZ0/AZCwbzWjHlcFcUIf0+R1pUTZdnT6T0qDs+I7wjCwXt+EtWIh50CFGbxHA==} @@ -6105,6 +6103,30 @@ packages: - tedious dev: false + /@mikro-orm/postgresql@6.2.9(@mikro-orm/core@6.2.9): + resolution: {integrity: sha512-CRW5QPvsQhlhRZbx9SsgLrdC7LxCSbz+Pm5rAA8S1SAZG8qJ1WxMovHF61PFZj/7rydnb9fSh4nVwfutOyYwWg==} + engines: {node: '>= 18.12.0'} + peerDependencies: + '@mikro-orm/core': ^6.0.0 + dependencies: + '@mikro-orm/core': 6.2.9 + '@mikro-orm/knex': 6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.0)(pg@8.11.5) + pg: 8.11.5 + postgres-array: 3.0.2 + postgres-date: 2.1.0 + postgres-interval: 4.0.2 + transitivePeerDependencies: + - better-sqlite3 + - libsql + - mariadb + - mysql + - mysql2 + - pg-native + - sqlite3 + - supports-color + - tedious + dev: false + /@mikro-orm/postgresql@6.2.9(@mikro-orm/core@6.2.9)(mysql2@3.10.2): resolution: {integrity: sha512-CRW5QPvsQhlhRZbx9SsgLrdC7LxCSbz+Pm5rAA8S1SAZG8qJ1WxMovHF61PFZj/7rydnb9fSh4nVwfutOyYwWg==} engines: {node: '>= 18.12.0'} @@ -9611,7 +9633,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001641 + caniuse-lite: 1.0.30001642 electron-to-chromium: 1.4.827 node-releases: 2.0.14 update-browserslist-db: 1.1.0(browserslist@4.23.2) @@ -9816,8 +9838,8 @@ packages: /caniuse-lite@1.0.30001640: resolution: {integrity: sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==} - /caniuse-lite@1.0.30001641: - resolution: {integrity: sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==} + /caniuse-lite@1.0.30001642: + resolution: {integrity: sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==} dev: true /capital-case@1.0.4: @@ -13636,7 +13658,6 @@ packages: transitivePeerDependencies: - supports-color dev: false - optional: true /knex@3.1.0(mysql2@3.10.0)(pg@8.12.0): resolution: {integrity: sha512-GLoII6hR0c4ti243gMs5/1Rb3B+AjwMOfjYm97pu0FOQa7JH56hgBxYf5WK2525ceSbBY1cjeZ9yk99GPMB6Kw==} @@ -17082,7 +17103,7 @@ packages: dependencies: tslib: 2.6.3 - /ts-jest@29.2.2(@babel/core@7.24.8)(jest@29.7.0)(typescript@5.5.3): + /ts-jest@29.2.2(@babel/core@7.24.9)(jest@29.7.0)(typescript@5.5.3): resolution: {integrity: sha512-sSW7OooaKT34AAngP6k1VS669a0HdLxkQZnlC7T76sckGCokXFnvJ3yRlQZGRTAoV5K19HfSgCiSwWOSIfcYlg==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -17106,7 +17127,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.24.8 + '@babel/core': 7.24.9 bs-logger: 0.2.6 ejs: 3.1.10 fast-json-stable-stringify: 2.1.0