mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-10 17:29:14 +00:00
Merge pull request #2953 from Infisical/fix/addressed-reported-migration-related-ui-issues
fix: address sso redirect and project role creation
This commit is contained in:
@@ -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(() => {
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import { z } from "zod";
|
|||||||
import { GitHubOAuthCallbackPage } from "./GithubOauthCallbackPage";
|
import { GitHubOAuthCallbackPage } from "./GithubOauthCallbackPage";
|
||||||
|
|
||||||
const GitHubOAuthCallbackPageQueryParamsSchema = z.object({
|
const GitHubOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
code: z.string().catch(""),
|
code: z.coerce.string().catch(""),
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
installation_id: z.coerce.string().catch("")
|
installation_id: z.coerce.string().optional().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
+1
-1
@@ -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();
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import { AzureAppConfigurationOauthCallbackPage } from "./AzureAppConfigurationO
|
|||||||
|
|
||||||
export const AzureAppConfigurationOauthCallbackPageQueryParamsSchema = z.object({
|
export const AzureAppConfigurationOauthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import { AzureKeyVaultOauthCallbackPage } from "./AzureKeyVaultOauthCallback";
|
|||||||
|
|
||||||
export const AzureKeyVaultOauthCallbackQueryParamsSchema = z.object({
|
export const AzureKeyVaultOauthCallbackQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { BitbucketOauthCallbackPage } from "./BitbucketOauthCallbackPage";
|
|||||||
|
|
||||||
export const BitbucketOauthCallbackQueryParamsSchema = z.object({
|
export const BitbucketOauthCallbackQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import { GcpSecretManagerOauthCallbackPage } from "./GcpSecretManagerOauthCallba
|
|||||||
|
|
||||||
export const GcpSecretManagerOAuthCallbackPageQueryParamsSchema = z.object({
|
export const GcpSecretManagerOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import { GithubOauthCallbackPage } from "./GithubOauthCallbackPage";
|
|||||||
|
|
||||||
export const GithubOAuthCallbackPageQueryParamsSchema = z.object({
|
export const GithubOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
installation_id: z.coerce.string().catch(""),
|
installation_id: z.coerce.string().optional().catch(""),
|
||||||
code: z.string().catch("")
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { GitLabOAuthCallbackPage } from "./GitlabOauthCallbackPage";
|
|||||||
|
|
||||||
export const GitlabOAuthCallbackPageQueryParamsSchema = z.object({
|
export const GitlabOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { HerokuOAuthCallbackPage } from "./HerokuOauthCallbackPage";
|
|||||||
|
|
||||||
export const HerokuOAuthCallbackPageQueryParamsSchema = z.object({
|
export const HerokuOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { NetlifyOauthCallbackPage } from "./NetlifyOauthCallbackPage";
|
|||||||
|
|
||||||
export const NetlifyOAuthCallbackPageQueryParamsSchema = z.object({
|
export const NetlifyOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { VercelOauthCallbackPage } from "./VercelOauthCallbackPage";
|
|||||||
|
|
||||||
export const VercelOAuthCallbackPageQueryParamsSchema = z.object({
|
export const VercelOAuthCallbackPageQueryParamsSchema = z.object({
|
||||||
state: z.string().catch(""),
|
state: z.string().catch(""),
|
||||||
code: z.string()
|
code: z.coerce.string().catch("")
|
||||||
});
|
});
|
||||||
|
|
||||||
export const Route = createFileRoute(
|
export const Route = createFileRoute(
|
||||||
|
|||||||
Reference in New Issue
Block a user