@contember/react-client-tenant 2.1.0-beta.2 → 2.2.0-alpha.1

package/src/hooks/index.ts

@@ -1,8 +1,8 @@
-export * from './mutations'
-export * from './queries'
-export * from './useFetchIdentity'
-export * from './useLogout'
-export * from './useTenantApi'
-export * from './useTenantQueryLoader'
-export * from './useTenantMutation'
-export * from './usePasswordlessOtpActivator'
+export * from './mutations/index.js'
+export * from './queries/index.js'
+export * from './useFetchIdentity.js'
+export * from './useLogout.js'
+export * from './useTenantApi.js'
+export * from './useTenantQueryLoader.js'
+export * from './useTenantMutation.js'
+export * from './usePasswordlessOtpActivator.js'

package/src/hooks/mutations/apiKey/index.ts

@@ -1,4 +1,4 @@
-export * from './useCreateApiKeyMutation'
-export * from './useCreateSessionTokenMutation'
-export * from './useCreateGlobalApiKeyMutation'
-export * from './useDisableApiKeyMutation'
+export * from './useCreateApiKeyMutation.js'
+export * from './useCreateSessionTokenMutation.js'
+export * from './useCreateGlobalApiKeyMutation.js'
+export * from './useDisableApiKeyMutation.js'

package/src/hooks/mutations/apiKey/useCreateApiKeyMutation.tsx

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const createApiKeyMutationResult = TenantApi.createApiKeyResult$.apiKey(TenantApi.apiKeyWithToken$$.identity(TenantApi.identity$$))
 

package/src/hooks/mutations/apiKey/useCreateGlobalApiKeyMutation.tsx

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const createGlobalApiKeyMutationResult = TenantApi.createApiKeyResult$.apiKey(TenantApi.apiKeyWithToken$$.identity(TenantApi.identity$$))
 

package/src/hooks/mutations/apiKey/useCreateSessionTokenMutation.tsx

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const createSessionTokenMutationResult = TenantApi.createSessionTokenResult$.token.person(TenantApi.person$.id.email.name)
 

