synced/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2025-03-28 15:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Cleanup

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-13 14:34:28 +01:00
parent c42d407cda
commit f53fa46c51
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/src/pages/_app.tsx
View File

@ -102,29 +102,29 @@ const App = ({ Component, pageProps, ...appProps }: NextAppProp): JSX.Element =>
return (
<QueryClientProvider client={queryClient}>
<UserProvider>
<TooltipProvider>
<NotificationProvider>
<ServerConfigProvider>
<AuthProvider>
<OrgProvider>
<OrgPermissionProvider>
<WorkspaceProvider>
<ProjectPermissionProvider>
<SubscriptionProvider>
<TooltipProvider>
<NotificationProvider>
<ServerConfigProvider>
<AuthProvider>
<OrgProvider>
<OrgPermissionProvider>
<WorkspaceProvider>
<ProjectPermissionProvider>
<SubscriptionProvider>
<UserProvider>
<Layout>
<Component {...pageProps} />
</Layout>
</SubscriptionProvider>
</ProjectPermissionProvider>
</WorkspaceProvider>
</OrgPermissionProvider>
</OrgProvider>
</AuthProvider>
</ServerConfigProvider>
</NotificationProvider>
</TooltipProvider>
</UserProvider>
</UserProvider>
</SubscriptionProvider>
</ProjectPermissionProvider>
</WorkspaceProvider>
</OrgPermissionProvider>
</OrgProvider>
</AuthProvider>
</ServerConfigProvider>
</NotificationProvider>
</TooltipProvider>
</QueryClientProvider>
);
};

9
frontend/src/pages/signupinvite.tsx
View File

@ -25,7 +25,7 @@ import SecurityClient from "@app/components/utilities/SecurityClient";
import { useServerConfig } from "@app/context";
import {
completeAccountSignupInvite,
selectOrganization,
useSelectOrganization,
verifySignupInvite
} from "@app/hooks/api/auth/queries";
import { fetchOrganizations } from "@app/hooks/api/organization/queries";
@ -63,6 +63,8 @@ export default function SignupInvite() {
const email = (parsedUrl.to as string)?.replace(" ", "+").trim();
const { config } = useServerConfig();
const { mutateAsync: selectOrganization } = useSelectOrganization();
useEffect(() => {
if (!config.allowSignUp) {
router.push("/login");
@ -175,8 +177,9 @@ export default function SignupInvite() {
const orgId = userOrgs[0].id;
const { token: newJwtToken } = await selectOrganization({ organizationId: orgId });
SecurityClient.setToken(newJwtToken);
if (!orgId) throw new Error("You are not part of any organization");
await selectOrganization({ organizationId: orgId });
localStorage.setItem("orgData.id", orgId);

1
frontend/src/views/Login/Login.tsx
View File

@ -17,7 +17,6 @@ export const Login = () => {
useEffect(() => {
// TODO(akhilmhdh): workspace will be controlled by a workspace context
const handleRedirects = async () => {
// TODO(daniel): Move this to select-organization page.
try {
const callbackPort = queryParams?.get("callback_port");
// case: a callback port is set, meaning it's a cli login request: redirect to select org with callback port