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

package/src/hooks/queries/useProjectRolesDefinitionQuery.ts

@@ -8,8 +8,7 @@ const projectRolesDefinitionFragment = TenantApi.roleDefinition$$
 		TenantApi.roleVariableDefinition$$
 			.on(TenantApi.roleConditionVariableDefinition$$)
 			.on(TenantApi.roleEntityVariableDefinition$$)
-			.on(TenantApi.rolePredefinedVariableDefinition$$)
-		,
+			.on(TenantApi.rolePredefinedVariableDefinition$$),
 	)
 
 export type ProjectRoleDefinition = ModelType<typeof projectRolesDefinitionFragment>

package/src/hooks/useFetchIdentity.ts

@@ -8,7 +8,10 @@ export const useFetchIdentity = (): [{ state: IdentityStateValue; identity: Iden
 	const sessionToken = useSessionToken()
 	const fetchMe = useMeQuery()
 
-	const [identityState, setIdentityState] = useState<ReturnType<typeof useFetchIdentity>[0]>({ state: sessionToken ? 'loading' : 'none', identity: undefined })
+	const [identityState, setIdentityState] = useState<ReturnType<typeof useFetchIdentity>[0]>({
+		state: sessionToken ? 'loading' : 'none',
+		identity: undefined,
+	})
 
 	const clearIdentity = useCallback(() => setIdentityState({ state: 'cleared', identity: undefined }), [])
 	const logout = useLogoutInternal(clearIdentity)

package/src/hooks/usePasswordlessOtpActivator.ts

@@ -5,7 +5,7 @@ import { randomString } from '../internal/utils/randomInt'
 import { calculateHash } from '../internal/utils/hashing'
 import { ActivatePasswordlessOtpErrorCode } from '@contember/graphql-client-tenant'
 
-const usePasswordlessParams = (): {localStorageRequestId: string | null; urlRequestId: string | null; urlToken: string | null} => {
+const usePasswordlessParams = (): { localStorageRequestId: string | null; urlRequestId: string | null; urlToken: string | null } => {
 	const localStorageValue = localStorage.getItem(PASSWORDLESS_REQUEST_STORAGE_KEY) ?? null
 	const urlParams = new URLSearchParams(window.location.search)
 	const requestId = urlParams.get('request_id')
@@ -18,7 +18,7 @@ export type PasswordlessResponseHandlerState =
 	| { type: 'empty' }
 	| { type: 'otp_activating' }
 	| { type: 'otp_activated'; otp: string }
-	| { type: 'otp_activation_failed'; error: ActivatePasswordlessOtpErrorCode | 'UNKNOWN_ERROR'}
+	| { type: 'otp_activation_failed'; error: ActivatePasswordlessOtpErrorCode | 'UNKNOWN_ERROR' }
 	| { type: 'can_proceed_to_login' }
 
 export const usePasswordlessOtpActivator = ({ otpLength = 6, otpChars = '0123456789ABCDEF' }: {
@@ -39,8 +39,9 @@ export const usePasswordlessOtpActivator = ({ otpLength = 6, otpChars = '0123456
 		return { type: 'empty' }
 	})
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: intentional
 	useEffect(() => {
-		(async () => {
+		;(async () => {
 			if (state.type === 'otp_activating') {
 				const otpCode = randomString(otpLength, otpChars)
 				try {

package/src/hooks/useTenantApi.ts

@@ -21,7 +21,6 @@ export const useTenantApi = ({ headers, apiToken }: TenantApiOptions = {}) => {
 			readonly apiToken?: string | typeof LoginToken
 		},
 	): Promise<TData> => {
-
 		const writer = new TextWriter()
 		writer.text(`${fetcher.fetchableType.name.toLowerCase()}`)
 		if (fetcher.variableTypeMap.size !== 0) {

package/src/hooks/useTenantMutation.ts

@@ -6,7 +6,9 @@ export type TenantMutationOkResponse<Result> = { ok: true; result: Result }
 export type TenantMutationErrorResponse<Error> = { ok: false; error: Error; developerMessage?: string }
 export type TenantMutationResponse<Result, Error> = TenantMutationOkResponse<Result> | TenantMutationErrorResponse<Error>
 
-export type TenantMutation<Result, Error> = { readonly mutation?: { readonly ok: boolean; readonly error?: { readonly code: Error; readonly developerMessage: string}; readonly result?: Result} }
+export type TenantMutation<Result, Error> = {
+	readonly mutation?: { readonly ok: boolean; readonly error?: { readonly code: Error; readonly developerMessage: string }; readonly result?: Result }
+}
 
 export const useTenantMutation = <TResult, TError extends string = never, TVariables extends object = {}>(
 	fetcher: MutationFetcher<TenantMutation<TResult, TError>, TVariables>,
@@ -33,13 +35,13 @@ export const useTenantMutation = <TResult, TError extends string = never, TVaria
 	}, [fetcher, tenantApi])
 }
 
-
 export const createTenantMutation = <TResult, TError extends string = never, TVariables extends object = {}>(
 	fetcher: MutationFetcher<TenantMutation<TResult, TError>, TVariables>,
 	defaultOptions?: TenantApiOptions,
 ) => {
-	return ({ headers, apiToken }: TenantApiOptions = {}) => useTenantMutation(fetcher, {
-		headers: useMemo(() => ({ ...defaultOptions?.headers, ...headers }), [headers]),
-		apiToken: apiToken ?? defaultOptions?.apiToken,
-	})
+	return ({ headers, apiToken }: TenantApiOptions = {}) =>
+		useTenantMutation(fetcher, {
+			headers: useMemo(() => ({ ...defaultOptions?.headers, ...headers }), [headers]),
+			apiToken: apiToken ?? defaultOptions?.apiToken,
+		})
 }

package/src/hooks/useTenantQueryLoader.ts

@@ -11,7 +11,10 @@ export type TenantQueryLoaderMethods = {
 	refresh: () => void
 }
 
-export const useTenantQueryLoader = <TVariables extends object, Result>(fetcher: (variables: TVariables) => Promise<Result>, variables: TVariables): [TenantQueryLoaderState<Result>, TenantQueryLoaderMethods] => {
+export const useTenantQueryLoader = <TVariables extends object, Result>(
+	fetcher: (variables: TVariables) => Promise<Result>,
+	variables: TVariables,
+): [TenantQueryLoaderState<Result>, TenantQueryLoaderMethods] => {
 	const [state, setState] = useState<TenantQueryLoaderState<Result>>({ state: 'loading' })
 	const stateRef = useRef(state)
 	stateRef.current = state
@@ -37,10 +40,8 @@ export const useTenantQueryLoader = <TVariables extends object, Result>(fetcher:
 			}
 			setState({ state: 'error', error: e })
 		}
-
 	}, [fetcher, variablesMemo])
 
-
 	useEffect(() => {
 		triggerLoad()
 	}, [triggerLoad])

package/src/internal/hooks/useHandleIDPResponse.ts

@@ -12,6 +12,7 @@ export interface UseHandleIDPResponseProps {
 
 	setState: (state: SetStateAction<IDPStateValue>) => void
 	hasOauthResponse: boolean
+	redirectUrl?: string
 }
 
 const headers = {
@@ -20,7 +21,9 @@ const headers = {
 
 const DEFAULT_LOGIN_EXPIRATION = 14 * 24 * 60 // 14 days
 
-export const useHandleIDPResponse = ({ onLogin, expiration = DEFAULT_LOGIN_EXPIRATION, setState, hasOauthResponse }: UseHandleIDPResponseProps): void => {
+export const useHandleIDPResponse = (
+	{ onLogin, expiration = DEFAULT_LOGIN_EXPIRATION, setState, hasOauthResponse, redirectUrl }: UseHandleIDPResponseProps,
+): void => {
 	const idpSignIn = useSignInIDPMutation({ headers })
 	const setSessionToken = useSetSessionToken()
 
@@ -44,7 +47,7 @@ export const useHandleIDPResponse = ({ onLogin, expiration = DEFAULT_LOGIN_EXPIR
 			const response = await idpSignIn({
 				data: {
 					url: window.location.href,
-					redirectUrl: getBaseHref(),
+					redirectUrl: redirectUrl || getBaseHref(),
 					sessionData: idpState.sessionData,
 				},
 				identityProvider: idpState.provider,
@@ -60,5 +63,5 @@ export const useHandleIDPResponse = ({ onLogin, expiration = DEFAULT_LOGIN_EXPIR
 				redirectToBackLink()
 			}
 		})()
-	}, [idpSignIn, onLogin, setSessionToken, hasOauthResponse, loadIdpState, expiration, setState, redirectToBackLink])
+	}, [idpSignIn, onLogin, setSessionToken, hasOauthResponse, loadIdpState, expiration, setState, redirectToBackLink, redirectUrl])
 }

package/src/internal/hooks/useIDPAutoInit.ts

@@ -15,4 +15,3 @@ export const useIDPAutoInitProvider = () => {
 		}
 	}, [])
 }
-

package/src/internal/hooks/useIDPStateStore.ts

@@ -2,7 +2,7 @@ import { useCallback } from 'react'
 
 export type IDPState = { provider: string; sessionData: any }
 
-export const useIDPStateStore = (): {get: () => IDPState | null; set: (state: IDPState) => void} => {
+export const useIDPStateStore = (): { get: () => IDPState | null; set: (state: IDPState) => void } => {
 	return {
 		get: useCallback(() => {
 			const item = sessionStorage.getItem('idp')

package/src/internal/hooks/useInitIDPRedirect.ts

@@ -8,9 +8,10 @@ import { useSaveBacklink } from './useRedirectToBacklink'
 export interface UseInitIDPRedirectProps {
 	onRedirect?: (url: string) => void
 	setState: (state: SetStateAction<IDPStateValue>) => void
+	redirectUrl?: string
 }
 
-export const useInitIDPRedirect = ({ onRedirect, setState }: UseInitIDPRedirectProps) => {
+export const useInitIDPRedirect = ({ onRedirect, setState, redirectUrl }: UseInitIDPRedirectProps) => {
 	const initRequest = useInitSignInIDPMutation()
 	const saveBacklink = useSaveBacklink()
 	const { set: saveIdpState } = useIDPStateStore()
@@ -24,7 +25,7 @@ export const useInitIDPRedirect = ({ onRedirect, setState }: UseInitIDPRedirectP
 			setState({ type: 'processing_init' })
 			const response = await initRequest({
 				data: {
-					redirectUrl: getBaseHref(),
+					redirectUrl: redirectUrl || getBaseHref(),
 				},
 				identityProvider: provider,
 			})
@@ -44,5 +45,5 @@ export const useInitIDPRedirect = ({ onRedirect, setState }: UseInitIDPRedirectP
 			console.error(e)
 			return fail('UNKNOWN_ERROR')
 		}
-	}, [initRequest, onRedirect, saveBacklink, saveIdpState, setState])
+	}, [initRequest, onRedirect, saveBacklink, saveIdpState, setState, redirectUrl])
 }

package/src/internal/hooks/useLogoutInternal.ts

@@ -8,7 +8,7 @@ export const useLogoutInternal = (clearIdentity?: () => void) => {
 
 	return useCallback(
 		async ({ noRedirect = false }: { noRedirect?: boolean } = {}) => {
-			if (navigator.credentials && navigator.credentials.preventSilentAccess) {
+			if (navigator.credentials?.preventSilentAccess) {
 				try {
 					await navigator.credentials.preventSilentAccess()
 				} catch {

package/src/internal/hooks/useRedirectToBacklink.ts

@@ -5,23 +5,30 @@ const getBacklinkFromUrl = () => {
 	return new URLSearchParams(window.location.search).get('backlink')
 }
 
-export const useSaveBacklink = () => {
+export const useSaveBacklink = ({ storage = 'session' }: {
+	storage?: 'session' | 'local'
+} = {}) => {
 	return useCallback(() => {
 		const backlink = getBacklinkFromUrl()
 		if (!backlink) {
 			return
 		}
-		sessionStorage.setItem('backlink', backlink)
-	}, [])
+		if (storage === 'local') {
+			localStorage.setItem('backlink', backlink)
+		} else {
+			sessionStorage.setItem('backlink', backlink)
+		}
+	}, [storage])
 }
 
 export const useRedirectToBacklinkCallback = () => {
 	return useCallback(() => {
-		const backlink = getBacklinkFromUrl() ?? sessionStorage.getItem('backlink')
+		const backlink = getBacklinkFromUrl() ?? sessionStorage.getItem('backlink') ?? localStorage.getItem('backlink')
 		if (!backlink) {
 			return
 		}
 		sessionStorage.removeItem('backlink')
+		localStorage.removeItem('backlink')
 		const resolvedBacklink = new URL(backlink, window.location.href)
 		if (resolvedBacklink.origin === window.location.origin) {
 			window.location.href = resolvedBacklink.toString()
@@ -38,5 +45,4 @@ export const useRedirectToBacklink = () => {
 		}
 		redirect()
 	}, [identity, redirect])
-
 }

package/src/internal/utils/randomInt.ts

@@ -20,7 +20,6 @@ export const randomInt = (min: number, max: number) => {
 	return min + (randomInt % range)
 }
 
-
 export const randomString = (length: number, charset: string): string => {
 	let result = ''
 	for (let i = 0; i < length; i++) {

package/src/types/idp.ts

@@ -19,7 +19,6 @@ export type IDPResponseError =
 	| 'INVALID_LOCAL_STATE'
 	| 'UNKNOWN_ERROR'
 
-
 export type IDPMethods = {
 	initRedirect: (args: { provider: string }) => Promise<{ ok: true } | { ok: false; error: IDPInitError }>
 }