package/src/hooks/mutations/apiKey/useDisableApiKeyMutation.tsx

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const disableApiKeyMutation = TenantApi.mutation$
 	.disableApiKey(

package/src/hooks/mutations/auth/index.ts

@@ -1,3 +1,3 @@
-export * from './useChangeMyPasswordMutation'
-export * from './useSignInMutation'
-export * from './useSignOutMutation'
+export * from './useChangeMyPasswordMutation.js'
+export * from './useSignInMutation.js'
+export * from './useSignOutMutation.js'

package/src/hooks/mutations/auth/useChangeMyPasswordMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const changeMyPasswordMutation = TenantApi
 	.mutation$

package/src/hooks/mutations/auth/useSignInMutation.ts

@@ -1,7 +1,7 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
+import { LoginToken } from '../../useTenantApi.js'
 import { ModelType } from 'graphql-ts-client-api'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const signInResultFragment = TenantApi.signInResult$$.person(TenantApi.person$.id.email.name)
 

package/src/hooks/mutations/auth/useSignOutMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const signOutMutation = TenantApi.mutation$.signOut(
 	TenantApi

package/src/hooks/mutations/emailVerification/index.ts

@@ -0,0 +1,3 @@
+export * from './useRequestEmailVerificationMutation.js'
+export * from './useVerifyEmailMutation.js'
+export * from './useConfirmEmailChangeMutation.js'

package/src/hooks/mutations/emailVerification/useConfirmEmailChangeMutation.ts

@@ -0,0 +1,17 @@
+import * as TenantApi from '@contember/graphql-client-tenant'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
+
+export const confirmEmailChangeMutation = TenantApi
+	.mutation$
+	.confirmEmailChange(
+		TenantApi
+			.confirmEmailChangeResponse$$
+			.error(TenantApi.confirmEmailChangeError$$),
+		options => options.alias('mutation'),
+	)
+
+export const useConfirmEmailChangeMutation = createTenantMutation(confirmEmailChangeMutation, {
+	apiToken: LoginToken,
+})
+export type ConfirmEmailChangeMutationVariables = Parameters<ReturnType<typeof useConfirmEmailChangeMutation>>[0]

package/src/hooks/mutations/emailVerification/useRequestEmailVerificationMutation.ts

@@ -0,0 +1,17 @@
+import * as TenantApi from '@contember/graphql-client-tenant'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
+
+export const requestEmailVerificationMutation = TenantApi
+	.mutation$
+	.requestEmailVerification(
+		TenantApi
+			.requestEmailVerificationResponse$$
+			.error(TenantApi.requestEmailVerificationError$$),
+		options => options.alias('mutation'),
+	)
+
+export const useRequestEmailVerificationMutation = createTenantMutation(requestEmailVerificationMutation, {
+	apiToken: LoginToken,
+})
+export type RequestEmailVerificationMutationVariables = Parameters<ReturnType<typeof useRequestEmailVerificationMutation>>[0]

package/src/hooks/mutations/emailVerification/useVerifyEmailMutation.ts

@@ -0,0 +1,17 @@
+import * as TenantApi from '@contember/graphql-client-tenant'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
+
+export const verifyEmailMutation = TenantApi
+	.mutation$
+	.verifyEmail(
+		TenantApi
+			.verifyEmailResponse$$
+			.error(TenantApi.verifyEmailError$$),
+		options => options.alias('mutation'),
+	)
+
+export const useVerifyEmailMutation = createTenantMutation(verifyEmailMutation, {
+	apiToken: LoginToken,
+})
+export type VerifyEmailMutationVariables = Parameters<ReturnType<typeof useVerifyEmailMutation>>[0]

package/src/hooks/mutations/idp/index.ts

@@ -1,2 +1,2 @@
-export * from './useInitSignInIDPMutation'
-export * from './useSignInIdpMutation'
+export * from './useInitSignInIDPMutation.js'
+export * from './useSignInIdpMutation.js'

package/src/hooks/mutations/idp/useInitSignInIDPMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 import { ModelType } from 'graphql-ts-client-api'
 
 export type InitSignInIDPMutationVariables = {

package/src/hooks/mutations/idp/useSignInIdpMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 import { ModelType } from 'graphql-ts-client-api'
 
 const signInIdpFragment = TenantApi.signInIDPResult$$.person(TenantApi.person$.id.email.name)

package/src/hooks/mutations/index.ts

@@ -1,9 +1,10 @@
-export * from './apiKey'
-export * from './auth'
-export * from './invite'
-export * from './idp'
-export * from './memberships'
-export * from './passwordless'
-export * from './otp'
-export * from './passwordReset'
-export * from './profile'
+export * from './apiKey/index.js'
+export * from './auth/index.js'
+export * from './emailVerification/index.js'
+export * from './invite/index.js'
+export * from './idp/index.js'
+export * from './memberships/index.js'
+export * from './passwordless/index.js'
+export * from './otp/index.js'
+export * from './passwordReset/index.js'
+export * from './profile/index.js'

package/src/hooks/mutations/invite/index.ts

@@ -1 +1 @@
-export * from './useInviteMutation'
+export * from './useInviteMutation.js'

package/src/hooks/mutations/invite/useInviteMutation.tsx

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const inviteMutationResult = TenantApi.inviteResult$$
 	.person(TenantApi.person$.id.email.name.identity(TenantApi.identity$$))

package/src/hooks/mutations/memberships/index.ts

@@ -1,3 +1,3 @@
-export * from './useRemoveProjectMemberMutation'
-export * from './useAddProjectMemberMutation'
-export * from './useUpdateProjectMemberMutation'
+export * from './useRemoveProjectMemberMutation.js'
+export * from './useAddProjectMemberMutation.js'
+export * from './useUpdateProjectMemberMutation.js'

package/src/hooks/mutations/memberships/useAddProjectMemberMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const addProjectMemberMutation = TenantApi.mutation$
 	.addProjectMember(

package/src/hooks/mutations/memberships/useRemoveProjectMemberMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const removeProjectMemberMutation = TenantApi.mutation$
 	.removeProjectMember(

package/src/hooks/mutations/memberships/useUpdateProjectMemberMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const updateProjectMemberMutation = TenantApi.mutation$
 	.updateProjectMember(

package/src/hooks/mutations/otp/index.ts

@@ -1,3 +1,3 @@
-export * from './useConfirmOtpMutation'
-export * from './useDisableOtpMutation'
-export * from './usePrepareOtpMutation'
+export * from './useConfirmOtpMutation.js'
+export * from './useDisableOtpMutation.js'
+export * from './usePrepareOtpMutation.js'

package/src/hooks/mutations/otp/useConfirmOtpMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const confirmOtpMutation = TenantApi.mutation$
 	.confirmOtp(

package/src/hooks/mutations/otp/useDisableOtpMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const disableOtpMutation = TenantApi.mutation$.disableOtp(
 	TenantApi.disableOtpResponse$$.error(TenantApi.disableOtpError$$),

package/src/hooks/mutations/otp/usePrepareOtpMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const prepareOtmMutationResult = TenantApi.prepareOtpResponse$$.result(TenantApi.prepareOtpResult$$)
 

package/src/hooks/mutations/passwordReset/index.ts

@@ -1,2 +1,2 @@
-export * from './useCreateResetPasswordRequestMutation'
-export * from './useResetPasswordMutation'
+export * from './useCreateResetPasswordRequestMutation.js'
+export * from './useResetPasswordMutation.js'

package/src/hooks/mutations/passwordReset/useCreateResetPasswordRequestMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const createResetPasswordRequestMutation = TenantApi
 	.mutation$

package/src/hooks/mutations/passwordReset/useResetPasswordMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const resetPasswordMutation = TenantApi
 	.mutation$

package/src/hooks/mutations/passwordless/index.ts

@@ -1,5 +1,5 @@
-export * from './useActivatePasswordlessOtpMutation'
-export * from './useDisableMyPasswordlessMutation'
-export * from './useEnableMyPasswordlessMutation'
-export * from './useSignInPasswordlessMutation'
-export * from './useInitSignInPasswordlessMutation'
+export * from './useActivatePasswordlessOtpMutation.js'
+export * from './useDisableMyPasswordlessMutation.js'
+export * from './useEnableMyPasswordlessMutation.js'
+export * from './useSignInPasswordlessMutation.js'
+export * from './useInitSignInPasswordlessMutation.js'

package/src/hooks/mutations/passwordless/useActivatePasswordlessOtpMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const ActivatePasswordlessOtpMutation = TenantApi
 	.mutation$

package/src/hooks/mutations/passwordless/useDisableMyPasswordlessMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const DisableMyPasswordlessMutation = TenantApi
 	.mutation$

package/src/hooks/mutations/passwordless/useEnableMyPasswordlessMutation.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 const EnableMyPasswordlessMutation = TenantApi
 	.mutation$

package/src/hooks/mutations/passwordless/useInitSignInPasswordlessMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 import { ModelType } from 'graphql-ts-client-api'
 
 const InitSignInPasswordlessMutationResult = TenantApi.initSignInPasswordlessResult$$

package/src/hooks/mutations/passwordless/useSignInPasswordlessMutation.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { LoginToken } from '../../useTenantApi'
-import { createTenantMutation } from '../../useTenantMutation'
+import { LoginToken } from '../../useTenantApi.js'
+import { createTenantMutation } from '../../useTenantMutation.js'
 import { ModelType } from 'graphql-ts-client-api'
 
 const signInResultFragment = TenantApi.signInPasswordlessResult$$.person(TenantApi.person$.id.email.name)

package/src/hooks/mutations/profile/index.ts

@@ -1,2 +1,2 @@
-export * from './useChangeProfile'
-export * from './useChangeMyProfile'
+export * from './useChangeProfile.js'
+export * from './useChangeMyProfile.js'

package/src/hooks/mutations/profile/useChangeMyProfile.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const changeMyProfile = TenantApi.mutation$
 	.changeMyProfile(

package/src/hooks/mutations/profile/useChangeProfile.ts

@@ -1,5 +1,5 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { createTenantMutation } from '../../useTenantMutation'
+import { createTenantMutation } from '../../useTenantMutation.js'
 
 export const changeProfile = TenantApi.mutation$
 	.changeProfile(

package/src/hooks/queries/index.ts

@@ -1,4 +1,4 @@
-export * from './useMeQuery'
-export * from './useProjectMembersQuery'
-export * from './useProjectMembershipsQuery'
-export * from './useProjectRolesDefinitionQuery'
+export * from './useMeQuery.js'
+export * from './useProjectMembersQuery.js'
+export * from './useProjectMembershipsQuery.js'
+export * from './useProjectRolesDefinitionQuery.js'

package/src/hooks/queries/useMeQuery.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { TenantApiOptions, useTenantApi } from '../useTenantApi'
+import { TenantApiOptions, useTenantApi } from '../useTenantApi.js'
 import { useCallback } from 'react'
 
 const identityFragment = TenantApi

package/src/hooks/queries/useProjectMembersQuery.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType, ParameterRef } from 'graphql-ts-client-api'
-import { TenantApiOptions, useTenantApi } from '../useTenantApi'
+import { TenantApiOptions, useTenantApi } from '../useTenantApi.js'
 import { useCallback } from 'react'
 
 const projectIdentityRelationFragment = TenantApi

package/src/hooks/queries/useProjectMembershipsQuery.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType, ParameterRef } from 'graphql-ts-client-api'
-import { TenantApiOptions, useTenantApi } from '../useTenantApi'
+import { TenantApiOptions, useTenantApi } from '../useTenantApi.js'
 import { useCallback } from 'react'
 
 const projectMembershipsFragment = TenantApi.membership$$.variables(TenantApi.variableEntry$$)

package/src/hooks/queries/useProjectRolesDefinitionQuery.ts

@@ -1,6 +1,6 @@
 import * as TenantApi from '@contember/graphql-client-tenant'
 import { ModelType } from 'graphql-ts-client-api'
-import { TenantApiOptions, useTenantApi } from '../useTenantApi'
+import { TenantApiOptions, useTenantApi } from '../useTenantApi.js'
 import { useCallback } from 'react'
 
 const projectRolesDefinitionFragment = TenantApi.roleDefinition$$

package/src/hooks/useFetchIdentity.ts

@@ -1,8 +1,8 @@
 import { useCallback, useMemo, useState } from 'react'
-import { Identity, IdentityMethods, IdentityStateValue } from '../types'
+import { Identity, IdentityMethods, IdentityStateValue } from '../types/index.js'
 import { GraphQlClientError, useSessionToken } from '@contember/react-client'
-import { useLogoutInternal } from '../internal/hooks/useLogoutInternal'
-import { useMeQuery } from './queries'
+import { useLogoutInternal } from '../internal/hooks/useLogoutInternal.js'
+import { useMeQuery } from './queries/index.js'
 
 export const useFetchIdentity = (): [{ state: IdentityStateValue; identity: Identity | undefined }, IdentityMethods] => {
 	const sessionToken = useSessionToken()

package/src/hooks/useLogout.ts

@@ -1,5 +1,5 @@
-import { useIdentityMethods } from '../contexts'
-import { useLogoutInternal } from '../internal/hooks/useLogoutInternal'
+import { useIdentityMethods } from '../contexts.js'
+import { useLogoutInternal } from '../internal/hooks/useLogoutInternal.js'
 
 export const useLogout = () => {
 	const { clearIdentity } = useIdentityMethods()

package/src/hooks/usePasswordlessOtpActivator.ts

@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react'
-import { PASSWORDLESS_REQUEST_STORAGE_KEY } from '../consts'
-import { useActivatePasswordlessOtpMutation } from './mutations'
-import { randomString } from '../internal/utils/randomInt'
-import { calculateHash } from '../internal/utils/hashing'
+import { PASSWORDLESS_REQUEST_STORAGE_KEY } from '../consts.js'
+import { useActivatePasswordlessOtpMutation } from './mutations/index.js'
+import { randomString } from '../internal/utils/randomInt.js'
+import { calculateHash } from '../internal/utils/hashing.js'
 import { ActivatePasswordlessOtpErrorCode } from '@contember/graphql-client-tenant'
 
 const usePasswordlessParams = (): { localStorageRequestId: string | null; urlRequestId: string | null; urlToken: string | null } => {

package/src/hooks/useTenantMutation.ts

@@ -1,4 +1,4 @@
-import { TenantApiOptions, useTenantApi } from './useTenantApi'
+import { TenantApiOptions, useTenantApi } from './useTenantApi.js'
 import { useCallback, useMemo } from 'react'
 import { MutationFetcher } from '@contember/graphql-client-tenant'
 

package/src/index.ts

@@ -1,6 +1,6 @@
-export * from './components'
-export * from './contexts'
-export * from './hooks'
-export * from './types'
+export * from './components/index.js'
+export * from './contexts.js'
+export * from './hooks/index.js'
+export * from './types/index.js'
 
 export type { ModelType } from 'graphql-ts-client-api'

package/src/internal/hooks/useHandleIDPResponse.ts

@@ -1,10 +1,10 @@
 import { SetStateAction, useEffect, useRef } from 'react'
 import { useSetSessionToken } from '@contember/react-client'
-import { useIDPStateStore } from './useIDPStateStore'
-import { getBaseHref } from '../utils/getBaseHref'
-import { IDPStateValue } from '../../types/idp'
-import { useSignInIDPMutation } from '../../hooks'
-import { useRedirectToBacklinkCallback } from './useRedirectToBacklink'
+import { useIDPStateStore } from './useIDPStateStore.js'
+import { getBaseHref } from '../utils/getBaseHref.js'
+import { IDPStateValue } from '../../types/idp.js'
+import { useSignInIDPMutation } from '../../hooks/index.js'
+import { useRedirectToBacklinkCallback } from './useRedirectToBacklink.js'
 
 export interface UseHandleIDPResponseProps {
 	onLogin?: () => void

package/src/internal/hooks/useInitIDPRedirect.ts

@@ -1,9 +1,9 @@
 import { SetStateAction, useCallback } from 'react'
-import { useIDPStateStore } from './useIDPStateStore'
-import { getBaseHref } from '../utils/getBaseHref'
-import { IDPInitError, IDPStateValue } from '../../types/idp'
-import { useInitSignInIDPMutation } from '../../hooks'
-import { useSaveBacklink } from './useRedirectToBacklink'
+import { useIDPStateStore } from './useIDPStateStore.js'
+import { getBaseHref } from '../utils/getBaseHref.js'
+import { IDPInitError, IDPStateValue } from '../../types/idp.js'
+import { useInitSignInIDPMutation } from '../../hooks/index.js'
+import { useSaveBacklink } from './useRedirectToBacklink.js'
 
 export interface UseInitIDPRedirectProps {
 	onRedirect?: (url: string) => void

package/src/internal/hooks/useLogoutInternal.ts

@@ -1,13 +1,13 @@
 import { useSetSessionToken } from '@contember/react-client'
 import { useCallback } from 'react'
-import { useSignOutMutation } from '../../hooks'
+import { signOutMutation, useTenantApi } from '../../hooks/index.js'
 
 export const useLogoutInternal = (clearIdentity?: () => void) => {
-	const tenantLogout = useSignOutMutation()
+	const tenantApi = useTenantApi()
 	const setSessionToken = useSetSessionToken()
 
 	return useCallback(
-		async ({ noRedirect = false }: { noRedirect?: boolean } = {}) => {
+		async ({ noRedirect = false, idpLogout = false }: { noRedirect?: boolean; idpLogout?: boolean } = {}) => {
 			if (navigator.credentials?.preventSilentAccess) {
 				try {
 					await navigator.credentials.preventSilentAccess()
@@ -18,18 +18,28 @@ export const useLogoutInternal = (clearIdentity?: () => void) => {
 			}
 			clearIdentity?.()
 			setSessionToken(undefined)
+			// RP-initiated (front-channel) Single Logout: when the session was federated via an OIDC
+			// IdP that advertises an end_session_endpoint, `signOut` returns the URL to send the
+			// browser to so the user is also signed out at the IdP. Opt-in via `idpLogout` — by
+			// default we keep the existing local-only redirect to `/`. We call the tenant API
+			// directly (not useSignOutMutation) because the generic mutation wrapper only surfaces a
+			// `result` payload, whereas `logoutUrl` is a top-level field on SignOutResponse.
+			let idpLogoutUrl: string | undefined
 			try {
-				const response = await tenantLogout({})
-				if (!response?.ok) {
-					console.warn(response?.error)
+				const { mutation } = await tenantApi(signOutMutation)
+				if (!mutation?.ok) {
+					console.warn(mutation?.error)
+				}
+				if (idpLogout) {
+					idpLogoutUrl = mutation?.logoutUrl ?? undefined
 				}
 			} catch (e) {
 				console.warn(e)
 			}
 			if (!noRedirect) {
-				window.location.href = '/' // todo better redirect?
+				window.location.href = idpLogoutUrl ?? '/' // todo better redirect?
 			}
 		},
-		[clearIdentity, setSessionToken, tenantLogout],
+		[clearIdentity, setSessionToken, tenantApi],
 	)
 }

package/src/internal/hooks/useRedirectToBacklink.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect } from 'react'
-import { useIdentity } from '../../contexts'
+import { useIdentity } from '../../contexts.js'
 
 const getBacklinkFromUrl = () => {
 	return new URLSearchParams(window.location.search).get('backlink')

package/src/types/index.ts

@@ -1,5 +1,5 @@
-export * from './forms'
-export * from './IdentityMethods'
-export * from './IdentityStateValue'
-export * from './Identity'
-export * from './idp'
+export * from './forms.js'
+export * from './IdentityMethods.js'
+export * from './IdentityStateValue.js'
+export * from './Identity.js'
+export * from './idp.js'