fix: address sso redirect and project role creation

This commit is contained in:
Sheen Capadngan
2025-01-08 18:29:25 +08:00
parent 1576358805
commit 34354994d8
2 changed files with 5 additions and 3 deletions
@@ -48,7 +48,8 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
const redirectUrl = `/api/v1/sso/redirect/saml2/organizations/${orgSlug}${ const redirectUrl = `/api/v1/sso/redirect/saml2/organizations/${orgSlug}${
callbackPort ? `?callback_port=${callbackPort}` : "" callbackPort ? `?callback_port=${callbackPort}` : ""
}`; }`;
navigate({ to: redirectUrl });
window.location.assign(redirectUrl);
}; };
const redirectToOidc = (orgSlug: string) => { const redirectToOidc = (orgSlug: string) => {
@@ -56,7 +57,8 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
const redirectUrl = `/api/v1/sso/oidc/login?orgSlug=${orgSlug}${ const redirectUrl = `/api/v1/sso/oidc/login?orgSlug=${orgSlug}${
callbackPort ? `&callbackPort=${callbackPort}` : "" callbackPort ? `&callbackPort=${callbackPort}` : ""
}`; }`;
navigate({ to: redirectUrl });
window.location.assign(redirectUrl);
}; };
useEffect(() => { useEffect(() => {
@@ -25,7 +25,7 @@ import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@a
import { usePopUp } from "@app/hooks"; import { usePopUp } from "@app/hooks";
import { useDeleteProjectRole, useGetProjectRoles } from "@app/hooks/api"; import { useDeleteProjectRole, useGetProjectRoles } from "@app/hooks/api";
import { TProjectRole } from "@app/hooks/api/roles/types"; import { TProjectRole } from "@app/hooks/api/roles/types";
import { RoleModal } from "@app/pages/organization/RoleByIDPage/components"; import { RoleModal } from "@app/pages/project/RoleDetailsBySlugPage/components/RoleModal";
export const ProjectRoleList = () => { export const ProjectRoleList = () => {
const navigate = useNavigate(); const navigate = useNavigate();