mirror of
https://github.com/fosrl/pangolin.git
synced 2026-03-04 01:36:39 +00:00
Fix various bugs
This commit is contained in:
@@ -29,6 +29,9 @@ RUN if [ "$DATABASE" = "pg" ]; then \
|
|||||||
node esbuild.mjs -e server/setup/migrationsSqlite.ts -o dist/migrations.mjs; \
|
node esbuild.mjs -e server/setup/migrationsSqlite.ts -o dist/migrations.mjs; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# test to make sure the build output is there and error if not
|
||||||
|
RUN test -f dist/server.mjs
|
||||||
|
|
||||||
RUN npm run build:cli
|
RUN npm run build:cli
|
||||||
|
|
||||||
FROM node:22-alpine AS runner
|
FROM node:22-alpine AS runner
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import * as orgIdp from "#private/routers/orgIdp";
|
|||||||
import * as billing from "#private/routers/billing";
|
import * as billing from "#private/routers/billing";
|
||||||
import * as license from "#private/routers/license";
|
import * as license from "#private/routers/license";
|
||||||
|
|
||||||
import { Router } from "express";
|
|
||||||
import { verifySessionUserMiddleware } from "@server/middlewares";
|
import { verifySessionUserMiddleware } from "@server/middlewares";
|
||||||
|
|
||||||
import { internalRouter as ir } from "@server/routers/internal";
|
import { internalRouter as ir } from "@server/routers/internal";
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { verifySession } from "@app/lib/auth/verifySession";
|
import { verifySession } from "@app/lib/auth/verifySession";
|
||||||
import UserProvider from "@app/providers/UserProvider";
|
import UserProvider from "@app/providers/UserProvider";
|
||||||
import { cache } from "react";
|
import { cache } from "react";
|
||||||
import OrganizationLandingCard from "../../components/OrganizationLandingCard";
|
|
||||||
import MemberResourcesPortal from "../../components/MemberResourcesPortal";
|
import MemberResourcesPortal from "../../components/MemberResourcesPortal";
|
||||||
import { GetOrgOverviewResponse } from "@server/routers/org/getOrgOverview";
|
import { GetOrgOverviewResponse } from "@server/routers/org/getOrgOverview";
|
||||||
import { internal } from "@app/lib/api";
|
import { internal } from "@app/lib/api";
|
||||||
|
|||||||
@@ -666,7 +666,7 @@ export default function ReverseProxyTargets(props: {
|
|||||||
...target,
|
...target,
|
||||||
...data,
|
...data,
|
||||||
updated: true,
|
updated: true,
|
||||||
siteType: site?.type || null
|
// siteType: site?.type || null
|
||||||
}
|
}
|
||||||
: target
|
: target
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -69,6 +69,9 @@ export default async function OrgAuthPage(props: {
|
|||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
|
|
||||||
if (!loginPage) {
|
if (!loginPage) {
|
||||||
|
console.debug(
|
||||||
|
`No login page found for host ${host}, redirecting to dashboard`
|
||||||
|
);
|
||||||
redirect(env.app.dashboardUrl);
|
redirect(env.app.dashboardUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,6 +93,9 @@ export default async function OrgAuthPage(props: {
|
|||||||
: subscriptionStatus?.tier === TierId.STANDARD;
|
: subscriptionStatus?.tier === TierId.STANDARD;
|
||||||
|
|
||||||
if (build === "saas" && !subscribed) {
|
if (build === "saas" && !subscribed) {
|
||||||
|
console.log(
|
||||||
|
`Org ${loginPage.orgId} is not subscribed, redirecting to dashboard`
|
||||||
|
);
|
||||||
redirect(env.app.dashboardUrl);
|
redirect(env.app.dashboardUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,6 +122,7 @@ export default async function OrgAuthPage(props: {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
console.log(`Host ${host} is the same`);
|
||||||
redirect(env.app.dashboardUrl);
|
redirect(env.app.dashboardUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -113,11 +113,11 @@ export function PathMatchModal({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<CredenzaFooter className="gap-2">
|
<CredenzaFooter className="gap-2">
|
||||||
{value?.path && (
|
{/* {value?.path && (
|
||||||
|
)} */}
|
||||||
<Button variant="outline" onClick={handleClear}>
|
<Button variant="outline" onClick={handleClear}>
|
||||||
{t("clear")}
|
{t("clear")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
|
||||||
<Button onClick={handleSave} disabled={!path.trim()}>
|
<Button onClick={handleSave} disabled={!path.trim()}>
|
||||||
{t("saveChanges")}
|
{t("saveChanges")}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
Reference in New Issue
Block a user