@contember/react-client-tenant 2.1.0-alpha.21 → 2.1.0-alpha.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contember/react-client-tenant",
   "license": "Apache-2.0",
-  "version": "2.1.0-alpha.21",
+  "version": "2.1.0-alpha.23",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/production/index.js",
@@ -34,9 +34,9 @@
     "directory": "packages/react-client-tenant"
   },
   "dependencies": {
-    "@contember/graphql-client-tenant": "2.1.0-alpha.21",
-    "@contember/react-client": "2.1.0-alpha.21",
-    "@contember/react-utils": "2.1.0-alpha.21",
+    "@contember/graphql-client-tenant": "2.1.0-alpha.23",
+    "@contember/react-client": "2.1.0-alpha.23",
+    "@contember/react-utils": "2.1.0-alpha.23",
     "@radix-ui/primitive": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "graphql-ts-client-api": "^3.1.17"

package/src/components/forms/PasswordlessSignInForm.tsx

@@ -1,11 +1,11 @@
-import { ReactElement, useCallback, useMemo } from 'react'
 import * as TenantApi from '@contember/graphql-client-tenant'
-import { TenantForm } from './TenantForm'
-import { FormContextValue, FormError, FormState } from '../../types/forms'
+import { useSetSessionToken } from '@contember/react-client'
+import { ReactElement, useCallback, useMemo } from 'react'
 import { useForm } from '../../contexts'
 import { SignInPasswordlessMutationResult, useSignInPasswordlessMutation } from '../../hooks'
 import { useRedirectToBacklinkCallback } from '../../internal/hooks/useRedirectToBacklink'
-import { useSetSessionToken } from '@contember/react-client'
+import { FormContextValue, FormError, FormState } from '../../types/forms'
+import { TenantForm } from './TenantForm'
 
 export type PasswordlessSignInFormValues = {
 	token: string

package/src/components/forms/PasswordlessSignInInitForm.tsx

@@ -5,6 +5,7 @@ import { FormContextValue, FormError, FormState } from '../../types/forms'
 import { useForm } from '../../contexts'
 import { InitSignInPasswordlessMutationResult, useInitSignInPasswordlessMutation } from '../../hooks'
 import { PASSWORDLESS_REQUEST_STORAGE_KEY } from '../../consts'
+import { useSaveBacklink } from '../../internal/hooks/useRedirectToBacklink'
 
 export type PasswordlessSignInInitFormValues = {
 	email: string
@@ -33,10 +34,15 @@ export const usePasswordlessSignInInitForm = useForm as () => PasswordlessSignIn
 export const PasswordlessSignInInitForm = ({ children, onSuccess }: PasswordlessSignInInitFormProps) => {
 
 	const initSignIn = useInitSignInPasswordlessMutation()
+	const saveBacklink = useSaveBacklink({
+		storage: 'local',
+	})
+
 	return (
 		<TenantForm<PasswordlessSignInInitFormContextValue, InitSignInPasswordlessMutationResult>
 			onSuccess={res => {
 				localStorage.setItem(PASSWORDLESS_REQUEST_STORAGE_KEY, res.result.requestId)
+				saveBacklink()
 				onSuccess?.(res)
 			}}
 			errorMapping={errorToField}

package/src/components/idp/IDP.tsx

@@ -11,9 +11,10 @@ export interface IDPProps {
 	onInitError?: (error: IDPInitError) => void
 	onResponseError?: (error: IDPResponseError) => void
 	expiration?: number
+	redirectUrl?: string
 }
 
-export const IDP = ({ children, onResponseError, onInitError, onLogin, expiration }: IDPProps) => {
+export const IDP = ({ children, onResponseError, onInitError, onLogin, expiration, redirectUrl }: IDPProps) => {
 	const hasOauthResponse = useMemo(() => {
 		const params = new URLSearchParams(window.location.search)
 		return params.has('state') && (params.has('code') || params.has('id_token'))
@@ -31,7 +32,7 @@ export const IDP = ({ children, onResponseError, onInitError, onLogin, expiratio
 	})
 	useHandleIDPResponse({ hasOauthResponse, setState, onLogin, expiration: expiration })
 
-	const initRedirect = useInitIDPRedirect({ setState })
+	const initRedirect = useInitIDPRedirect({ setState, redirectUrl })
 
 	const isFirstRender = useRef(true)
 	useEffect(() => {

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/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()