mirror of
https://github.com/fosrl/pangolin.git
synced 2026-03-02 16:56:39 +00:00
Compare commits
3 Commits
1.15.0-s.0
...
1.15.0-s.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bfbeace2e2 | ||
|
|
efcf46ce8a | ||
|
|
2085715965 |
@@ -19,7 +19,7 @@ import { fromError } from "zod-validation-error";
|
|||||||
|
|
||||||
import type { Request, Response, NextFunction } from "express";
|
import type { Request, Response, NextFunction } from "express";
|
||||||
import { build } from "@server/build";
|
import { build } from "@server/build";
|
||||||
import { getOrgTierData } from "@server/lib/billing";
|
import { getOrgTierData } from "#private/lib/billing";
|
||||||
import { TierId } from "@server/lib/billing/tiers";
|
import { TierId } from "@server/lib/billing/tiers";
|
||||||
import {
|
import {
|
||||||
approvals,
|
approvals,
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!policyCheck.policies?.passwordAge?.compliant === false) {
|
if (policyCheck.policies?.passwordAge?.compliant === false) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
`Olm user ${olm.userId} has non-compliant password age for org ${orgId}`
|
`Olm user ${olm.userId} has non-compliant password age for org ${orgId}`
|
||||||
);
|
);
|
||||||
@@ -159,7 +159,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
|
|||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
} else if (
|
} else if (
|
||||||
!policyCheck.policies?.maxSessionLength?.compliant === false
|
policyCheck.policies?.maxSessionLength?.compliant === false
|
||||||
) {
|
) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
`Olm user ${olm.userId} has non-compliant session length for org ${orgId}`
|
`Olm user ${olm.userId} has non-compliant session length for org ${orgId}`
|
||||||
|
|||||||
@@ -19,17 +19,6 @@ export interface ApprovalFeedPageProps {
|
|||||||
export default async function ApprovalFeedPage(props: ApprovalFeedPageProps) {
|
export default async function ApprovalFeedPage(props: ApprovalFeedPageProps) {
|
||||||
const params = await props.params;
|
const params = await props.params;
|
||||||
|
|
||||||
let approvals: ApprovalItem[] = [];
|
|
||||||
const res = await internal
|
|
||||||
.get<
|
|
||||||
AxiosResponse<{ approvals: ApprovalItem[] }>
|
|
||||||
>(`/org/${params.orgId}/approvals`, await authCookieHeader())
|
|
||||||
.catch((e) => {});
|
|
||||||
|
|
||||||
if (res && res.status === 200) {
|
|
||||||
approvals = res.data.data.approvals;
|
|
||||||
}
|
|
||||||
|
|
||||||
let org: GetOrgResponse | null = null;
|
let org: GetOrgResponse | null = null;
|
||||||
const orgRes = await getCachedOrg(params.orgId);
|
const orgRes = await getCachedOrg(params.orgId);
|
||||||
|
|
||||||
|
|||||||
@@ -143,7 +143,6 @@ export default function LoginOrgSelector({
|
|||||||
<IdpLoginButtons
|
<IdpLoginButtons
|
||||||
idps={idps}
|
idps={idps}
|
||||||
redirect={redirect}
|
redirect={redirect}
|
||||||
orgId={org.orgId}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user