@contember/react-client-tenant 2.1.0-alpha.22 → 2.1.0-alpha.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contember/react-client-tenant",
   "license": "Apache-2.0",
-  "version": "2.1.0-alpha.22",
+  "version": "2.1.0-alpha.24",
   "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.22",
-    "@contember/react-client": "2.1.0-alpha.22",
-    "@contember/react-utils": "2.1.0-alpha.22",
+    "@contember/graphql-client-tenant": "2.1.0-alpha.24",
+    "@contember/react-client": "2.1.0-alpha.24",
+    "@contember/react-utils": "2.1.0-alpha.24",
     "@radix-ui/primitive": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "graphql-ts-client-api": "^3.1.17"

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'))
@@ -29,9 +30,9 @@ export const IDP = ({ children, onResponseError, onInitError, onLogin, expiratio
 		}
 		return { type: 'nothing' }
 	})
-	useHandleIDPResponse({ hasOauthResponse, setState, onLogin, expiration: expiration })
+	useHandleIDPResponse({ hasOauthResponse, setState, onLogin, expiration: expiration, redirectUrl })
 
-	const initRedirect = useInitIDPRedirect({ setState })
+	const initRedirect = useInitIDPRedirect({ setState, redirectUrl })
 
 	const isFirstRender = useRef(true)
 	useEffect(() => {

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,7 @@ 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 +45,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,

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])
 }