awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 05:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Cleanup

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-17 18:49:30 +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
frontend/src/pages/_app.tsx
+20 -20
View File
@@ -102,29 +102,29 @@ const App = ({ Component, pageProps, ...appProps }: NextAppProp): JSX.Element =>
return ( return (
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<UserProvider> <TooltipProvider>
<TooltipProvider> <NotificationProvider>
<NotificationProvider> <ServerConfigProvider>
<ServerConfigProvider> <AuthProvider>
<AuthProvider> <OrgProvider>
<OrgProvider> <OrgPermissionProvider>
<OrgPermissionProvider> <WorkspaceProvider>
<WorkspaceProvider> <ProjectPermissionProvider>
<ProjectPermissionProvider> <SubscriptionProvider>
<SubscriptionProvider> <UserProvider>
<Layout> <Layout>
<Component {...pageProps} /> <Component {...pageProps} />
</Layout> </Layout>
</SubscriptionProvider> </UserProvider>
</ProjectPermissionProvider> </SubscriptionProvider>
</WorkspaceProvider> </ProjectPermissionProvider>
</OrgPermissionProvider> </WorkspaceProvider>
</OrgProvider> </OrgPermissionProvider>
</AuthProvider> </OrgProvider>
</ServerConfigProvider> </AuthProvider>
</NotificationProvider> </ServerConfigProvider>
</TooltipProvider> </NotificationProvider>
</UserProvider> </TooltipProvider>
</QueryClientProvider> </QueryClientProvider>
); );
}; };
frontend/src/pages/signupinvite.tsx
+6 -3
View File
@@ -25,7 +25,7 @@ import SecurityClient from "@app/components/utilities/SecurityClient";
import { useServerConfig } from "@app/context"; import { useServerConfig } from "@app/context";
import { import {
completeAccountSignupInvite, completeAccountSignupInvite,
selectOrganization, useSelectOrganization,
verifySignupInvite verifySignupInvite
} from "@app/hooks/api/auth/queries"; } from "@app/hooks/api/auth/queries";
import { fetchOrganizations } from "@app/hooks/api/organization/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 email = (parsedUrl.to as string)?.replace(" ", "+").trim();
const { config } = useServerConfig(); const { config } = useServerConfig();
const { mutateAsync: selectOrganization } = useSelectOrganization();
useEffect(() => { useEffect(() => {
if (!config.allowSignUp) { if (!config.allowSignUp) {
router.push("/login"); router.push("/login");
@@ -175,8 +177,9 @@ export default function SignupInvite() {
const orgId = userOrgs[0].id; const orgId = userOrgs[0].id;
const { token: newJwtToken } = await selectOrganization({ organizationId: orgId }); if (!orgId) throw new Error("You are not part of any organization");
SecurityClient.setToken(newJwtToken);
await selectOrganization({ organizationId: orgId });
localStorage.setItem("orgData.id", orgId); localStorage.setItem("orgData.id", orgId);
frontend/src/views/Login/Login.tsx
-1
View File
@@ -17,7 +17,6 @@ export const Login = () => {
useEffect(() => { useEffect(() => {
// TODO(akhilmhdh): workspace will be controlled by a workspace context // TODO(akhilmhdh): workspace will be controlled by a workspace context
const handleRedirects = async () => { const handleRedirects = async () => {
// TODO(daniel): Move this to select-organization page.
try { try {
const callbackPort = queryParams?.get("callback_port"); 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 // case: a callback port is set, meaning it's a cli login request: redirect to select org with callback port