Pass organizationId to password login page to sign in and assume at the same time when possible
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
@@ -65,10 +65,12 @@ export function useAssume(params: UseAssumeParameters) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const { result } = assumeOrganizationSession;
|
const { result } = assumeOrganizationSession;
|
||||||
|
const search = new URLSearchParams();
|
||||||
|
|
||||||
switch (result.__typename) {
|
switch (result.__typename) {
|
||||||
case "PasswordRequired":
|
case "PasswordRequired":
|
||||||
void navigate("/auth/login");
|
search.set("organizationId", organizationId);
|
||||||
|
void navigate({ pathname: "/auth/passord-login", search: "?" + search.toString() });
|
||||||
break;
|
break;
|
||||||
case "SAMLAuthenticationRequired":
|
case "SAMLAuthenticationRequired":
|
||||||
window.location.href = result.redirectUrl;
|
window.location.href = result.redirectUrl;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
|
|||||||
import { Button, Field, IconChevronLeft, useToast } from "@probo/ui";
|
import { Button, Field, IconChevronLeft, useToast } from "@probo/ui";
|
||||||
import type { FormEventHandler } from "react";
|
import type { FormEventHandler } from "react";
|
||||||
import { useMutation } from "react-relay";
|
import { useMutation } from "react-relay";
|
||||||
import { Link } from "react-router";
|
import { Link, useSearchParams } from "react-router";
|
||||||
import { graphql } from "relay-runtime";
|
import { graphql } from "relay-runtime";
|
||||||
|
|
||||||
import type { PasswordSignInPageMutation } from "#/__generated__/iam/PasswordSignInPageMutation.graphql";
|
import type { PasswordSignInPageMutation } from "#/__generated__/iam/PasswordSignInPageMutation.graphql";
|
||||||
@@ -19,8 +19,9 @@ const signInMutation = graphql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export default function PasswordSignInPage() {
|
export default function PasswordSignInPage() {
|
||||||
const { __ } = useTranslate();
|
const [searchParams] = useSearchParams();
|
||||||
|
|
||||||
|
const { __ } = useTranslate();
|
||||||
const { toast } = useToast();
|
const { toast } = useToast();
|
||||||
|
|
||||||
const [signIn, isSigningIn]
|
const [signIn, isSigningIn]
|
||||||
@@ -39,6 +40,8 @@ export default function PasswordSignInPage() {
|
|||||||
input: {
|
input: {
|
||||||
email: emailValue,
|
email: emailValue,
|
||||||
password: passwordValue,
|
password: passwordValue,
|
||||||
|
// Assume when signing in
|
||||||
|
organizationId: searchParams.get("organizationId"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
onCompleted: (_, error) => {
|
onCompleted: (_, error) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user