Compare commits

...

15 Commits

Author SHA1 Message Date
github-actions[bot]
7163854767 chore: update versions (#2724)
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @nhost/apollo@7.1.2

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost/react-apollo@12.0.2

### Patch Changes

-   @nhost/apollo@7.1.2
-   @nhost/react@3.5.2

## @nhost/react-urql@9.0.2

### Patch Changes

-   @nhost/react@3.5.2

## @nhost/hasura-auth-js@2.5.2

### Patch Changes

- a03fb2c: fix: deep clone machine context to prevent mutations in
nested objects during initial session setup

## @nhost/nextjs@2.1.16

### Patch Changes

-   @nhost/react@3.5.2

## @nhost/nhost-js@3.1.5

### Patch Changes

-   Updated dependencies [a03fb2c]
    -   @nhost/hasura-auth-js@2.5.2

## @nhost/react@3.5.2

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost/vue@2.6.2

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost/docs@2.13.0

### Minor Changes

-   6fb0cc2: fix: minor improvements to compute resources' docs
-   66bd450: chore: various improvements

## @nhost/dashboard@1.16.3

### Patch Changes

- 87a37cf: fix: remove unnecessary isPlatform check from verify button
disable logic on custom domains
    -   @nhost/react-apollo@12.0.2
    -   @nhost/nextjs@2.1.16

## @nhost-examples/cli@0.3.7

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost-examples/codegen-react-apollo@0.4.7

### Patch Changes

-   @nhost/react@3.5.2
-   @nhost/react-apollo@12.0.2

## @nhost-examples/codegen-react-query@0.4.7

### Patch Changes

-   @nhost/react@3.5.2

## @nhost-examples/codegen-react-urql@0.3.7

### Patch Changes

-   @nhost/react@3.5.2
-   @nhost/react-urql@9.0.2

## @nhost-examples/multi-tenant-one-to-many@2.2.7

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost-examples/nextjs@0.3.7

### Patch Changes

-   @nhost/react@3.5.2
-   @nhost/react-apollo@12.0.2
-   @nhost/nextjs@2.1.16

## @nhost-examples/node-storage@0.2.7

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost-examples/nextjs-server-components@0.4.7

### Patch Changes

-   @nhost/nhost-js@3.1.5

## @nhost-examples/react-apollo@0.8.7

### Patch Changes

-   @nhost/react@3.5.2
-   @nhost/react-apollo@12.0.2

## @nhost-examples/react-gqty@1.2.7

### Patch Changes

-   @nhost/react@3.5.2

## @nhost-examples/vue-apollo@0.6.7

### Patch Changes

-   @nhost/nhost-js@3.1.5
-   @nhost/apollo@7.1.2
-   @nhost/vue@2.6.2

## @nhost-examples/vue-quickstart@0.2.7

### Patch Changes

-   @nhost/apollo@7.1.2
-   @nhost/vue@2.6.2

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-05-31 10:25:11 +01:00
David Barroso
66bd4504d7 chore (docs): various improvements (#2738)
- Adds references to custom domains in social signin methods
- a short note to remind users to update the SDK instantiation when
using custom domains
- added a sample function to generate custom jwts
2024-05-31 11:22:11 +02:00
Hassan Ben Jobrane
a03fb2cf82 fix(hasura-auth-js): deep clone machine context to avoid mutating nested objects (#2736)
fixes https://github.com/nhost/nhost/issues/2732
2024-05-31 10:20:18 +01:00
Hassan Ben Jobrane
87a37cfc08 fix(dashboard): remove isPlatform check from verify button disable logic (#2737) 2024-05-31 09:54:55 +01:00
David Barroso
6fb0cc27aa fix (docs): improvements to compute resources (#2723) 2024-05-23 16:19:36 +02:00
github-actions[bot]
2c33051f83 chore: update versions (#2719)
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @nhost/apollo@7.1.1

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost/react-apollo@12.0.1

### Patch Changes

-   @nhost/apollo@7.1.1
-   @nhost/react@3.5.1

## @nhost/react-urql@9.0.1

### Patch Changes

-   @nhost/react@3.5.1

## @nhost/hasura-auth-js@2.5.1

### Patch Changes

- f4f0353: fix: improve environment/browser detection to support React
Native
- defffd8: fix: resolve issue where `/token` endpoint is called with an
empty token during sign-in

## @nhost/nextjs@2.1.15

### Patch Changes

-   @nhost/react@3.5.1

## @nhost/nhost-js@3.1.4

### Patch Changes

-   Updated dependencies [f4f0353]
-   Updated dependencies [defffd8]
    -   @nhost/hasura-auth-js@2.5.1

## @nhost/react@3.5.1

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost/vue@2.6.1

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost/dashboard@1.16.2

### Patch Changes

- a9413af: fix: update `GetAllWorkspacesAndProjects` query polling to
use exponential backoff
    -   @nhost/react-apollo@12.0.1
    -   @nhost/nextjs@2.1.15

## @nhost-examples/cli@0.3.6

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost-examples/codegen-react-apollo@0.4.6

### Patch Changes

-   @nhost/react@3.5.1
-   @nhost/react-apollo@12.0.1

## @nhost-examples/codegen-react-query@0.4.6

### Patch Changes

-   @nhost/react@3.5.1

## @nhost-examples/codegen-react-urql@0.3.6

### Patch Changes

-   @nhost/react@3.5.1
-   @nhost/react-urql@9.0.1

## @nhost-examples/multi-tenant-one-to-many@2.2.6

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost-examples/nextjs@0.3.6

### Patch Changes

-   @nhost/react@3.5.1
-   @nhost/react-apollo@12.0.1
-   @nhost/nextjs@2.1.15

## @nhost-examples/node-storage@0.2.6

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost-examples/nextjs-server-components@0.4.6

### Patch Changes

-   @nhost/nhost-js@3.1.4

## @nhost-examples/react-apollo@0.8.6

### Patch Changes

-   @nhost/react@3.5.1
-   @nhost/react-apollo@12.0.1

## @nhost-examples/react-gqty@1.2.6

### Patch Changes

-   @nhost/react@3.5.1

## @nhost-examples/vue-apollo@0.6.6

### Patch Changes

-   @nhost/nhost-js@3.1.4
-   @nhost/apollo@7.1.1
-   @nhost/vue@2.6.1

## @nhost-examples/vue-quickstart@0.2.6

### Patch Changes

-   @nhost/apollo@7.1.1
-   @nhost/vue@2.6.1

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-05-21 15:23:32 +01:00
Hassan Ben Jobrane
a9413af6e0 fix: update GetAllWorkspacesAndProjects query polling to use exp backoff (#2718) 2024-05-21 13:44:38 +01:00
Hassan Ben Jobrane
f4f0353f2e fix(hasura-auth-js): resolve social sign-in issue in React Native (#2716)
fix https://github.com/nhost/nhost/issues/2216
2024-05-20 19:13:13 +01:00
Hassan Ben Jobrane
defffd8bc4 fix: update internal-client to use payload.token instead of payload.token.data (#2717) 2024-05-20 19:05:21 +01:00
github-actions[bot]
614c20cbbf chore: update versions (#2712)
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @nhost/apollo@7.1.0

### Minor Changes

-   d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost/graphql-js@0.3.0

### Minor Changes

-   d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0

## @nhost/hasura-auth-js@2.5.0

### Minor Changes

-   d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0

## @nhost/react@3.5.0

### Minor Changes

-   d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost/vue@2.6.0

### Minor Changes

-   d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost/react-apollo@12.0.0

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/apollo@7.1.0
    -   @nhost/react@3.5.0

## @nhost/react-urql@9.0.0

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0

## @nhost/nextjs@2.1.14

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0

## @nhost/nhost-js@3.1.3

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/hasura-auth-js@2.5.0
    -   @nhost/graphql-js@0.3.0

## @nhost/dashboard@1.16.1

### Patch Changes

-   @nhost/react-apollo@12.0.0
-   @nhost/nextjs@2.1.14

## @nhost-examples/cli@0.3.5

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost-examples/codegen-react-apollo@0.4.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0
    -   @nhost/react-apollo@12.0.0

## @nhost-examples/codegen-react-query@0.4.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0

## @nhost-examples/codegen-react-urql@0.3.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0
    -   @nhost/react-urql@9.0.0

## @nhost-examples/multi-tenant-one-to-many@2.2.5

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost-examples/nextjs@0.3.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0
    -   @nhost/react-apollo@12.0.0
    -   @nhost/nextjs@2.1.14

## @nhost-examples/node-storage@0.2.5

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost-examples/nextjs-server-components@0.4.5

### Patch Changes

-   @nhost/nhost-js@3.1.3

## @nhost-examples/react-apollo@0.8.5

### Patch Changes

-   aef4a0a: fix: resolve e2e test issues
-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0
    -   @nhost/react-apollo@12.0.0

## @nhost-examples/react-gqty@1.2.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/react@3.5.0

## @nhost-examples/vue-apollo@0.6.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/apollo@7.1.0
    -   @nhost/vue@2.6.0
    -   @nhost/nhost-js@3.1.3

## @nhost-examples/vue-quickstart@0.2.5

### Patch Changes

-   Updated dependencies [d0c9f4c]
    -   @nhost/apollo@7.1.0
    -   @nhost/vue@2.6.0

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-05-15 19:24:01 +01:00
Hassan Ben Jobrane
aef4a0a4fc fix: examples: react-apollo: address e2e test issues (#2714)
fixes https://github.com/nhost/nhost/issues/2711
2024-05-15 19:07:42 +01:00
Hassan Ben Jobrane
d0c9f4cd17 fix: replace jose with jwt-decode version 4.0.0 (#2705)
fixes https://github.com/nhost/nhost/issues/2603
2024-05-15 14:35:16 +01:00
github-actions[bot]
e2646cab55 chore: update versions (#2709)
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @nhost/dashboard@1.16.0

### Minor Changes

- c6d5c5c: feat: add toggle switch to enable/disable public access in
the database settings

## @nhost/docs@2.12.0

### Minor Changes

-   d5077c7: feat: added docs about how to connect to postgres

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-05-15 09:36:54 +01:00
David Barroso
d5077c7ca4 feat (docs): added docs about how to connect to postgres (#2708) 2024-05-15 10:15:23 +02:00
Hassan Ben Jobrane
c6d5c5cc8c feat: dashboard: add toggle switch to enable/disable database public access (#2707) 2024-05-15 09:12:06 +01:00
85 changed files with 1125 additions and 193 deletions

View File

@@ -1,5 +1,34 @@
# @nhost/dashboard
## 1.16.3
### Patch Changes
- 87a37cf: fix: remove unnecessary isPlatform check from verify button disable logic on custom domains
- @nhost/react-apollo@12.0.2
- @nhost/nextjs@2.1.16
## 1.16.2
### Patch Changes
- a9413af: fix: update `GetAllWorkspacesAndProjects` query polling to use exponential backoff
- @nhost/react-apollo@12.0.1
- @nhost/nextjs@2.1.15
## 1.16.1
### Patch Changes
- @nhost/react-apollo@12.0.0
- @nhost/nextjs@2.1.14
## 1.16.0
### Minor Changes
- c6d5c5c: feat: add toggle switch to enable/disable public access in the database settings
## 1.15.2
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/dashboard",
"version": "1.15.2",
"version": "1.16.3",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",

View File

@@ -1,3 +1,7 @@
import { ApplyLocalSettingsDialog } from '@/components/common/ApplyLocalSettingsDialog';
import { useDialog } from '@/components/common/DialogProvider';
import { useUI } from '@/components/common/UIProvider';
import { Form } from '@/components/form/Form';
import { SettingsContainer } from '@/components/layout/SettingsContainer';
import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
import { Alert } from '@/components/ui/v2/Alert';
@@ -7,11 +11,32 @@ import type { InputProps } from '@/components/ui/v2/Input';
import { Input } from '@/components/ui/v2/Input';
import { InputAdornment } from '@/components/ui/v2/InputAdornment';
import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
import { useIsPlatform } from '@/features/projects/common/hooks/useIsPlatform';
import { generateAppServiceUrl } from '@/features/projects/common/utils/generateAppServiceUrl';
import { useLocalMimirClient } from '@/hooks/useLocalMimirClient';
import { copy } from '@/utils/copy';
import { useGetPostgresSettingsQuery } from '@/utils/__generated__/graphql';
import { execPromiseWithErrorToast } from '@/utils/execPromiseWithErrorToast';
import {
useGetPostgresSettingsQuery,
useUpdateConfigMutation,
} from '@/utils/__generated__/graphql';
import { yupResolver } from '@hookform/resolvers/yup';
import { FormProvider, useForm } from 'react-hook-form';
import * as Yup from 'yup';
const databasePublicAccessValidationSchema = Yup.object({
enablePublicAccess: Yup.bool(),
});
type DatabasePublicAccessFormValues = Yup.InferType<
typeof databasePublicAccessValidationSchema
>;
export default function DatabaseConnectionInfo() {
const { openDialog } = useDialog();
const isPlatform = useIsPlatform();
const { maintenanceActive } = useUI();
const localMimirClient = useLocalMimirClient();
const { currentProject } = useCurrentWorkspaceAndProject();
const { data, loading, error } = useGetPostgresSettingsQuery({
@@ -19,6 +44,61 @@ export default function DatabaseConnectionInfo() {
fetchPolicy: 'cache-only',
});
const [updateConfig] = useUpdateConfigMutation({
...(!isPlatform ? { client: localMimirClient } : {}),
});
const enablePublicAccess =
!!data?.config?.postgres?.resources?.enablePublicAccess;
const form = useForm<DatabasePublicAccessFormValues>({
reValidateMode: 'onSubmit',
defaultValues: {
enablePublicAccess,
},
resolver: yupResolver(databasePublicAccessValidationSchema),
});
async function handleSubmit(formValues: DatabasePublicAccessFormValues) {
const updateConfigPromise = updateConfig({
variables: {
appId: currentProject.id,
config: {
postgres: {
resources: {
enablePublicAccess: formValues.enablePublicAccess,
},
},
},
},
});
await execPromiseWithErrorToast(
async () => {
await updateConfigPromise;
form.reset(formValues);
if (!isPlatform) {
openDialog({
title: 'Apply your changes',
component: <ApplyLocalSettingsDialog />,
props: {
PaperProps: {
className: 'max-w-2xl',
},
},
});
}
},
{
loadingMessage: 'Database settings are being updated...',
successMessage: 'Database settings have been updated successfully.',
errorMessage:
"An error occurred while trying to update the project's database settings.",
},
);
}
if (loading) {
return (
<ActivityIndicator
@@ -76,49 +156,72 @@ export default function DatabaseConnectionInfo() {
},
];
return (
<SettingsContainer
title="Connection Info"
description="Connect directly to the Postgres database with this information."
slotProps={{ footer: { className: 'hidden' } }}
className="grid grid-cols-6 gap-4 pb-2"
>
{settingsDatabaseCustomInputs.map(
({ name, label, className, value: inputValue }) => (
<Input
key={name}
label={label}
required
disabled
value={inputValue}
className={className}
slotProps={{ inputRoot: { className: '!pr-8 truncate' } }}
fullWidth
hideEmptyHelperText
endAdornment={
<InputAdornment position="end" className="absolute right-2">
<Button
sx={{ minWidth: 0, padding: 0 }}
color="secondary"
variant="borderless"
onClick={(e) => {
e.stopPropagation();
copy(inputValue as string, `${label}`);
}}
>
<CopyIcon className="h-4 w-4" />
</Button>
</InputAdornment>
}
/>
),
)}
const { formState } = form;
<Alert severity="info" className="col-span-6 text-left">
To connect to the Postgres database directly, generate a new password,
securely save it, and then modify your connection string with the newly
created password.
</Alert>
</SettingsContainer>
return (
<FormProvider {...form}>
<Form onSubmit={handleSubmit}>
<SettingsContainer
title="Public access"
description={
enablePublicAccess
? 'Connect directly to the Postgres database with this information.'
: 'Enable public access to your Postgres database.'
}
slotProps={{
submitButton: {
disabled: !formState.isDirty || maintenanceActive,
loading: formState.isSubmitting,
},
}}
className="grid grid-cols-6 gap-4 pb-2"
switchId="enablePublicAccess"
showSwitch
>
{enablePublicAccess && (
<>
{settingsDatabaseCustomInputs.map(
({ name, label, className, value: inputValue }) => (
<Input
key={name}
label={label}
required
disabled
value={inputValue}
className={className}
slotProps={{ inputRoot: { className: '!pr-8 truncate' } }}
fullWidth
hideEmptyHelperText
endAdornment={
<InputAdornment
position="end"
className="absolute right-2"
>
<Button
sx={{ minWidth: 0, padding: 0 }}
color="secondary"
variant="borderless"
onClick={(e) => {
e.stopPropagation();
copy(inputValue as string, `${label}`);
}}
>
<CopyIcon className="w-4 h-4" />
</Button>
</InputAdornment>
}
/>
),
)}
<Alert severity="info" className="col-span-6 text-left">
To connect to the Postgres database directly, generate a new
password, securely save it, and then modify your connection
string with the newly created password.
</Alert>
</>
)}
</SettingsContainer>
</Form>
</FormProvider>
);
}

View File

@@ -13,6 +13,7 @@ query GetPostgresSettings($appId: uuid!) {
storage {
capacity
}
enablePublicAccess
}
}
}

View File

@@ -5,7 +5,9 @@ import { useGetAnnouncementsQuery } from '@/utils/__generated__/graphql';
import formatDistance from 'date-fns/formatDistance';
export default function Announcements() {
const { data, loading, error } = useGetAnnouncementsQuery();
const { data, loading, error } = useGetAnnouncementsQuery({
fetchPolicy: 'cache-first',
});
const announcements = data?.announcements || [];

View File

@@ -131,7 +131,7 @@ export default function VerifyDomain({
</div>
{isPlatform ? (
<Button
disabled={loading || !hostname || isPlatform}
disabled={loading || !hostname}
onClick={handleVerifyDomain}
className="mt-4 sm:absolute sm:bottom-0 sm:right-0 sm:mt-0"
>

View File

@@ -6,6 +6,7 @@ mutation UpdateConfig($appId: uuid!, $config: ConfigConfigUpdateInput!) {
storage {
capacity
}
enablePublicAccess
}
}
ai {

View File

@@ -7,41 +7,55 @@ import { Button } from '@/components/ui/v2/Button';
import { Text } from '@/components/ui/v2/Text';
import { WorkspaceAndProjectList } from '@/features/projects/common/components/WorkspaceAndProjectList';
import { WorkspaceSidebar } from '@/features/projects/common/components/WorkspaceSidebar';
import { useGetAllWorkspacesAndProjectsQuery } from '@/utils/__generated__/graphql';
import {
useGetAllWorkspacesAndProjectsQuery,
type GetAllWorkspacesAndProjectsQuery,
} from '@/utils/__generated__/graphql';
import { NetworkStatus } from '@apollo/client';
import { darken } from '@mui/system';
import { useUserData } from '@nhost/nextjs';
import NavLink from 'next/link';
import type { ReactElement } from 'react';
import { useEffect } from 'react';
import { useState, type ReactElement } from 'react';
export default function IndexPage() {
const user = useUserData();
const { data, loading, startPolling, stopPolling } =
const [, setPollInterval] = useState(1_000);
// keep polling for workspaces until there is a workspace available.
// We do this because when a user signs up a workspace is created automatically
// and the serverless function can take some time to complete.
const { data, startPolling, stopPolling, networkStatus } =
useGetAllWorkspacesAndProjectsQuery({
skip: !user,
notifyOnNetworkStatusChange: true,
onError: () => {
// When there's an error (graphql, network error) apply an exponential backoff strategy
setPollInterval((prevInterval) => {
const newInterval = Math.min(60_000, prevInterval * 2);
startPolling(newInterval);
return newInterval;
});
},
onCompleted: (queryData: GetAllWorkspacesAndProjectsQuery) => {
if (!queryData?.workspaces.length) {
setPollInterval(1000);
startPolling(1000);
} else {
setPollInterval(0);
stopPolling();
}
},
});
// keep showing loading indicator while polling
const loading = networkStatus === NetworkStatus.loading;
const numberOfProjects = data?.workspaces.reduce(
(projectCount, currentWorkspace) =>
projectCount + currentWorkspace.projects.length,
0,
);
// keep polling for workspaces until there is a workspace available.
// We do this because when a user signs up a workspace is created automatically
// and the serverless function can take some time to complete.
useEffect(() => {
startPolling(1000);
}, [startPolling]);
useEffect(() => {
if (!data?.workspaces.length) {
return;
}
stopPolling();
}, [data?.workspaces, stopPolling]);
if ((!data && loading) || !user) {
return <LoadingScreen />;
}

View File

@@ -1804,6 +1804,7 @@ export type ConfigPostgresInsertInput = {
export type ConfigPostgresResources = {
__typename?: 'ConfigPostgresResources';
compute?: Maybe<ConfigResourcesCompute>;
enablePublicAccess?: Maybe<Scalars['Boolean']>;
networking?: Maybe<ConfigNetworking>;
/** Number of replicas for a service */
replicas?: Maybe<Scalars['ConfigUint8']>;
@@ -1815,6 +1816,7 @@ export type ConfigPostgresResourcesComparisonExp = {
_not?: InputMaybe<ConfigPostgresResourcesComparisonExp>;
_or?: InputMaybe<Array<ConfigPostgresResourcesComparisonExp>>;
compute?: InputMaybe<ConfigResourcesComputeComparisonExp>;
enablePublicAccess?: InputMaybe<ConfigBooleanComparisonExp>;
networking?: InputMaybe<ConfigNetworkingComparisonExp>;
replicas?: InputMaybe<ConfigUint8ComparisonExp>;
storage?: InputMaybe<ConfigPostgresStorageComparisonExp>;
@@ -1822,6 +1824,7 @@ export type ConfigPostgresResourcesComparisonExp = {
export type ConfigPostgresResourcesInsertInput = {
compute?: InputMaybe<ConfigResourcesComputeInsertInput>;
enablePublicAccess?: InputMaybe<Scalars['Boolean']>;
networking?: InputMaybe<ConfigNetworkingInsertInput>;
replicas?: InputMaybe<Scalars['ConfigUint8']>;
storage?: InputMaybe<ConfigPostgresStorageInsertInput>;
@@ -1829,6 +1832,7 @@ export type ConfigPostgresResourcesInsertInput = {
export type ConfigPostgresResourcesUpdateInput = {
compute?: InputMaybe<ConfigResourcesComputeUpdateInput>;
enablePublicAccess?: InputMaybe<Scalars['Boolean']>;
networking?: InputMaybe<ConfigNetworkingUpdateInput>;
replicas?: InputMaybe<Scalars['ConfigUint8']>;
storage?: InputMaybe<ConfigPostgresStorageUpdateInput>;
@@ -2526,6 +2530,7 @@ export type ConfigSystemConfigPostgres = {
database: Scalars['String'];
disk?: Maybe<ConfigSystemConfigPostgresDisk>;
enabled?: Maybe<Scalars['Boolean']>;
majorVersion?: Maybe<Scalars['String']>;
};
export type ConfigSystemConfigPostgresComparisonExp = {
@@ -2536,6 +2541,7 @@ export type ConfigSystemConfigPostgresComparisonExp = {
database?: InputMaybe<ConfigStringComparisonExp>;
disk?: InputMaybe<ConfigSystemConfigPostgresDiskComparisonExp>;
enabled?: InputMaybe<ConfigBooleanComparisonExp>;
majorVersion?: InputMaybe<ConfigStringComparisonExp>;
};
export type ConfigSystemConfigPostgresConnectionString = {
@@ -2599,6 +2605,7 @@ export type ConfigSystemConfigPostgresInsertInput = {
database: Scalars['String'];
disk?: InputMaybe<ConfigSystemConfigPostgresDiskInsertInput>;
enabled?: InputMaybe<Scalars['Boolean']>;
majorVersion?: InputMaybe<Scalars['String']>;
};
export type ConfigSystemConfigPostgresUpdateInput = {
@@ -2606,6 +2613,7 @@ export type ConfigSystemConfigPostgresUpdateInput = {
database?: InputMaybe<Scalars['String']>;
disk?: InputMaybe<ConfigSystemConfigPostgresDiskUpdateInput>;
enabled?: InputMaybe<Scalars['Boolean']>;
majorVersion?: InputMaybe<Scalars['String']>;
};
export type ConfigSystemConfigUpdateInput = {
@@ -2687,14 +2695,6 @@ export type Metrics = {
value: Scalars['float64'];
};
export type StatsDailyLiveFreeApps = {
__typename?: 'StatsDailyLiveFreeApps';
avg: Scalars['Int'];
max: Scalars['Int'];
min: Scalars['Int'];
raw: Array<Scalars['Int']>;
};
export type StatsLiveApps = {
__typename?: 'StatsLiveApps';
appID: Array<Scalars['uuid']>;
@@ -11826,6 +11826,7 @@ export type Mutation_Root = {
billingUpdatePersistentVolume: Scalars['Boolean'];
billingUpdateReports: Scalars['Boolean'];
billingUploadReports: Scalars['Boolean'];
changeDatabaseVersion: Scalars['Boolean'];
/** delete single row from the table: "apps" */
deleteApp?: Maybe<Apps>;
/** delete single row from the table: "app_states" */
@@ -12511,6 +12512,14 @@ export type Mutation_RootBillingUpdateReportsArgs = {
};
/** mutation root */
export type Mutation_RootChangeDatabaseVersionArgs = {
appID: Scalars['uuid'];
force?: InputMaybe<Scalars['Boolean']>;
version: Scalars['String'];
};
/** mutation root */
export type Mutation_RootDeleteAppArgs = {
id: Scalars['uuid'];
@@ -16016,12 +16025,6 @@ export type Query_Root = {
softwareVersions: Array<Software_Versions>;
/** fetch aggregated fields from the table: "software_versions" */
softwareVersionsAggregate: Software_Versions_Aggregate;
/**
* Returns the per-day number of free live apps in the given time range, as well as the min, max and avg.
*
* Requests that returned a 4xx or 5xx status code are not counted as live traffic.
*/
statsDailyLiveFreeApps: StatsDailyLiveFreeApps;
/**
* Returns lists of apps that have some live traffic in the give time range.
* From defaults to 24 hours ago and to defaults to now.
@@ -16031,6 +16034,8 @@ export type Query_Root = {
statsLiveApps: StatsLiveApps;
systemConfig?: Maybe<ConfigSystemConfig>;
systemConfigs: Array<ConfigAppSystemConfig>;
/** Returns system logs for a given application */
systemLogs: Array<Log>;
/** fetch data from the table: "auth.users" using primary key columns */
user?: Maybe<Users>;
/** fetch data from the table: "auth.users" */
@@ -17079,12 +17084,6 @@ export type Query_RootSoftwareVersionsAggregateArgs = {
};
export type Query_RootStatsDailyLiveFreeAppsArgs = {
from?: InputMaybe<Scalars['Timestamp']>;
to?: InputMaybe<Scalars['Timestamp']>;
};
export type Query_RootStatsLiveAppsArgs = {
from?: InputMaybe<Scalars['Timestamp']>;
to?: InputMaybe<Scalars['Timestamp']>;
@@ -17101,6 +17100,14 @@ export type Query_RootSystemConfigsArgs = {
};
export type Query_RootSystemLogsArgs = {
action: Scalars['String'];
appID: Scalars['String'];
from?: InputMaybe<Scalars['Timestamp']>;
to?: InputMaybe<Scalars['Timestamp']>;
};
export type Query_RootUserArgs = {
id: Scalars['uuid'];
};
@@ -22690,7 +22697,7 @@ export type GetPostgresSettingsQueryVariables = Exact<{
}>;
export type GetPostgresSettingsQuery = { __typename?: 'query_root', systemConfig?: { __typename?: 'ConfigSystemConfig', postgres: { __typename?: 'ConfigSystemConfigPostgres', database: string } } | null, config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', postgres?: { __typename?: 'ConfigPostgres', version?: string | null, resources?: { __typename?: 'ConfigPostgresResources', storage?: { __typename?: 'ConfigPostgresStorage', capacity: any } | null } | null } | null } | null };
export type GetPostgresSettingsQuery = { __typename?: 'query_root', systemConfig?: { __typename?: 'ConfigSystemConfig', postgres: { __typename?: 'ConfigSystemConfigPostgres', database: string } } | null, config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', postgres?: { __typename?: 'ConfigPostgres', version?: string | null, resources?: { __typename?: 'ConfigPostgresResources', enablePublicAccess?: boolean | null, storage?: { __typename?: 'ConfigPostgresStorage', capacity: any } | null } | null } | null } | null };
export type ResetDatabasePasswordMutationVariables = Exact<{
appId: Scalars['String'];
@@ -22922,7 +22929,7 @@ export type UpdateConfigMutationVariables = Exact<{
}>;
export type UpdateConfigMutation = { __typename?: 'mutation_root', updateConfig: { __typename?: 'ConfigConfig', id: 'ConfigConfig', postgres?: { __typename?: 'ConfigPostgres', resources?: { __typename?: 'ConfigPostgresResources', storage?: { __typename?: 'ConfigPostgresStorage', capacity: any } | null } | null } | null, ai?: { __typename?: 'ConfigAI', version?: string | null, webhookSecret: string, autoEmbeddings?: { __typename?: 'ConfigAIAutoEmbeddings', synchPeriodMinutes?: any | null } | null, openai: { __typename?: 'ConfigAIOpenai', organization?: string | null, apiKey: string }, resources: { __typename?: 'ConfigAIResources', compute: { __typename?: 'ConfigComputeResources', cpu: any, memory: any } } } | null } };
export type UpdateConfigMutation = { __typename?: 'mutation_root', updateConfig: { __typename?: 'ConfigConfig', id: 'ConfigConfig', postgres?: { __typename?: 'ConfigPostgres', resources?: { __typename?: 'ConfigPostgresResources', enablePublicAccess?: boolean | null, storage?: { __typename?: 'ConfigPostgresStorage', capacity: any } | null } | null } | null, ai?: { __typename?: 'ConfigAI', version?: string | null, webhookSecret: string, autoEmbeddings?: { __typename?: 'ConfigAIAutoEmbeddings', synchPeriodMinutes?: any | null } | null, openai: { __typename?: 'ConfigAIOpenai', organization?: string | null, apiKey: string }, resources: { __typename?: 'ConfigAIResources', compute: { __typename?: 'ConfigComputeResources', cpu: any, memory: any } } } | null } };
export type UnpauseApplicationMutationVariables = Exact<{
appId: Scalars['uuid'];
@@ -24065,6 +24072,7 @@ export const GetPostgresSettingsDocument = gql`
storage {
capacity
}
enablePublicAccess
}
}
}
@@ -25428,6 +25436,7 @@ export const UpdateConfigDocument = gql`
storage {
capacity
}
enablePublicAccess
}
}
ai {

View File

@@ -1,5 +1,18 @@
# @nhost/docs
## 2.13.0
### Minor Changes
- 6fb0cc2: fix: minor improvements to compute resources' docs
- 66bd450: chore: various improvements
## 2.12.0
### Minor Changes
- d5077c7: feat: added docs about how to connect to postgres
## 2.11.0
### Minor Changes

View File

@@ -0,0 +1,176 @@
---
title: Custom JWTs
description: Creating custom JWTs
icon: ghost
---
In some cases it is necessary to act on behalf of a user. While the Auth service doesn't allow that it is not difficult to implement such functionality as a serverless function. Below you can find an example of a function that can generate a valid access token for your application with customized values. For details read the docstring in the function itself.
Feel free to adapt to your needs.
### Dependencies
```
npm install jsonwebtoken
```
### Function
Create a file under `functions` (for instance `/functions/custom-jwts.ts`), with the following contents:
```js
import { Request, Response } from 'express'
import process from 'process'
import jwt from 'jsonwebtoken'
// function to extract jwt from the request
const getJwt = (req: Request): string | null => {
const authHeader = req.headers.authorization
if (!authHeader) {
return null
}
const parts = authHeader.split(' ')
if (parts.length !== 2) {
return null
}
const [scheme, token] = parts
if (!/^Bearer$/i.test(scheme)) {
return null
}
return token
}
// validate jwt token is valid and caller is either an admin or an operator
const jwtIsAuthorized = (req: Request, key: string): string => {
const token = getJwt(req)
if (!token) {
return ""
}
try {
const decoded = jwt.verify(token, key)
const claims = decoded['https://hasura.io/jwt/claims']
if ( !claims || !claims['x-hasura-allowed-roles'] ) {
return ""
}
if (
claims['x-hasura-allowed-roles'].includes('admin') ||
claims['x-hasura-allowed-roles'].includes('operator')
) {
return decoded.sub
}
return ""
} catch (e) {
return ""
}
}
/*
This is a sample function that generates a JWT token to impersonate users.
Authorization:
- send a valid JWT token with the request. The token should have the `admin` or `operator` role.
- send the `x-hasura-admin-secret` header with the request
Body:
A json object with the following keys:
- `userId` (string): the user id for which the token is generated
- `defaultRole` (string): the default role for the userId
- `allowedRoles` (array of strings): the roles that the userId can assume
Returns:
A json object with the following keys:
- `accessToken` (string) - The generated access token
In addition to the typical JWT claims generated by Nhost, the token generated by this function will have the following claims:
- `x-hasura-on-behalf-of`: the user id of the caller or `admin` if the caller used the `x-hasura-admin-secret` header
You are free to modify this function to suit your needs.
*/
export default (req: Request, res: Response) => {
let authorizedCaller = ""
if (req.headers['x-hasura-admin-secret'] === process.env.HASURA_GRAPHQL_ADMIN_SECRET) {
authorizedCaller = "admin"
}
const jwtSecret = JSON.parse(process.env.NHOST_JWT_SECRET)
if (!authorizedCaller) {
authorizedCaller = jwtIsAuthorized(req, jwtSecret.key)
}
if (!authorizedCaller) {
return res.status(401).json({ message: 'Unauthorized' })
}
// extract from json in the body
const {userId, defaultRole, allowedRoles} = req.body
if (!userId || !defaultRole || !allowedRoles) {
return res.status(400).json({ message: 'Bad request' })
}
let token = jwt.sign({
"exp": Math.floor(Date.now() / 1000) + 60 * 60, // 1 hour
"https://hasura.io/jwt/claims": {
"x-hasura-allowed-roles": allowedRoles,
"x-hasura-default-role": defaultRole,
"x-hasura-user-id": userId,
"x-hasura-user-is-anonymous": "false",
"x-hasura-on-behalf-of": authorizedCaller
},
"iat": Math.floor(Date.now() / 1000),
"iss": "custom-lambda",
"sub": userId,
}, jwtSecret.key);
res.status(200).json(
{
accessToken: token,
},
)
}
```
Now you can call it like:
```
curl -X POST \
-H "Content-Type: application/json" \
-H "x-hasura-admin-secret: nhost-admin-secret" \
-d '{"userId": "FFAB5354-C5EB-42C1-8BC3-AD21D2297883", "defaultRole": "user", "allowedRoles": ["user", "me"]}' \
https://local.functions.nhost.run/v1/custom-jwt
{"accessToken":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTcxNDIyMTMsImh0dHBzOi8vaGFzdXJhLmlvL2p3dC9jbGFpbXMiOnsieC1oYXN1cmEtYWxsb3dlZC1yb2xlcyI6WyJ1c2VyIiwibWUiXSwieC1oYXN1cmEtZGVmYXVsdC1yb2xlIjoidXNlciIsIngtaGFzdXJhLXVzZXItaWQiOiJGRkFCNTM1NC1DNUVCLTQyQzEtOEJDMy1BRDIxRDIyOTc4ODMiLCJ4LWhhc3VyYS11c2VyLWlzLWFub255bW91cyI6ImZhbHNlIiwieC1oYXN1cmEtb24tYmVoYWxmLW9mIjoiYWRtaW4ifSwiaWF0IjoxNzE3MTM4NjEzLCJpc3MiOiJjdXN0b20tbGFtYmRhIiwic3ViIjoiRkZBQjUzNTQtQzVFQi00MkMxLThCQzMtQUQyMUQyMjk3ODgzIn0.bRhzJvXMdkQA8aXPH95uMT17WHED2rSRq3gE21Vp3Ak"}
```
The new token should be a valid token for your application with the custom values requested:
```json
{
"exp": 1717141288,
"https://hasura.io/jwt/claims": {
"x-hasura-allowed-roles": [
"a",
"b"
],
"x-hasura-default-role": "user",
"x-hasura-user-id": "FFAB5354-C5EB-42C1-8BC3-AD21D2297883",
"x-hasura-user-is-anonymous": "false",
"x-hasura-on-behalf-of": "admin"
},
"iat": 1717137688,
"iss": "custom-lambda",
"sub": "FFAB5354-C5EB-42C1-8BC3-AD21D2297883"
}
```

View File

@@ -93,3 +93,7 @@ nhost.auth.signIn({
provider: 'apple'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -41,3 +41,7 @@ nhost.auth.signIn({
provider: 'discord'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -64,3 +64,7 @@ nhost.auth.signIn({
provider: 'facebook'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -49,3 +49,7 @@ nhost.auth.signIn({
provider: "github",
});
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -73,3 +73,7 @@ nhost.auth.signIn({
provider: 'google'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -64,3 +64,7 @@ nhost.auth.signIn({
provider: 'linkedin'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -49,3 +49,7 @@ nhost.auth.signIn({
provider: 'spotify'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -43,3 +43,7 @@ nhost.auth.signIn({
provider: 'twitch'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -63,3 +63,7 @@ nhost.auth.signIn({
provider: 'workos'
})
```
<Note>
To use your own domain for the callback URL refer to the [custom domains](/platform/custom-domains) documentation.
</Note>

View File

@@ -0,0 +1,43 @@
---
title: Accessing the Database
description: How to access the database directly using the connection string
icon: key
---
In most cases you will not need to access the database directly, choosing to interact with the data via the Graphql API, however, if you need direct access to postgres you can access it via the connection string.
# Nhost Run
You can find details on how to connect to the database from an [Nhost Run](/product/run) service [here](/guides/run/networking#connecting-to-the-nhost-stack). If you don't know the password you can set a new password in the dashboard:
**Project Dashboard -> Settings -> Database**
![reset password](/images/guides/database/access/reset.png)
# Public Access
For security reasons, by default your database won't be accessible online. If you need to access it directly from the Internet, first you will need to enable public access (enabling public access will also show the connection details):
<Tabs>
<Tab title="Dashboard">
**Project Dashboard -> Settings -> Database**
![public access](/images/guides/database/access/public.png)
</Tab>
<Tab title="Config">
```toml
[postgres.resources]
enablePublicAccess = true
```
</Tab>
</Tabs>
<Note>
Public access to your database utilizes [pgbouncer](http://www.pgbouncer.org). As this pooler is shared infrastructure the pooler will still be available even if your database has no public access configured. The pooler will simply not have access to your database.
</Note>
# Functions
[Functions](/product/functions) run on a separate network, which means in order to access the database you will first need to [make it public](#public-access).

View File

@@ -16,7 +16,7 @@ In case your Postgres service is not meeting your performance expectations, you
4. Evaluate the usage of indexes in your database. Identify queries that could benefit from additional indexes and strategically add them to improve query performance.
5. Increase the disk size to increase [disk performance](/platform/compute-resources#disk-performance). Keep in mind increasing the disk size isn't reversible and increasing the memory of the service may yield better results. This is mostly useful when your data is very volatile and the postgres cache can't work effectively. Only attempt to increase disk for performance reasons if your reads and writes are very high and increasing memory isn't effective.
5. If the problem is related to IOPS, consider increasing [disk performance](/platform/compute-resources#disk-performance).
By implementing these steps, you can effectively address performance concerns and enhance the overall performance of your Postgres service.

Binary file not shown.

After

Width:  |  Height:  |  Size: 426 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 KiB

View File

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 241 KiB

View File

@@ -96,7 +96,7 @@
},
{
"group": "Database",
"pages": ["guides/database/configuring-postgres", "guides/database/extensions", "guides/database/performance"]
"pages": ["guides/database/configuring-postgres", "guides/database/access", "guides/database/extensions", "guides/database/performance"]
},
{
"group": "AI",
@@ -134,7 +134,8 @@
"guides/auth/sign-in-phone-number",
"guides/auth/sign-in-webauthn",
"guides/auth/elevated-permissions",
"guides/auth/email-templates"
"guides/auth/email-templates",
"guides/auth/custom-jwts"
]
},
{

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/docs",
"version": "2.11.0",
"version": "2.13.0",
"private": true,
"scripts": {
"start": "mintlify dev"

View File

@@ -72,6 +72,28 @@ To setup dedicated resources for your project, you can either use the Dashboard
</Tab>
</Tabs>
### Bursting with Dedicated Compute
When using dedicated compute we allow your application to use more than its alloted CPU resources if those resources are available. This means what we are calling dedicated compute is, in fact, guaranteed compute. For instance:
<div align="center">
<img width="300" src="/images/platform/compute-resources/guaranteed-resources.png" alt="resource allocation" />
</div>
In the graph above we can see three applications assigned to the same node, each with its own dedicated compute (the solid lines block). However, all applications are allowed to use the non-solid region of compute as long as the rest of the projects are not using it:
<div align="center">
<img width="300" src="/images/platform/compute-resources/resource-utilization.png" alt="resource utilization" />
</div>
Above we can see three different scenarios:
- In scenario A the green application is barely using its alloted CPU so if the other applications need it, they can borrow it.
- Similarly, in scenario B the green application can borrow resources if it needs it from other applications if those aren't using them.
- In the case all applications need to use all of their resources, nobody can steal from each other as resources are guaranteed per application.
This borrowing of resources is convenient in case of short and unexpected bursts, however, as those are not guaranteed you shouldn't rely on them for sustained usage.
## Disk Performance
By default disks are provisioned with a capacity for 3000 IOPS and 125 Mbps of throughput. If you need higher performance don't hesitate to contact us.

View File

@@ -18,7 +18,7 @@ The following examples assume we are configuring custom domains at `*.custom-dom
1. Add a CNAME record in your DNS provider for each of the services you want a custom domain for, and click "Verify". The verification might take a few seconds to succeed.
2. Once the verification succeeds, click "Save" to update your project.
![Custom Domains](./images/platform/custom-domains/custom-domains.png)
![Custom Domains](./images/platform/custom-domains/custom-domains-dashboard.png)
</Tab>
@@ -62,3 +62,16 @@ fqdn = ['my-service.custom-domain.com']
</Tab>
</Tabs>
<Note>
After configuring your custom domains don't forget to update your Nhost client to make use of them. For instance, when using our [SDK](/reference/javascript/nhost-js/nhost-client):
```js
const nhost = new NhostClient({
authUrl: 'https://auth.custom-domain.com/v1',
storageUrl: 'https://subdomain.storage.region.nhost.run/v1',
graphqlUrl: 'https://hasura.custom-domain.com/v1/graphql',
functionsUrl: 'https://functions.custom-domain.com/v1'
})
```
</Note>

View File

@@ -1,5 +1,23 @@
# @nhost-examples/cli
## 0.3.7
### Patch Changes
- @nhost/nhost-js@3.1.5
## 0.3.6
### Patch Changes
- @nhost/nhost-js@3.1.4
## 0.3.5
### Patch Changes
- @nhost/nhost-js@3.1.3
## 0.3.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/cli",
"version": "0.3.4",
"version": "0.3.7",
"main": "src/index.mjs",
"private": true,
"scripts": {

View File

@@ -1,5 +1,27 @@
# @nhost-examples/codegen-react-apollo
## 0.4.7
### Patch Changes
- @nhost/react@3.5.2
- @nhost/react-apollo@12.0.2
## 0.4.6
### Patch Changes
- @nhost/react@3.5.1
- @nhost/react-apollo@12.0.1
## 0.4.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
- @nhost/react-apollo@12.0.0
## 0.4.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/codegen-react-apollo",
"version": "0.4.4",
"version": "0.4.7",
"private": true,
"scripts": {
"codegen": "graphql-codegen",

View File

@@ -1,5 +1,24 @@
# @nhost-examples/codegen-react-query
## 0.4.7
### Patch Changes
- @nhost/react@3.5.2
## 0.4.6
### Patch Changes
- @nhost/react@3.5.1
## 0.4.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
## 0.4.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/codegen-react-query",
"version": "0.4.4",
"version": "0.4.7",
"private": true,
"scripts": {
"codegen": "graphql-codegen",

View File

@@ -1,5 +1,27 @@
# @nhost-examples/react-urql
## 0.3.7
### Patch Changes
- @nhost/react@3.5.2
- @nhost/react-urql@9.0.2
## 0.3.6
### Patch Changes
- @nhost/react@3.5.1
- @nhost/react-urql@9.0.1
## 0.3.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
- @nhost/react-urql@9.0.0
## 0.3.4
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@nhost-examples/codegen-react-urql",
"private": true,
"version": "0.3.4",
"version": "0.3.7",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",

View File

@@ -1,5 +1,23 @@
# @nhost-examples/multi-tenant-one-to-many
## 2.2.7
### Patch Changes
- @nhost/nhost-js@3.1.5
## 2.2.6
### Patch Changes
- @nhost/nhost-js@3.1.4
## 2.2.5
### Patch Changes
- @nhost/nhost-js@3.1.3
## 2.2.4
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@nhost-examples/multi-tenant-one-to-many",
"private": true,
"version": "2.2.4",
"version": "2.2.7",
"description": "",
"main": "index.js",
"scripts": {},

View File

@@ -1,5 +1,30 @@
# @nhost-examples/nextjs
## 0.3.7
### Patch Changes
- @nhost/react@3.5.2
- @nhost/react-apollo@12.0.2
- @nhost/nextjs@2.1.16
## 0.3.6
### Patch Changes
- @nhost/react@3.5.1
- @nhost/react-apollo@12.0.1
- @nhost/nextjs@2.1.15
## 0.3.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
- @nhost/react-apollo@12.0.0
- @nhost/nextjs@2.1.14
## 0.3.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/nextjs",
"version": "0.3.4",
"version": "0.3.7",
"private": true,
"scripts": {
"dev": "next dev",

View File

@@ -1,5 +1,23 @@
# @nhost-examples/node-storage
## 0.2.7
### Patch Changes
- @nhost/nhost-js@3.1.5
## 0.2.6
### Patch Changes
- @nhost/nhost-js@3.1.4
## 0.2.5
### Patch Changes
- @nhost/nhost-js@3.1.3
## 0.2.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/node-storage",
"version": "0.2.4",
"version": "0.2.7",
"private": true,
"description": "This is an example of how to use the Storage with Node.js",
"main": "src/index.mjs",

View File

@@ -1,5 +1,23 @@
# @nhost-examples/nextjs-server-components
## 0.4.7
### Patch Changes
- @nhost/nhost-js@3.1.5
## 0.4.6
### Patch Changes
- @nhost/nhost-js@3.1.4
## 0.4.5
### Patch Changes
- @nhost/nhost-js@3.1.3
## 0.4.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/nextjs-server-components",
"version": "0.4.4",
"version": "0.4.7",
"private": true,
"scripts": {
"dev": "next dev",

View File

@@ -1,5 +1,28 @@
# @nhost-examples/react-apollo
## 0.8.7
### Patch Changes
- @nhost/react@3.5.2
- @nhost/react-apollo@12.0.2
## 0.8.6
### Patch Changes
- @nhost/react@3.5.1
- @nhost/react-apollo@12.0.1
## 0.8.5
### Patch Changes
- aef4a0a: fix: resolve e2e test issues
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
- @nhost/react-apollo@12.0.0
## 0.8.4
### Patch Changes

View File

@@ -119,7 +119,7 @@ export async function verifyMagicLink({
await page
.frameLocator('#preview-html')
.getByRole('link', { name: /sign in/i })
.getByRole('link', { name: /verify email/i })
.click()
const authenticatedPage = await authenticatedPagePromise
@@ -154,7 +154,7 @@ export async function resetPassword({
await page
.frameLocator('#preview-html')
.getByRole('link', { name: /reset password/i })
.getByRole('link', { name: /verify email/i })
.click()
const authenticatedPage = await authenticatedPagePromise

View File

@@ -1,12 +1,38 @@
[
{
"value": "disabled",
"op": "replace",
"path": "/auth/method/webauthn/relyingParty/origins/0",
"value": "http://localhost:3000"
"path": "/auth/elevatedPrivileges/mode"
},
{
"op": "remove",
"path": "/auth/method/oauth/apple/clientId"
},
{
"value": false,
"op": "replace",
"path": "/auth/redirections/clientUrl",
"value": "http://localhost:3000"
"path": "/auth/method/oauth/apple/enabled"
},
{
"op": "remove",
"path": "/auth/method/oauth/apple/keyId"
},
{
"op": "remove",
"path": "/auth/method/oauth/apple/privateKey"
},
{
"op": "remove",
"path": "/auth/method/oauth/apple/teamId"
},
{
"value": "http://localhost:3000",
"op": "replace",
"path": "/auth/method/webauthn/relyingParty/origins/0"
},
{
"value": "http://localhost:3000",
"op": "replace",
"path": "/auth/redirections/clientUrl"
}
]

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/react-apollo",
"version": "0.8.4",
"version": "0.8.7",
"private": true,
"dependencies": {
"@apollo/client": "^3.9.9",
@@ -22,9 +22,9 @@
"scripts": {
"dev": "vite --host localhost --port 3000",
"generate": "graphql-codegen --config graphql.config.yaml",
"install-browsers": "pnpm dlx playwright@1.31.0 install --with-deps",
"install-browsers": "pnpm playwright install && pnpm playwright install-deps",
"e2e": "pnpm e2e:start-backend && pnpm e2e:test",
"e2e:test": "pnpm install-browsers && pnpm dlx playwright@1.31.0 test; nhost down",
"e2e:test": "pnpm install-browsers && pnpm playwright test",
"e2e:start-backend": "cp .secrets.example .secrets && nhost up",
"e2e:start-ui": "run-s build preview",
"build": "vite build",
@@ -52,7 +52,7 @@
"@faker-js/faker": "^7.6.0",
"@graphql-codegen/cli": "^5.0.2",
"@nuintun/qrcode": "^3.4.0",
"@playwright/test": "1.31.0",
"@playwright/test": "1.41.0",
"@types/pngjs": "^6.0.4",
"@types/react": "^18.2.73",
"@types/react-dom": "^18.2.23",

View File

@@ -1241,7 +1241,7 @@ packages:
'@simplewebauthn/browser': 6.2.2
fetch-ponyfill: 7.1.0
js-cookie: 3.0.5
jwt-decode: 3.1.2
jwt-decode: 4.0.0
xstate: 4.38.3
transitivePeerDependencies:
- encoding
@@ -1299,7 +1299,7 @@ packages:
dependencies:
'@nhost/nhost-js': 3.0.2(graphql@16.8.1)
'@xstate/react': 3.2.2(@types/react@18.2.48)(react@18.2.0)(xstate@4.38.3)
jwt-decode: 3.1.2
jwt-decode: 4.0.0
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
xstate: 4.38.3

View File

@@ -1,5 +1,24 @@
# @nhost-examples/react-gqty
## 1.2.7
### Patch Changes
- @nhost/react@3.5.2
## 1.2.6
### Patch Changes
- @nhost/react@3.5.1
## 1.2.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
## 1.2.4
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@nhost-examples/react-gqty",
"private": true,
"version": "1.2.4",
"version": "1.2.7",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,30 @@
# @nhost-examples/vue-apollo
## 0.6.7
### Patch Changes
- @nhost/nhost-js@3.1.5
- @nhost/apollo@7.1.2
- @nhost/vue@2.6.2
## 0.6.6
### Patch Changes
- @nhost/nhost-js@3.1.4
- @nhost/apollo@7.1.1
- @nhost/vue@2.6.1
## 0.6.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/apollo@7.1.0
- @nhost/vue@2.6.0
- @nhost/nhost-js@3.1.3
## 0.6.4
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@nhost-examples/vue-apollo",
"private": true,
"version": "0.6.4",
"version": "0.6.7",
"scripts": {
"dev": "vite",
"build": "vite build",

View File

@@ -1,5 +1,27 @@
# @nhost-examples/vue-quickstart
## 0.2.7
### Patch Changes
- @nhost/apollo@7.1.2
- @nhost/vue@2.6.2
## 0.2.6
### Patch Changes
- @nhost/apollo@7.1.1
- @nhost/vue@2.6.1
## 0.2.5
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/apollo@7.1.0
- @nhost/vue@2.6.0
## 0.2.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/vue-quickstart",
"version": "0.2.4",
"version": "0.2.7",
"private": true,
"scripts": {
"build": "vite build",

24
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nix-filter": {
"locked": {
"lastModified": 1705332318,
"narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
@@ -40,11 +40,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1709722688,
"narHash": "sha256-ng5a9klcxohFhs9xfNAcZWTveM4SlMWoRoWDYyXoECE=",
"lastModified": 1716813459,
"narHash": "sha256-kPV0JcxBO3krxLeGEAsk5tZ7GUo+DStD2Cg78iGm4v0=",
"owner": "nhost",
"repo": "nixops",
"rev": "919e405ab485c099a42d44a2936cab2d3b1bd444",
"rev": "981affa7a17fd064bb5096ccfec8ddd98b115ef5",
"type": "github"
},
"original": {
@@ -55,11 +55,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708943256,
"narHash": "sha256-K9VeHrhXsigdhNMZ8hqAk7jtRy4ollqhkYYNZqbfssg=",
"lastModified": 1716715802,
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fcea2b6260dd566c28c894b4207a5f2b56c2cba3",
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
"type": "github"
},
"original": {

View File

@@ -1,5 +1,27 @@
# @nhost/apollo
## 7.1.2
### Patch Changes
- @nhost/nhost-js@3.1.5
## 7.1.1
### Patch Changes
- @nhost/nhost-js@3.1.4
## 7.1.0
### Minor Changes
- d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0
### Patch Changes
- @nhost/nhost-js@3.1.3
## 7.0.2
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/apollo",
"version": "7.0.2",
"version": "7.1.2",
"description": "Nhost Apollo Client library",
"license": "MIT",
"keywords": [
@@ -66,7 +66,7 @@
"dependencies": {
"graphql": "16.8.1",
"graphql-ws": "^5.16.0",
"jwt-decode": "^3.1.2"
"jwt-decode": "^4.0.0"
},
"devDependencies": {
"@apollo/client": "^3.9.9",

View File

@@ -12,7 +12,7 @@ import { setContext } from '@apollo/client/link/context'
import { GraphQLWsLink } from '@apollo/client/link/subscriptions'
import { getMainDefinition } from '@apollo/client/utilities'
import { AuthContext, NhostClient } from '@nhost/nhost-js'
import jwtDecode, { JwtPayload } from 'jwt-decode'
import { jwtDecode, JwtPayload } from 'jwt-decode'
import { createRestartableClient } from './ws'
const isBrowser = typeof window !== 'undefined'
@@ -67,7 +67,7 @@ export const createApolloClient = ({
const marginInSeconds = 3
const marginInMilliseconds = marginInSeconds * 1000
let decodedToken: JwtPayload = jwtDecode(accessToken.value)
let decodedToken = jwtDecode(accessToken.value) as JwtPayload
return decodedToken.exp! * 1000 > Date.now() - marginInMilliseconds
}

View File

@@ -1,5 +1,27 @@
# @nhost/react-apollo
## 12.0.2
### Patch Changes
- @nhost/apollo@7.1.2
- @nhost/react@3.5.2
## 12.0.1
### Patch Changes
- @nhost/apollo@7.1.1
- @nhost/react@3.5.1
## 12.0.0
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/apollo@7.1.0
- @nhost/react@3.5.0
## 11.0.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/react-apollo",
"version": "11.0.4",
"version": "12.0.2",
"description": "Nhost React Apollo client",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,24 @@
# @nhost/react-urql
## 9.0.2
### Patch Changes
- @nhost/react@3.5.2
## 9.0.1
### Patch Changes
- @nhost/react@3.5.1
## 9.0.0
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
## 8.0.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/react-urql",
"version": "8.0.4",
"version": "9.0.2",
"description": "Nhost React URQL client",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,11 @@
# @nhost/graphql-js
## 0.3.0
### Minor Changes
- d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0
## 0.2.0
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/graphql-js",
"version": "0.2.0",
"version": "0.3.0",
"description": "Nhost GraphQL client",
"license": "MIT",
"keywords": [
@@ -54,14 +54,16 @@
},
"dependencies": {
"@graphql-typed-document-node/core": "^3.2.0",
"base-64": "^1.0.0",
"isomorphic-unfetch": "^3.1.0",
"jose": "^5.2.3"
"jwt-decode": "^4.0.0"
},
"peerDependencies": {
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
},
"devDependencies": {
"@nhost/docgen": "workspace:*",
"@types/base-64": "^1.0.2",
"graphql": "16.8.1"
}
}

View File

@@ -12,7 +12,7 @@ import {
Variables
} from './types'
import * as jose from 'jose'
import { jwtDecode, JwtPayload } from 'jwt-decode'
/**
* @alias GraphQL
@@ -37,7 +37,7 @@ export class NhostGraphqlClient {
}
try {
const decodedToken = jose.decodeJwt<jose.JWTPayload>(this.accessToken)
const decodedToken = jwtDecode(this.accessToken) as JwtPayload
return decodedToken.exp != null && decodedToken.exp * 1000 > Date.now()
} catch (error) {
console.error('Error decoding token:', error)

View File

@@ -1,5 +1,24 @@
# @nhost/hasura-auth-js
## 2.5.2
### Patch Changes
- a03fb2c: fix: deep clone machine context to prevent mutations in nested objects during initial session setup
## 2.5.1
### Patch Changes
- f4f0353: fix: improve environment/browser detection to support React Native
- defffd8: fix: resolve issue where `/token` endpoint is called with an empty token during sign-in
## 2.5.0
### Minor Changes
- d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0
## 2.4.2
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/hasura-auth-js",
"version": "2.4.2",
"version": "2.5.2",
"description": "Hasura-auth client",
"license": "MIT",
"keywords": [
@@ -66,8 +66,8 @@
"dependencies": {
"@simplewebauthn/browser": "^9.0.1",
"fetch-ponyfill": "^7.1.0",
"jose": "^5.2.3",
"js-cookie": "^3.0.5",
"jwt-decode": "^4.0.0",
"xstate": "^4.38.3"
},
"devDependencies": {

View File

@@ -1,4 +1,4 @@
import * as jose from 'jose'
import { jwtDecode } from 'jwt-decode'
import { interpret } from 'xstate'
import {
EMAIL_NEEDS_VERIFICATION,
@@ -664,7 +664,7 @@ export class HasuraAuthClient {
public getDecodedAccessToken(): JWTClaims | null {
const jwt = this.getAccessToken()
if (!jwt) return null
return jose.decodeJwt<JWTClaims>(jwt)
return jwtDecode<JWTClaims>(jwt)
}
/**

View File

@@ -1,5 +1,11 @@
import { interpret } from 'xstate'
import { AuthInterpreter, AuthMachine, AuthMachineOptions, createAuthMachine } from './machines'
import {
AuthContext,
AuthInterpreter,
AuthMachine,
AuthMachineOptions,
createAuthMachine
} from './machines'
import { NhostSession } from './types'
import { isBrowser } from './utils'
@@ -60,8 +66,8 @@ export class AuthClient {
if (type === 'broadcast_token') {
const existingToken = this.interpreter?.getSnapshot().context.refreshToken.value
if (this.interpreter && payload.token.data !== existingToken) {
this.interpreter.send('TRY_TOKEN', { token: payload.token.data })
if (this.interpreter && payload.token && payload.token !== existingToken) {
this.interpreter.send('TRY_TOKEN', { token: payload.token })
}
}
})
@@ -87,7 +93,17 @@ export class AuthClient {
initialSession,
interpreter
}: { interpreter?: AuthInterpreter; initialSession?: NhostSession; devTools?: boolean } = {}) {
const context = { ...this.machine.context }
// Create a deep copy of the machine context to ensure that nested objects (such as accessToken and refreshToken) are not mutated in the original context.
const context: AuthContext = {
...this.machine.context,
accessToken: {
...this.machine.context.accessToken
},
refreshToken: {
...this.machine.context.refreshToken
}
}
if (initialSession) {
context.user = initialSession.user
context.refreshToken.value = initialSession.refreshToken ?? null

View File

@@ -1 +1,2 @@
export const isBrowser = () => typeof window !== 'undefined'
export const isBrowser = () =>
typeof window !== 'undefined' && typeof window.location !== 'undefined'

View File

@@ -1,5 +1,24 @@
# @nhost/nextjs
## 2.1.16
### Patch Changes
- @nhost/react@3.5.2
## 2.1.15
### Patch Changes
- @nhost/react@3.5.1
## 2.1.14
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/react@3.5.0
## 2.1.13
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/nextjs",
"version": "2.1.13",
"version": "2.1.16",
"description": "Nhost NextJS library",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,28 @@
# @nhost/nhost-js
## 3.1.5
### Patch Changes
- Updated dependencies [a03fb2c]
- @nhost/hasura-auth-js@2.5.2
## 3.1.4
### Patch Changes
- Updated dependencies [f4f0353]
- Updated dependencies [defffd8]
- @nhost/hasura-auth-js@2.5.1
## 3.1.3
### Patch Changes
- Updated dependencies [d0c9f4c]
- @nhost/hasura-auth-js@2.5.0
- @nhost/graphql-js@0.3.0
## 3.1.2
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/nhost-js",
"version": "3.1.2",
"version": "3.1.5",
"description": "Nhost JavaScript SDK",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,27 @@
# @nhost/react
## 3.5.2
### Patch Changes
- @nhost/nhost-js@3.1.5
## 3.5.1
### Patch Changes
- @nhost/nhost-js@3.1.4
## 3.5.0
### Minor Changes
- d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0
### Patch Changes
- @nhost/nhost-js@3.1.3
## 3.4.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/react",
"version": "3.4.4",
"version": "3.5.2",
"description": "Nhost React library",
"license": "MIT",
"keywords": [
@@ -64,7 +64,7 @@
"dependencies": {
"@nhost/nhost-js": "workspace:*",
"@xstate/react": "^3.2.2",
"jwt-decode": "^3.1.2",
"jwt-decode": "^4.0.0",
"react-dom": "^18.2.0",
"xstate": "^4.38.3"
},

View File

@@ -1,5 +1,5 @@
import { JWTClaims } from '@nhost/nhost-js'
import jwt_decode from 'jwt-decode'
import { jwtDecode } from 'jwt-decode'
import { useAccessToken } from './useAccessToken'
/**
@@ -14,5 +14,5 @@ import { useAccessToken } from './useAccessToken'
*/
export const useDecodedAccessToken = (): JWTClaims | null => {
const jwt = useAccessToken()
return jwt ? jwt_decode<JWTClaims>(jwt) : null
return jwt ? jwtDecode<JWTClaims>(jwt) : null
}

View File

@@ -1,5 +1,27 @@
# @nhost/vue
## 2.6.2
### Patch Changes
- @nhost/nhost-js@3.1.5
## 2.6.1
### Patch Changes
- @nhost/nhost-js@3.1.4
## 2.6.0
### Minor Changes
- d0c9f4c: fix: replace `jose` with `jwt-decode` version 4.0.0
### Patch Changes
- @nhost/nhost-js@3.1.3
## 2.5.4
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/vue",
"version": "2.5.4",
"version": "2.6.2",
"description": "Nhost Vue library",
"license": "MIT",
"keywords": [
@@ -68,7 +68,7 @@
"@nhost/nhost-js": "workspace:*",
"@vueuse/core": "^10.9.0",
"@xstate/vue": "^2.0.0",
"jwt-decode": "^3.1.2"
"jwt-decode": "^4.0.0"
},
"devDependencies": {
"@nhost/docgen": "workspace:*",

View File

@@ -1,5 +1,5 @@
import { JWTClaims } from '@nhost/nhost-js'
import jwt_decode from 'jwt-decode'
import { jwtDecode } from 'jwt-decode'
import { computed, ComputedRef } from 'vue'
import { useAccessToken } from './useAccessToken'
@@ -15,5 +15,5 @@ import { useAccessToken } from './useAccessToken'
*/
export const useDecodedAccessToken = (): ComputedRef<JWTClaims | null> => {
const jwt = useAccessToken()
return computed(() => (jwt.value ? jwt_decode<JWTClaims>(jwt.value) : null))
return computed(() => (jwt.value ? jwtDecode<JWTClaims>(jwt.value) : null))
}

73
pnpm-lock.yaml generated
View File

@@ -1122,8 +1122,8 @@ importers:
specifier: ^3.4.0
version: 3.4.0
'@playwright/test':
specifier: 1.31.0
version: 1.31.0
specifier: 1.41.0
version: 1.41.0
'@types/pngjs':
specifier: ^6.0.4
version: 6.0.4
@@ -1413,8 +1413,8 @@ importers:
specifier: ^5.16.0
version: 5.16.0(graphql@16.8.1)
jwt-decode:
specifier: ^3.1.2
version: 3.1.2
specifier: ^4.0.0
version: 4.0.0
devDependencies:
'@apollo/client':
specifier: ^3.9.9
@@ -1580,16 +1580,22 @@ importers:
'@graphql-typed-document-node/core':
specifier: ^3.2.0
version: 3.2.0(graphql@16.8.1)
base-64:
specifier: ^1.0.0
version: 1.0.0
isomorphic-unfetch:
specifier: ^3.1.0
version: 3.1.0
jose:
specifier: ^5.2.3
version: 5.2.3
jwt-decode:
specifier: ^4.0.0
version: 4.0.0
devDependencies:
'@nhost/docgen':
specifier: workspace:*
version: link:../docgen
'@types/base-64':
specifier: ^1.0.2
version: 1.0.2
graphql:
specifier: 16.8.1
version: 16.8.1
@@ -1602,12 +1608,12 @@ importers:
fetch-ponyfill:
specifier: ^7.1.0
version: 7.1.0
jose:
specifier: ^5.2.3
version: 5.2.3
js-cookie:
specifier: ^3.0.5
version: 3.0.5
jwt-decode:
specifier: ^4.0.0
version: 4.0.0
xstate:
specifier: ^4.38.3
version: 4.38.3
@@ -1727,8 +1733,8 @@ importers:
specifier: ^3.2.2
version: 3.2.2(@types/react@18.2.73)(react@18.2.0)(xstate@4.38.3)
jwt-decode:
specifier: ^3.1.2
version: 3.1.2
specifier: ^4.0.0
version: 4.0.0
react-dom:
specifier: ^18.2.0
version: 18.2.0(react@18.2.0)
@@ -1792,8 +1798,8 @@ importers:
specifier: ^2.0.0
version: 2.0.0(vue@3.4.21)(xstate@4.38.3)
jwt-decode:
specifier: ^3.1.2
version: 3.1.2
specifier: ^4.0.0
version: 4.0.0
devDependencies:
'@nhost/docgen':
specifier: workspace:*
@@ -7813,17 +7819,6 @@ packages:
requiresBuild: true
optional: true
/@playwright/test@1.31.0:
resolution: {integrity: sha512-Ys5s/06Dg9g3zAIdCIb/UOBYim3U7Zjb3DvC6XBtnRmnglH5O47iwYzmtxXu9fhSyzI2Jn28apkXIOD81GgCdw==}
engines: {node: '>=14'}
hasBin: true
dependencies:
'@types/node': 18.19.28
playwright-core: 1.31.0
optionalDependencies:
fsevents: 2.3.2
dev: true
/@playwright/test@1.41.0:
resolution: {integrity: sha512-Grvzj841THwtpBOrfiHOeYTJQxDRnKofMSzCiV8XeyLWu3o89qftQ4BCKfkziJhSUQRd0utKhrddtIsiraIwmw==}
engines: {node: '>=16'}
@@ -10474,6 +10469,10 @@ packages:
'@babel/types': 7.24.0
dev: true
/@types/base-64@1.0.2:
resolution: {integrity: sha512-uPgKMmM9fmn7I+Zi6YBqctOye4SlJsHKcisjHIMWpb2YKZRc36GpKyNuQ03JcT+oNXg1m7Uv4wU94EVltn8/cw==}
dev: true
/@types/bcryptjs@2.4.6:
resolution: {integrity: sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ==}
dev: true
@@ -10861,7 +10860,7 @@ packages:
resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
dependencies:
'@types/caseless': 0.12.5
'@types/node': 16.18.93
'@types/node': 18.19.28
'@types/tough-cookie': 4.0.5
form-data: 2.5.1
dev: false
@@ -12458,9 +12457,6 @@ packages:
/ajv-formats@2.1.1:
resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
peerDependenciesMeta:
ajv:
optional: true
dependencies:
ajv: 8.12.0
dev: true
@@ -13200,6 +13196,10 @@ packages:
/balanced-match@1.0.2:
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
/base-64@1.0.0:
resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==}
dev: false
/base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
@@ -19522,6 +19522,7 @@ packages:
/jose@5.2.3:
resolution: {integrity: sha512-KUXdbctm1uHVL8BYhnyHkgp3zDX5KW8ZhAKVFEfUbU2P8Alpzjb+48hHvjOdQIyPshoblhzsuqOwEEAbtHVirA==}
dev: true
/jpeg-js@0.4.4:
resolution: {integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==}
@@ -19820,6 +19821,12 @@ packages:
/jwt-decode@3.1.2:
resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==}
dev: true
/jwt-decode@4.0.0:
resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==}
engines: {node: '>=18'}
dev: false
/katex@0.16.10:
resolution: {integrity: sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==}
@@ -22891,12 +22898,6 @@ packages:
pathe: 1.1.2
dev: true
/playwright-core@1.31.0:
resolution: {integrity: sha512-/KquBjS5DcASCh8cGeNVHuC0kyb7c9plKTwaKxgOGtxT7+DZO2fjmFvPDBSXslEIK5CeOO/2kk5rOCktFXKEdA==}
engines: {node: '>=14'}
hasBin: true
dev: true
/playwright-core@1.41.0:
resolution: {integrity: sha512-UGKASUhXmvqm2Lxa1fNr8sFwAtqjpgBRr9jQ7XBI8Rn5uFiEowGUGwrruUQsVPIom4bk7Lt+oLGpXobnXzrBIw==}
engines: {node: '>=16'}
@@ -23420,7 +23421,7 @@ packages:
'@protobufjs/path': 1.1.2
'@protobufjs/pool': 1.1.0
'@protobufjs/utf8': 1.1.0
'@types/node': 16.18.93
'@types/node': 18.19.28
long: 5.2.3
dev: false