mirror of
https://github.com/fosrl/pangolin.git
synced 2026-08-04 19:51:29 +02:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7178202ae8 |
@@ -77,7 +77,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
@@ -149,7 +149,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
@@ -204,7 +204,7 @@ jobs:
|
|||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
@@ -407,7 +407,7 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry (for cosign)
|
- name: Login to GitHub Container Registry (for cosign)
|
||||||
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
|
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
stale:
|
stale:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
|
- uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
|
||||||
with:
|
with:
|
||||||
days-before-stale: 14
|
days-before-stale: 14
|
||||||
days-before-close: 14
|
days-before-close: 14
|
||||||
|
|||||||
@@ -258,24 +258,7 @@ export const configSchema = z
|
|||||||
pp_transport_prefix: z
|
pp_transport_prefix: z
|
||||||
.string()
|
.string()
|
||||||
.optional()
|
.optional()
|
||||||
.default("pp-transport-v"),
|
.default("pp-transport-v")
|
||||||
rate_limit: z
|
|
||||||
.object({
|
|
||||||
average: z
|
|
||||||
.number()
|
|
||||||
.positive()
|
|
||||||
.gt(0)
|
|
||||||
.optional()
|
|
||||||
.default(30),
|
|
||||||
burst: z
|
|
||||||
.number()
|
|
||||||
.positive()
|
|
||||||
.gt(0)
|
|
||||||
.optional()
|
|
||||||
.default(50)
|
|
||||||
})
|
|
||||||
.optional()
|
|
||||||
.prefault({})
|
|
||||||
})
|
})
|
||||||
.optional()
|
.optional()
|
||||||
.prefault({}),
|
.prefault({}),
|
||||||
|
|||||||
@@ -58,8 +58,6 @@ import { build } from "@server/build";
|
|||||||
const redirectHttpsMiddlewareName = "redirect-to-https";
|
const redirectHttpsMiddlewareName = "redirect-to-https";
|
||||||
const redirectToRootMiddlewareName = "redirect-to-root";
|
const redirectToRootMiddlewareName = "redirect-to-root";
|
||||||
const badgerMiddlewareName = "badger";
|
const badgerMiddlewareName = "badger";
|
||||||
const landingRateLimitMiddlewareName = "landing-ratelimit";
|
|
||||||
const bgRateLimitMiddlewareName = "bg-ratelimit";
|
|
||||||
|
|
||||||
// Define extended target type with site information
|
// Define extended target type with site information
|
||||||
type TargetWithSite = Target & {
|
type TargetWithSite = Target & {
|
||||||
@@ -420,8 +418,6 @@ export async function getTraefikConfig(
|
|||||||
// logger.debug(`Valid certs for domains: ${JSON.stringify(validCerts)}`);
|
// logger.debug(`Valid certs for domains: ${JSON.stringify(validCerts)}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const traefikRateLimit = config.getRawConfig().traefik.rate_limit;
|
|
||||||
|
|
||||||
const config_output: any = {
|
const config_output: any = {
|
||||||
http: {
|
http: {
|
||||||
middlewares: {
|
middlewares: {
|
||||||
@@ -436,18 +432,6 @@ export async function getTraefikConfig(
|
|||||||
replacement: "${1}://${2}/auth/org",
|
replacement: "${1}://${2}/auth/org",
|
||||||
permanent: false
|
permanent: false
|
||||||
}
|
}
|
||||||
},
|
|
||||||
[landingRateLimitMiddlewareName]: {
|
|
||||||
rateLimit: {
|
|
||||||
average: traefikRateLimit.average,
|
|
||||||
burst: traefikRateLimit.burst
|
|
||||||
}
|
|
||||||
},
|
|
||||||
[bgRateLimitMiddlewareName]: {
|
|
||||||
rateLimit: {
|
|
||||||
average: traefikRateLimit.average,
|
|
||||||
burst: traefikRateLimit.burst
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1071,7 +1055,6 @@ export async function getTraefikConfig(
|
|||||||
config.getRawConfig().traefik.additional_middlewares || [];
|
config.getRawConfig().traefik.additional_middlewares || [];
|
||||||
const routerMiddlewares = [
|
const routerMiddlewares = [
|
||||||
badgerMiddlewareName,
|
badgerMiddlewareName,
|
||||||
bgRateLimitMiddlewareName,
|
|
||||||
...additionalMiddlewares
|
...additionalMiddlewares
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -1556,7 +1539,6 @@ export async function getTraefikConfig(
|
|||||||
entryPoints: [
|
entryPoints: [
|
||||||
config.getRawConfig().traefik.https_entrypoint
|
config.getRawConfig().traefik.https_entrypoint
|
||||||
],
|
],
|
||||||
middlewares: [landingRateLimitMiddlewareName],
|
|
||||||
service: "landing-service",
|
service: "landing-service",
|
||||||
rule: `Host(\`${fullDomain}\`) && (PathRegexp(\`^/auth/resource/[^/]+$\`) || PathRegexp(\`^/auth/idp/[0-9]+/oidc/callback\`) || PathPrefix(\`/_next\`) || Path(\`/auth/org\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
|
rule: `Host(\`${fullDomain}\`) && (PathRegexp(\`^/auth/resource/[^/]+$\`) || PathRegexp(\`^/auth/idp/[0-9]+/oidc/callback\`) || PathPrefix(\`/_next\`) || Path(\`/auth/org\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
|
||||||
priority: 203,
|
priority: 203,
|
||||||
@@ -1575,10 +1557,7 @@ export async function getTraefikConfig(
|
|||||||
entryPoints: [
|
entryPoints: [
|
||||||
config.getRawConfig().traefik.https_entrypoint
|
config.getRawConfig().traefik.https_entrypoint
|
||||||
],
|
],
|
||||||
middlewares: [
|
middlewares: [redirectToRootMiddlewareName],
|
||||||
landingRateLimitMiddlewareName,
|
|
||||||
redirectToRootMiddlewareName
|
|
||||||
],
|
|
||||||
service: "landing-service",
|
service: "landing-service",
|
||||||
rule: `Host(\`${fullDomain}\`)`,
|
rule: `Host(\`${fullDomain}\`)`,
|
||||||
priority: 202,
|
priority: 202,
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ const getCertificateQuerySchema = z.object({
|
|||||||
|
|
||||||
async function query(orgId: string, domainList: string[]) {
|
async function query(orgId: string, domainList: string[]) {
|
||||||
// Try to get CNAME certificates first
|
// Try to get CNAME certificates first
|
||||||
const existingCertificates = await db
|
let existingCertificates = await db
|
||||||
.select({
|
.select({
|
||||||
certId: certificates.certId,
|
certId: certificates.certId,
|
||||||
domain: certificates.domain,
|
domain: certificates.domain,
|
||||||
@@ -73,19 +73,16 @@ async function query(orgId: string, domainList: string[]) {
|
|||||||
.where(and(inArray(certificates.domain, domainList)));
|
.where(and(inArray(certificates.domain, domainList)));
|
||||||
|
|
||||||
// All non resolved domain certificates might be `ns` or `wildcard`,
|
// All non resolved domain certificates might be `ns` or `wildcard`,
|
||||||
// which means exact domain certificates do not exist
|
// which means exact domain certificates do not
|
||||||
const foundDomains = new Set(
|
const nonAvailableCertificates = existingCertificates
|
||||||
existingCertificates.map((cert) => cert.domain)
|
.filter((cert) => !domainList.includes(cert.domain))
|
||||||
);
|
.map((cert) => cert.domain);
|
||||||
const domainsWithMissingCertificates = domainList.filter(
|
|
||||||
(domain) => !foundDomains.has(domain)
|
|
||||||
);
|
|
||||||
|
|
||||||
if (domainsWithMissingCertificates.length > 0) {
|
if (nonAvailableCertificates.length > 0) {
|
||||||
const domainLevelDownSet = new Set<string>();
|
const domainLevelDownSet = new Set<string>();
|
||||||
const wildcardDomainSet = new Set<string>();
|
const wildcardDomainSet = new Set<string>();
|
||||||
|
|
||||||
for (const domain of domainsWithMissingCertificates) {
|
for (const domain of nonAvailableCertificates) {
|
||||||
const domainLevelDown = domain.split(".").slice(1).join(".");
|
const domainLevelDown = domain.split(".").slice(1).join(".");
|
||||||
const wildcardPrefixed = `*.${domainLevelDown}`;
|
const wildcardPrefixed = `*.${domainLevelDown}`;
|
||||||
domainLevelDownSet.add(domainLevelDown);
|
domainLevelDownSet.add(domainLevelDown);
|
||||||
@@ -134,7 +131,6 @@ async function query(orgId: string, domainList: string[]) {
|
|||||||
for (const domain of domainList) {
|
for (const domain of domainList) {
|
||||||
const domainLevelDown = domain.split(".").slice(1).join(".");
|
const domainLevelDown = domain.split(".").slice(1).join(".");
|
||||||
const wildcardPrefixed = `*.${domainLevelDown}`;
|
const wildcardPrefixed = `*.${domainLevelDown}`;
|
||||||
|
|
||||||
certificateMap[domain] =
|
certificateMap[domain] =
|
||||||
existingCertificates.find(
|
existingCertificates.find(
|
||||||
(cert) =>
|
(cert) =>
|
||||||
|
|||||||
@@ -127,9 +127,6 @@ export async function verifyResourceSession(
|
|||||||
// Extract HTTP Basic Auth credentials if present
|
// Extract HTTP Basic Auth credentials if present
|
||||||
const clientHeaderAuth = extractBasicAuth(headers);
|
const clientHeaderAuth = extractBasicAuth(headers);
|
||||||
|
|
||||||
const clientUserAgent = headers?.["user-agent"] || headers?.["User-Agent"];
|
|
||||||
const clientIsBrowser = isBrowserUserAgent(clientUserAgent);
|
|
||||||
|
|
||||||
const clientIp = requestIp
|
const clientIp = requestIp
|
||||||
? stripPortFromHost(requestIp, badgerVersion)
|
? stripPortFromHost(requestIp, badgerVersion)
|
||||||
: undefined;
|
: undefined;
|
||||||
@@ -316,14 +313,9 @@ export async function verifyResourceSession(
|
|||||||
return allowed(res, undefined, dontStripSession);
|
return allowed(res, undefined, dontStripSession);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only offer a browser redirect to clients that can actually follow one and log in
|
const redirectPath = `/auth/resource/${encodeURIComponent(
|
||||||
// (an interactive browser). Non-browser clients (curl, scripts, bots, etc.) just get
|
resource.resourceGuid
|
||||||
// an unauthorized response from Badger instead of a login redirect URL.
|
)}?redirect=${encodeURIComponent(originalRequestURL)}`;
|
||||||
const redirectPath = clientIsBrowser
|
|
||||||
? `/auth/resource/${encodeURIComponent(
|
|
||||||
resource.resourceGuid
|
|
||||||
)}?redirect=${encodeURIComponent(originalRequestURL)}`
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
// check for access token in headers
|
// check for access token in headers
|
||||||
if (
|
if (
|
||||||
@@ -1484,46 +1476,6 @@ async function getCountryCodeFromIp(ip: string): Promise<string | undefined> {
|
|||||||
return cachedCountryCode;
|
return cachedCountryCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Permissive by default: only reject known non-browser clients or a missing
|
|
||||||
// User-Agent (real browsers always send one). This avoids blocking real
|
|
||||||
// browsers whose UA string doesn't match a hardcoded allow-list.
|
|
||||||
const NON_BROWSER_USER_AGENT_PATTERNS = [
|
|
||||||
/curl/,
|
|
||||||
/wget/,
|
|
||||||
/python-requests/,
|
|
||||||
/python-urllib/,
|
|
||||||
/go-http-client/,
|
|
||||||
/okhttp/,
|
|
||||||
/axios/,
|
|
||||||
/node-fetch/,
|
|
||||||
/postmanruntime/,
|
|
||||||
/insomnia/,
|
|
||||||
/libwww-perl/,
|
|
||||||
/java\//,
|
|
||||||
/ruby/,
|
|
||||||
/php/,
|
|
||||||
/bot/,
|
|
||||||
/spider/,
|
|
||||||
/crawler/,
|
|
||||||
/headlesschrome/,
|
|
||||||
/phantomjs/,
|
|
||||||
/httpclient/,
|
|
||||||
/prometheus/,
|
|
||||||
/go-resty/,
|
|
||||||
/apache-httpclient/,
|
|
||||||
/scrapy/
|
|
||||||
];
|
|
||||||
|
|
||||||
function isBrowserUserAgent(userAgent: string | undefined): boolean {
|
|
||||||
if (!userAgent) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ua = userAgent.toLowerCase();
|
|
||||||
|
|
||||||
return !NON_BROWSER_USER_AGENT_PATTERNS.some((pattern) => pattern.test(ua));
|
|
||||||
}
|
|
||||||
|
|
||||||
function extractBasicAuth(
|
function extractBasicAuth(
|
||||||
headers: Record<string, string> | undefined
|
headers: Record<string, string> | undefined
|
||||||
): string | undefined {
|
): string | undefined {
|
||||||
|
|||||||
@@ -67,12 +67,12 @@ const listUserDevicesSchema = z.strictObject({
|
|||||||
}),
|
}),
|
||||||
query: z.string().optional(),
|
query: z.string().optional(),
|
||||||
sort_by: z
|
sort_by: z
|
||||||
.enum(["megabytesIn", "megabytesOut", "firstSeen", "lastSeen"])
|
.enum(["megabytesIn", "megabytesOut"])
|
||||||
.optional()
|
.optional()
|
||||||
.catch(undefined)
|
.catch(undefined)
|
||||||
.openapi({
|
.openapi({
|
||||||
type: "string",
|
type: "string",
|
||||||
enum: ["megabytesIn", "megabytesOut", "firstSeen", "lastSeen"],
|
enum: ["megabytesIn", "megabytesOut"],
|
||||||
description: "Field to sort by"
|
description: "Field to sort by"
|
||||||
}),
|
}),
|
||||||
order: z
|
order: z
|
||||||
@@ -183,9 +183,7 @@ function queryUserDevicesBase() {
|
|||||||
fingerprintArch: currentFingerprint.arch,
|
fingerprintArch: currentFingerprint.arch,
|
||||||
fingerprintSerialNumber: currentFingerprint.serialNumber,
|
fingerprintSerialNumber: currentFingerprint.serialNumber,
|
||||||
fingerprintUsername: currentFingerprint.username,
|
fingerprintUsername: currentFingerprint.username,
|
||||||
fingerprintHostname: currentFingerprint.hostname,
|
fingerprintHostname: currentFingerprint.hostname
|
||||||
firstSeen: currentFingerprint.firstSeen,
|
|
||||||
lastSeen: currentFingerprint.lastSeen
|
|
||||||
})
|
})
|
||||||
.from(clients)
|
.from(clients)
|
||||||
.leftJoin(orgs, eq(clients.orgId, orgs.orgId))
|
.leftJoin(orgs, eq(clients.orgId, orgs.orgId))
|
||||||
@@ -391,23 +389,14 @@ export async function listUserDevices(
|
|||||||
|
|
||||||
const countQuery = db.$count(baseQuery.as("filtered_clients"));
|
const countQuery = db.$count(baseQuery.as("filtered_clients"));
|
||||||
|
|
||||||
const sortColumn =
|
|
||||||
sort_by === "firstSeen"
|
|
||||||
? currentFingerprint.firstSeen
|
|
||||||
: sort_by === "lastSeen"
|
|
||||||
? currentFingerprint.lastSeen
|
|
||||||
: sort_by
|
|
||||||
? clients[sort_by]
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
const listDevicesQuery = baseQuery
|
const listDevicesQuery = baseQuery
|
||||||
.limit(pageSize)
|
.limit(pageSize)
|
||||||
.offset(pageSize * (page - 1))
|
.offset(pageSize * (page - 1))
|
||||||
.orderBy(
|
.orderBy(
|
||||||
sortColumn
|
sort_by
|
||||||
? order === "asc"
|
? order === "asc"
|
||||||
? asc(sortColumn)
|
? asc(clients[sort_by])
|
||||||
: desc(sortColumn)
|
: desc(clients[sort_by])
|
||||||
: asc(clients.clientId)
|
: asc(clients.clientId)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -112,9 +112,7 @@ export async function updateHolePunch(
|
|||||||
destinations: destinations
|
destinations: destinations
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (!(error instanceof Error && error.message === "Exit node not allowed")) {
|
logger.error(error);
|
||||||
logger.error(error);
|
|
||||||
}
|
|
||||||
return next(
|
return next(
|
||||||
createHttpError(
|
createHttpError(
|
||||||
HttpCode.INTERNAL_SERVER_ERROR,
|
HttpCode.INTERNAL_SERVER_ERROR,
|
||||||
|
|||||||
@@ -104,9 +104,7 @@ export default async function ClientsPage(props: ClientsPageProps) {
|
|||||||
archived: Boolean(client.archived),
|
archived: Boolean(client.archived),
|
||||||
blocked: Boolean(client.blocked),
|
blocked: Boolean(client.blocked),
|
||||||
approvalState: client.approvalState,
|
approvalState: client.approvalState,
|
||||||
fingerprint,
|
fingerprint
|
||||||
firstSeen: client.firstSeen ?? null,
|
|
||||||
lastSeen: client.lastSeen ?? null
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -91,7 +91,6 @@ export default async function Page(props: {
|
|||||||
let loginIdps: LoginFormIDP[] = [];
|
let loginIdps: LoginFormIDP[] = [];
|
||||||
let lastUsedIdpForSmartLogin: (LoginFormIDP & { orgId?: string }) | null =
|
let lastUsedIdpForSmartLogin: (LoginFormIDP & { orgId?: string }) | null =
|
||||||
null;
|
null;
|
||||||
|
|
||||||
if (!useSmartLogin) {
|
if (!useSmartLogin) {
|
||||||
// Load IdPs for DashboardLoginForm (OSS or org-only IdP mode)
|
// Load IdPs for DashboardLoginForm (OSS or org-only IdP mode)
|
||||||
if (build === "oss" || env.app.identityProviderMode !== "org") {
|
if (build === "oss" || env.app.identityProviderMode !== "org") {
|
||||||
@@ -118,12 +117,12 @@ export default async function Page(props: {
|
|||||||
`/idp/${persistedData.idpId}`
|
`/idp/${persistedData.idpId}`
|
||||||
);
|
);
|
||||||
|
|
||||||
const res = idpRes.data.data;
|
const idp = idpRes.data.data.idp;
|
||||||
|
|
||||||
lastUsedIdpForSmartLogin = {
|
lastUsedIdpForSmartLogin = {
|
||||||
idpId: res.idp.idpId,
|
idpId: idp.idpId,
|
||||||
name: res.idp.name,
|
name: idp.name,
|
||||||
variant: res.idpOidcConfig?.variant ?? res.idp.type,
|
variant: idp.type,
|
||||||
orgId: persistedData.orgId,
|
orgId: persistedData.orgId,
|
||||||
lastUsed: true
|
lastUsed: true
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,14 +26,12 @@ type IdpLoginButtonsProps = {
|
|||||||
idps: LoginFormIDP[];
|
idps: LoginFormIDP[];
|
||||||
redirect?: string;
|
redirect?: string;
|
||||||
orgId?: string;
|
orgId?: string;
|
||||||
passOrgIdToOidcUrl?: boolean;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function IdpLoginButtons({
|
export default function IdpLoginButtons({
|
||||||
idps,
|
idps,
|
||||||
redirect,
|
redirect,
|
||||||
orgId,
|
orgId
|
||||||
passOrgIdToOidcUrl = true
|
|
||||||
}: IdpLoginButtonsProps) {
|
}: IdpLoginButtonsProps) {
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const t = useTranslations();
|
const t = useTranslations();
|
||||||
@@ -70,13 +68,12 @@ export default function IdpLoginButtons({
|
|||||||
|
|
||||||
let redirectToUrl: string | undefined;
|
let redirectToUrl: string | undefined;
|
||||||
try {
|
try {
|
||||||
const oidcOrgId = passOrgIdToOidcUrl ? orgId : undefined;
|
console.log("generating", idpId, redirect || "/", orgId);
|
||||||
console.log("generating", idpId, redirect || "/", oidcOrgId);
|
|
||||||
const safeRedirect = cleanRedirect(redirect || "/");
|
const safeRedirect = cleanRedirect(redirect || "/");
|
||||||
const response = await generateOidcUrlProxy(
|
const response = await generateOidcUrlProxy(
|
||||||
idpId,
|
idpId,
|
||||||
safeRedirect,
|
safeRedirect,
|
||||||
oidcOrgId
|
orgId
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.error) {
|
if (response.error) {
|
||||||
@@ -117,52 +114,59 @@ export default function IdpLoginButtons({
|
|||||||
|
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
{params.get("gotoapp") ? (
|
{params.get("gotoapp") ? (
|
||||||
<Button
|
<>
|
||||||
type="button"
|
<Button
|
||||||
className="w-full"
|
type="button"
|
||||||
onClick={() => {
|
className="w-full"
|
||||||
goToApp();
|
onClick={() => {
|
||||||
}}
|
goToApp();
|
||||||
>
|
}}
|
||||||
{t("continueToApplication")}
|
>
|
||||||
</Button>
|
{t("continueToApplication")}
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
) : (
|
) : (
|
||||||
idps.map((idp) => {
|
<>
|
||||||
const effectiveType =
|
{idps.map((idp) => {
|
||||||
idp.variant || idp.name.toLowerCase();
|
const effectiveType =
|
||||||
|
idp.variant || idp.name.toLowerCase();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full relative" key={idp.idpId}>
|
<div
|
||||||
<Button
|
className="w-full relative"
|
||||||
key={idp.idpId}
|
key={idp.idpId}
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
className="w-full inline-flex items-center space-x-2 after:absolute after:inset-0 after:z-10"
|
|
||||||
onClick={() => {
|
|
||||||
startTransition(() =>
|
|
||||||
loginWithIdp(idp.idpId)
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
disabled={loading}
|
|
||||||
loading={loading}
|
|
||||||
>
|
>
|
||||||
<IdpTypeIcon
|
<Button
|
||||||
type={effectiveType}
|
key={idp.idpId}
|
||||||
size={16}
|
type="button"
|
||||||
/>
|
variant="outline"
|
||||||
<span>{idp.name}</span>
|
className="w-full inline-flex items-center space-x-2 after:absolute after:inset-0 after:z-10"
|
||||||
</Button>
|
onClick={() => {
|
||||||
|
startTransition(() =>
|
||||||
|
loginWithIdp(idp.idpId)
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
disabled={loading}
|
||||||
|
loading={loading}
|
||||||
|
>
|
||||||
|
<IdpTypeIcon
|
||||||
|
type={effectiveType}
|
||||||
|
size={16}
|
||||||
|
/>
|
||||||
|
<span>{idp.name}</span>
|
||||||
|
</Button>
|
||||||
|
|
||||||
{idp.lastUsed && (
|
{idp.lastUsed && (
|
||||||
<div className="absolute inset-0">
|
<div className="absolute inset-0">
|
||||||
<span className="absolute top-0 right-0 text-xs bg-primary text-primary-foreground rounded-bl-sm rounded-tr-sm px-2 py-0.5">
|
<span className="absolute top-0 right-0 text-xs bg-primary text-primary-foreground rounded-bl-sm rounded-tr-sm px-2 py-0.5">
|
||||||
{t("idpLastUsed")}
|
{t("idpLastUsed")}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})
|
})}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ export default function IdpTypeIcon({
|
|||||||
}: Props) {
|
}: Props) {
|
||||||
const effectiveType = (variant || type || "").toLowerCase();
|
const effectiveType = (variant || type || "").toLowerCase();
|
||||||
|
|
||||||
console.log(`[IdpTypeIcon]`, { effectiveType, variant, type });
|
|
||||||
|
|
||||||
let src: string | null = null;
|
let src: string | null = null;
|
||||||
let defaultAlt = "";
|
let defaultAlt = "";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,17 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
|
import { ColumnDef } from "@tanstack/react-table";
|
||||||
|
import { ExtendedColumnDef } from "@app/components/ui/data-table";
|
||||||
|
import { IdpDataTable } from "@app/components/OrgIdpDataTable";
|
||||||
|
import { Button } from "@app/components/ui/button";
|
||||||
|
import {
|
||||||
|
Command,
|
||||||
|
CommandEmpty,
|
||||||
|
CommandGroup,
|
||||||
|
CommandInput,
|
||||||
|
CommandItem,
|
||||||
|
CommandList
|
||||||
|
} from "@app/components/ui/command";
|
||||||
import {
|
import {
|
||||||
Credenza,
|
Credenza,
|
||||||
CredenzaBody,
|
CredenzaBody,
|
||||||
@@ -11,42 +22,37 @@ import {
|
|||||||
CredenzaHeader,
|
CredenzaHeader,
|
||||||
CredenzaTitle
|
CredenzaTitle
|
||||||
} from "@app/components/Credenza";
|
} from "@app/components/Credenza";
|
||||||
import { isIdpGlobalModeBannerVisible } from "@app/components/IdpGlobalModeBanner";
|
|
||||||
import IdpTypeBadge from "@app/components/IdpTypeBadge";
|
|
||||||
import IdpTypeIcon from "@app/components/IdpTypeIcon";
|
|
||||||
import { IdpDataTable } from "@app/components/OrgIdpDataTable";
|
|
||||||
import { Badge } from "@app/components/ui/badge";
|
|
||||||
import { Button } from "@app/components/ui/button";
|
|
||||||
import {
|
import {
|
||||||
Command,
|
ArrowRight,
|
||||||
CommandEmpty,
|
ArrowUpDown,
|
||||||
CommandGroup,
|
MoreHorizontal
|
||||||
CommandInput,
|
} from "lucide-react";
|
||||||
CommandItem,
|
import { useMemo, useState } from "react";
|
||||||
CommandList
|
import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
|
||||||
} from "@app/components/ui/command";
|
import { toast } from "@app/hooks/useToast";
|
||||||
import { ExtendedColumnDef } from "@app/components/ui/data-table";
|
import { formatAxiosError } from "@app/lib/api";
|
||||||
|
import { createApiClient } from "@app/lib/api";
|
||||||
|
import { useEnvContext } from "@app/hooks/useEnvContext";
|
||||||
|
import { useUserContext } from "@app/hooks/useUserContext";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
import {
|
import {
|
||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
DropdownMenuContent,
|
DropdownMenuContent,
|
||||||
DropdownMenuItem,
|
DropdownMenuItem,
|
||||||
DropdownMenuTrigger
|
DropdownMenuTrigger
|
||||||
} from "@app/components/ui/dropdown-menu";
|
} from "@app/components/ui/dropdown-menu";
|
||||||
import { useEnvContext } from "@app/hooks/useEnvContext";
|
|
||||||
import { usePaidStatus } from "@app/hooks/usePaidStatus";
|
|
||||||
import { toast } from "@app/hooks/useToast";
|
|
||||||
import { useUserContext } from "@app/hooks/useUserContext";
|
|
||||||
import { createApiClient, formatAxiosError } from "@app/lib/api";
|
|
||||||
import { cn } from "@app/lib/cn";
|
|
||||||
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
|
||||||
import type { ListUserAdminOrgIdpsResponse } from "@server/routers/orgIdp/types";
|
|
||||||
import { useQuery } from "@tanstack/react-query";
|
|
||||||
import { ArrowRight, ArrowUpDown, MoreHorizontal } from "lucide-react";
|
|
||||||
import { useTranslations } from "next-intl";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { useRouter } from "next/navigation";
|
import { useTranslations } from "next-intl";
|
||||||
import { useMemo, useState } from "react";
|
import IdpTypeBadge from "@app/components/IdpTypeBadge";
|
||||||
|
import IdpTypeIcon from "@app/components/IdpTypeIcon";
|
||||||
|
import { useQuery } from "@tanstack/react-query";
|
||||||
import { useDebounce } from "use-debounce";
|
import { useDebounce } from "use-debounce";
|
||||||
|
import type { ListUserAdminOrgIdpsResponse } from "@server/routers/orgIdp/types";
|
||||||
|
import { cn } from "@app/lib/cn";
|
||||||
|
import { Badge } from "@app/components/ui/badge";
|
||||||
|
import { usePaidStatus } from "@app/hooks/usePaidStatus";
|
||||||
|
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
||||||
|
import { isIdpGlobalModeBannerVisible } from "@app/components/IdpGlobalModeBanner";
|
||||||
|
|
||||||
export type IdpRow = {
|
export type IdpRow = {
|
||||||
idpId: number;
|
idpId: number;
|
||||||
@@ -477,17 +483,15 @@ export default function IdpTable({ idps, orgId }: Props) {
|
|||||||
{group.name}
|
{group.name}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 flex flex-wrap gap-1">
|
<div className="mt-1 flex flex-wrap gap-1">
|
||||||
{group.sources.map(
|
{group.sources.map((src) => (
|
||||||
(src) => (
|
<Badge
|
||||||
<Badge
|
key={src.orgId}
|
||||||
key={src.orgId}
|
variant="secondary"
|
||||||
variant="secondary"
|
className="max-w-full truncate font-normal"
|
||||||
className="max-w-full truncate font-normal"
|
>
|
||||||
>
|
{src.orgName}
|
||||||
{src.orgName}
|
</Badge>
|
||||||
</Badge>
|
))}
|
||||||
)
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</CommandItem>
|
</CommandItem>
|
||||||
|
|||||||
@@ -303,7 +303,6 @@ export default function SmartLoginForm({
|
|||||||
<IdpLoginButtons
|
<IdpLoginButtons
|
||||||
idps={[lastUsedIdp]}
|
idps={[lastUsedIdp]}
|
||||||
orgId={lastUsedIdp.orgId}
|
orgId={lastUsedIdp.orgId}
|
||||||
passOrgIdToOidcUrl={false}
|
|
||||||
redirect={redirect}
|
redirect={redirect}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -134,9 +134,7 @@ export default function UptimeBar({
|
|||||||
|
|
||||||
if (!data) return null;
|
if (!data) return null;
|
||||||
|
|
||||||
const allNoData = data.days.every(
|
const allNoData = data.days.every((d) => d.status === "no_data");
|
||||||
(d) => d.status === "no_data" || d.status === "unknown"
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={cn("space-y-3", className)}>
|
<div className={cn("space-y-3", className)}>
|
||||||
|
|||||||
@@ -124,9 +124,7 @@ export function UptimeMiniBar({
|
|||||||
|
|
||||||
if (!data) return null;
|
if (!data) return null;
|
||||||
|
|
||||||
const allNoData = data.days.every(
|
const allNoData = data.days.every((d) => d.status === "no_data");
|
||||||
(d) => d.status === "no_data" || d.status === "unknown"
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
|
|||||||
@@ -77,8 +77,6 @@ export type ClientRow = {
|
|||||||
username: string | null;
|
username: string | null;
|
||||||
hostname: string | null;
|
hostname: string | null;
|
||||||
} | null;
|
} | null;
|
||||||
firstSeen: number | null;
|
|
||||||
lastSeen: number | null;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
type ClientTableProps = {
|
type ClientTableProps = {
|
||||||
@@ -114,9 +112,7 @@ export default function UserDevicesTable({
|
|||||||
|
|
||||||
const defaultUserColumnVisibility = {
|
const defaultUserColumnVisibility = {
|
||||||
subnet: false,
|
subnet: false,
|
||||||
niceId: false,
|
niceId: false
|
||||||
firstSeen: false,
|
|
||||||
lastSeen: false
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const refreshData = () => {
|
const refreshData = () => {
|
||||||
@@ -625,68 +621,6 @@ export default function UserDevicesTable({
|
|||||||
accessorKey: "subnet",
|
accessorKey: "subnet",
|
||||||
friendlyName: t("address"),
|
friendlyName: t("address"),
|
||||||
header: () => <span className="px-3">{t("address")}</span>
|
header: () => <span className="px-3">{t("address")}</span>
|
||||||
},
|
|
||||||
{
|
|
||||||
accessorKey: "firstSeen",
|
|
||||||
friendlyName: t("firstSeen"),
|
|
||||||
header: () => {
|
|
||||||
const firstSeenOrder = getSortDirection(
|
|
||||||
"firstSeen",
|
|
||||||
searchParams
|
|
||||||
);
|
|
||||||
|
|
||||||
const Icon =
|
|
||||||
firstSeenOrder === "asc"
|
|
||||||
? ArrowDown01Icon
|
|
||||||
: firstSeenOrder === "desc"
|
|
||||||
? ArrowUp10Icon
|
|
||||||
: ChevronsUpDownIcon;
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
variant="ghost"
|
|
||||||
onClick={() => toggleSort("firstSeen")}
|
|
||||||
>
|
|
||||||
{t("firstSeen")}
|
|
||||||
<Icon className="ml-2 h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
cell: ({ row }) => {
|
|
||||||
const firstSeen = row.original.firstSeen;
|
|
||||||
if (!firstSeen) return "-";
|
|
||||||
return new Date(firstSeen * 1000).toLocaleString();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
accessorKey: "lastSeen",
|
|
||||||
friendlyName: t("lastSeen"),
|
|
||||||
header: () => {
|
|
||||||
const lastSeenOrder = getSortDirection(
|
|
||||||
"lastSeen",
|
|
||||||
searchParams
|
|
||||||
);
|
|
||||||
|
|
||||||
const Icon =
|
|
||||||
lastSeenOrder === "asc"
|
|
||||||
? ArrowDown01Icon
|
|
||||||
: lastSeenOrder === "desc"
|
|
||||||
? ArrowUp10Icon
|
|
||||||
: ChevronsUpDownIcon;
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
variant="ghost"
|
|
||||||
onClick={() => toggleSort("lastSeen")}
|
|
||||||
>
|
|
||||||
{t("lastSeen")}
|
|
||||||
<Icon className="ml-2 h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
cell: ({ row }) => {
|
|
||||||
const lastSeen = row.original.lastSeen;
|
|
||||||
if (!lastSeen) return "-";
|
|
||||||
return new Date(lastSeen * 1000).toLocaleString();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -111,8 +111,7 @@ export function useCertificate({
|
|||||||
let certError: string | null = null;
|
let certError: string | null = null;
|
||||||
if (restartCert.isError) {
|
if (restartCert.isError) {
|
||||||
certError = "Failed to restart";
|
certError = "Failed to restart";
|
||||||
} else if (isError || initialCertValue === null) {
|
} else if (isError) {
|
||||||
// Null value means failed to get the certificate
|
|
||||||
certError = "Failed";
|
certError = "Failed";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+29
-27
@@ -1,10 +1,4 @@
|
|||||||
import type { LauncherQueryFilters } from "@app/lib/launcherSearchParams";
|
|
||||||
import { buildLauncherSearchParams } from "@app/lib/launcherSearchParams";
|
|
||||||
import { build } from "@server/build";
|
import { build } from "@server/build";
|
||||||
import {
|
|
||||||
StatusHistoryResponse,
|
|
||||||
type BatchedStatusHistoryResponse
|
|
||||||
} from "@server/lib/statusHistory";
|
|
||||||
import type { ListAlertRulesResponse } from "@server/routers/alertRule/types";
|
import type { ListAlertRulesResponse } from "@server/routers/alertRule/types";
|
||||||
import type { QueryRequestAnalyticsResponse } from "@server/routers/auditLogs";
|
import type { QueryRequestAnalyticsResponse } from "@server/routers/auditLogs";
|
||||||
import type {
|
import type {
|
||||||
@@ -13,7 +7,6 @@ import type {
|
|||||||
QueryConnectionAuditLogResponse,
|
QueryConnectionAuditLogResponse,
|
||||||
QueryRequestAuditLogResponse
|
QueryRequestAuditLogResponse
|
||||||
} from "@server/routers/auditLogs/types";
|
} from "@server/routers/auditLogs/types";
|
||||||
import type { GetCertificateResponse } from "@server/routers/certificates/types";
|
|
||||||
import type {
|
import type {
|
||||||
ListClientsResponse,
|
ListClientsResponse,
|
||||||
ListUserDevicesResponse
|
ListUserDevicesResponse
|
||||||
@@ -23,30 +16,15 @@ import type {
|
|||||||
ListDomainsResponse
|
ListDomainsResponse
|
||||||
} from "@server/routers/domain";
|
} from "@server/routers/domain";
|
||||||
import type { GetDomainResponse } from "@server/routers/domain/getDomain";
|
import type { GetDomainResponse } from "@server/routers/domain/getDomain";
|
||||||
import { ListHealthChecksResponse } from "@server/routers/healthChecks/types";
|
|
||||||
import type { ListOrgLabelsResponse } from "@server/routers/labels/types";
|
|
||||||
import type {
|
import type {
|
||||||
LauncherResource,
|
|
||||||
ListLauncherGroupsResponse,
|
|
||||||
ListLauncherLabelsResponse,
|
|
||||||
ListLauncherResourcesResponse,
|
|
||||||
ListLauncherScaleResponse,
|
|
||||||
ListLauncherSitesResponse,
|
|
||||||
ListLauncherViewsResponse
|
|
||||||
} from "@server/routers/launcher/types";
|
|
||||||
import type { GetResourcePolicyResponse } from "@server/routers/policy";
|
|
||||||
import type {
|
|
||||||
GetResourcePoliciesResponse,
|
|
||||||
GetResourceWhitelistResponse,
|
GetResourceWhitelistResponse,
|
||||||
|
GetResourcePoliciesResponse,
|
||||||
ListResourceNamesResponse,
|
ListResourceNamesResponse,
|
||||||
|
ListResourcesResponse,
|
||||||
ListResourceRolesResponse,
|
ListResourceRolesResponse,
|
||||||
ListResourceRulesResponse,
|
ListResourceRulesResponse,
|
||||||
ListResourcesResponse,
|
|
||||||
ListResourceUsersResponse
|
ListResourceUsersResponse
|
||||||
} from "@server/routers/resource";
|
} from "@server/routers/resource";
|
||||||
import type { GetResourceResponse } from "@server/routers/resource/getResource";
|
|
||||||
import type { GetResourceAuthInfoResponse } from "@server/routers/resource/getResourceAuthInfo";
|
|
||||||
import type { ListResourcePoliciesResponse } from "@server/routers/resource/types";
|
|
||||||
import type { ListRolesResponse } from "@server/routers/role";
|
import type { ListRolesResponse } from "@server/routers/role";
|
||||||
import type { ListSitesResponse } from "@server/routers/site";
|
import type { ListSitesResponse } from "@server/routers/site";
|
||||||
import type {
|
import type {
|
||||||
@@ -55,7 +33,6 @@ import type {
|
|||||||
ListSiteResourceRolesResponse,
|
ListSiteResourceRolesResponse,
|
||||||
ListSiteResourceUsersResponse
|
ListSiteResourceUsersResponse
|
||||||
} from "@server/routers/siteResource";
|
} from "@server/routers/siteResource";
|
||||||
import type { GetSiteResourceResponse } from "@server/routers/siteResource/getSiteResource";
|
|
||||||
import type { ListTargetsResponse } from "@server/routers/target";
|
import type { ListTargetsResponse } from "@server/routers/target";
|
||||||
import type { ListUsersResponse } from "@server/routers/user";
|
import type { ListUsersResponse } from "@server/routers/user";
|
||||||
import type ResponseT from "@server/types/Response";
|
import type ResponseT from "@server/types/Response";
|
||||||
@@ -65,12 +42,37 @@ import {
|
|||||||
queryOptions
|
queryOptions
|
||||||
} from "@tanstack/react-query";
|
} from "@tanstack/react-query";
|
||||||
import { isAxiosError, type AxiosResponse } from "axios";
|
import { isAxiosError, type AxiosResponse } from "axios";
|
||||||
import z from "zod";
|
import z, { meta } from "zod";
|
||||||
import { remote } from "./api";
|
import { remote } from "./api";
|
||||||
import { durationToMs } from "./durationToMs";
|
import { durationToMs } from "./durationToMs";
|
||||||
|
import type { ListOrgLabelsResponse } from "@server/routers/labels/types";
|
||||||
|
import { ListHealthChecksResponse } from "@server/routers/healthChecks/types";
|
||||||
|
import {
|
||||||
|
StatusHistoryResponse,
|
||||||
|
type BatchedStatusHistoryResponse
|
||||||
|
} from "@server/lib/statusHistory";
|
||||||
|
import type { ListResourcePoliciesResponse } from "@server/routers/resource/types";
|
||||||
|
import type { GetResourcePolicyResponse } from "@server/routers/policy";
|
||||||
|
import type {
|
||||||
|
ListLauncherGroupsResponse,
|
||||||
|
ListLauncherLabelsResponse,
|
||||||
|
ListLauncherResourcesResponse,
|
||||||
|
ListLauncherScaleResponse,
|
||||||
|
ListLauncherSitesResponse,
|
||||||
|
ListLauncherViewsResponse,
|
||||||
|
LauncherListQuery,
|
||||||
|
LauncherResource,
|
||||||
|
LauncherViewConfig
|
||||||
|
} from "@server/routers/launcher/types";
|
||||||
|
import type { GetResourceResponse } from "@server/routers/resource/getResource";
|
||||||
|
import type { GetResourceAuthInfoResponse } from "@server/routers/resource/getResourceAuthInfo";
|
||||||
|
import type { GetSiteResourceResponse } from "@server/routers/siteResource/getSiteResource";
|
||||||
|
import type { LauncherQueryFilters } from "@app/lib/launcherSearchParams";
|
||||||
|
import { buildLauncherSearchParams } from "@app/lib/launcherSearchParams";
|
||||||
|
import type { GetCertificateResponse } from "@server/routers/certificates/types";
|
||||||
|
|
||||||
export { buildLauncherSearchParams } from "@app/lib/launcherSearchParams";
|
|
||||||
export type { LauncherQueryFilters } from "@app/lib/launcherSearchParams";
|
export type { LauncherQueryFilters } from "@app/lib/launcherSearchParams";
|
||||||
|
export { buildLauncherSearchParams } from "@app/lib/launcherSearchParams";
|
||||||
|
|
||||||
export type ProductUpdate = {
|
export type ProductUpdate = {
|
||||||
link: string | null;
|
link: string | null;
|
||||||
|
|||||||
Reference in New Issue
Block a user