mirror of
https://github.com/documenso/documenso.git
synced 2025-11-24 05:32:12 +10:00
fix: USE_INTERNAL_URL_BROWSERLESS breaks builds
This commit is contained in:
@ -6,7 +6,7 @@ export const APP_DOCUMENT_UPLOAD_SIZE_LIMIT =
|
|||||||
export const NEXT_PUBLIC_WEBAPP_URL = () =>
|
export const NEXT_PUBLIC_WEBAPP_URL = () =>
|
||||||
env('NEXT_PUBLIC_WEBAPP_URL') ?? 'http://localhost:3000';
|
env('NEXT_PUBLIC_WEBAPP_URL') ?? 'http://localhost:3000';
|
||||||
|
|
||||||
export const NEXT_PRIVATE_INTERNAL_WEBAPP_URL =
|
export const NEXT_PRIVATE_INTERNAL_WEBAPP_URL = () =>
|
||||||
env('NEXT_PRIVATE_INTERNAL_WEBAPP_URL') ?? NEXT_PUBLIC_WEBAPP_URL();
|
env('NEXT_PRIVATE_INTERNAL_WEBAPP_URL') ?? NEXT_PUBLIC_WEBAPP_URL();
|
||||||
|
|
||||||
export const IS_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED') === 'true';
|
export const IS_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED') === 'true';
|
||||||
@ -16,4 +16,5 @@ export const API_V2_URL = '/api/v2';
|
|||||||
|
|
||||||
export const SUPPORT_EMAIL = env('NEXT_PUBLIC_SUPPORT_EMAIL') ?? 'support@documenso.com';
|
export const SUPPORT_EMAIL = env('NEXT_PUBLIC_SUPPORT_EMAIL') ?? 'support@documenso.com';
|
||||||
|
|
||||||
export const USE_INTERNAL_URL_BROWSERLESS = env('NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS') === 'true';
|
export const USE_INTERNAL_URL_BROWSERLESS = () =>
|
||||||
|
env('NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS') === 'true';
|
||||||
|
|||||||
@ -213,7 +213,7 @@ export class LocalJobProvider extends BaseJobProvider {
|
|||||||
}) {
|
}) {
|
||||||
const { jobId, jobDefinitionId, data, isRetry } = options;
|
const { jobId, jobDefinitionId, data, isRetry } = options;
|
||||||
|
|
||||||
const endpoint = `${NEXT_PRIVATE_INTERNAL_WEBAPP_URL}/api/jobs/${jobDefinitionId}/${jobId}`;
|
const endpoint = `${NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/api/jobs/${jobDefinitionId}/${jobId}`;
|
||||||
const signature = sign(data);
|
const signature = sign(data);
|
||||||
|
|
||||||
const headers: Record<string, string> = {
|
const headers: Record<string, string> = {
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
import type { Browser } from 'playwright';
|
import type { Browser } from 'playwright';
|
||||||
|
|
||||||
import { NEXT_PUBLIC_WEBAPP_URL, NEXT_PRIVATE_INTERNAL_WEBAPP_URL, USE_INTERNAL_URL_BROWSERLESS } from '../../constants/app';
|
import {
|
||||||
|
NEXT_PRIVATE_INTERNAL_WEBAPP_URL,
|
||||||
|
NEXT_PUBLIC_WEBAPP_URL,
|
||||||
|
USE_INTERNAL_URL_BROWSERLESS,
|
||||||
|
} from '../../constants/app';
|
||||||
import { type SupportedLanguageCodes, isValidLanguageCode } from '../../constants/i18n';
|
import { type SupportedLanguageCodes, isValidLanguageCode } from '../../constants/i18n';
|
||||||
import { env } from '../../utils/env';
|
import { env } from '../../utils/env';
|
||||||
import { encryptSecondaryData } from '../crypto/encrypt';
|
import { encryptSecondaryData } from '../crypto/encrypt';
|
||||||
@ -48,14 +52,19 @@ export const getAuditLogsPdf = async ({ documentId, language }: GetAuditLogsPdfO
|
|||||||
{
|
{
|
||||||
name: 'language',
|
name: 'language',
|
||||||
value: lang,
|
value: lang,
|
||||||
url: USE_INTERNAL_URL_BROWSERLESS() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PRIVATE_INTERNAL_WEBAPP_URL(),
|
url: USE_INTERNAL_URL_BROWSERLESS()
|
||||||
|
? NEXT_PUBLIC_WEBAPP_URL()
|
||||||
|
: NEXT_PRIVATE_INTERNAL_WEBAPP_URL(),
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await page.goto(`${USE_INTERNAL_URL_BROWSERLESS() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/__htmltopdf/audit-log?d=${encryptedId}`, {
|
await page.goto(
|
||||||
|
`${USE_INTERNAL_URL_BROWSERLESS() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/__htmltopdf/audit-log?d=${encryptedId}`,
|
||||||
|
{
|
||||||
waitUntil: 'networkidle',
|
waitUntil: 'networkidle',
|
||||||
timeout: 10_000,
|
timeout: 10_000,
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
// !: This is a workaround to ensure the page is loaded correctly.
|
// !: This is a workaround to ensure the page is loaded correctly.
|
||||||
// !: It's not clear why but suddenly browserless cdp connections would
|
// !: It's not clear why but suddenly browserless cdp connections would
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
import type { Browser } from 'playwright';
|
import type { Browser } from 'playwright';
|
||||||
|
|
||||||
import { NEXT_PUBLIC_WEBAPP_URL, NEXT_PRIVATE_INTERNAL_WEBAPP_URL, USE_INTERNAL_URL_BROWSERLESS} from '../../constants/app';
|
import {
|
||||||
|
NEXT_PRIVATE_INTERNAL_WEBAPP_URL,
|
||||||
|
NEXT_PUBLIC_WEBAPP_URL,
|
||||||
|
USE_INTERNAL_URL_BROWSERLESS,
|
||||||
|
} from '../../constants/app';
|
||||||
import { type SupportedLanguageCodes, isValidLanguageCode } from '../../constants/i18n';
|
import { type SupportedLanguageCodes, isValidLanguageCode } from '../../constants/i18n';
|
||||||
import { env } from '../../utils/env';
|
import { env } from '../../utils/env';
|
||||||
import { encryptSecondaryData } from '../crypto/encrypt';
|
import { encryptSecondaryData } from '../crypto/encrypt';
|
||||||
@ -48,14 +52,19 @@ export const getCertificatePdf = async ({ documentId, language }: GetCertificate
|
|||||||
{
|
{
|
||||||
name: 'lang',
|
name: 'lang',
|
||||||
value: lang,
|
value: lang,
|
||||||
url: USE_INTERNAL_URL_BROWSERLESS() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PRIVATE_INTERNAL_WEBAPP_URL(),
|
url: USE_INTERNAL_URL_BROWSERLESS()
|
||||||
|
? NEXT_PUBLIC_WEBAPP_URL()
|
||||||
|
: NEXT_PRIVATE_INTERNAL_WEBAPP_URL(),
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await page.goto(`${USE_INTERNAL_URL_BROWSERLESS() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/__htmltopdf/certificate?d=${encryptedId}`, {
|
await page.goto(
|
||||||
|
`${USE_INTERNAL_URL_BROWSERLESS() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/__htmltopdf/certificate?d=${encryptedId}`,
|
||||||
|
{
|
||||||
waitUntil: 'networkidle',
|
waitUntil: 'networkidle',
|
||||||
timeout: 10_000,
|
timeout: 10_000,
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
// !: This is a workaround to ensure the page is loaded correctly.
|
// !: This is a workaround to ensure the page is loaded correctly.
|
||||||
// !: It's not clear why but suddenly browserless cdp connections would
|
// !: It's not clear why but suddenly browserless cdp connections would
|
||||||
|
|||||||
@ -29,7 +29,7 @@ export const triggerWebhook = async ({ event, data, userId, teamId }: TriggerWeb
|
|||||||
const signature = sign(body);
|
const signature = sign(body);
|
||||||
|
|
||||||
await Promise.race([
|
await Promise.race([
|
||||||
fetch(`${NEXT_PRIVATE_INTERNAL_WEBAPP_URL}/api/webhook/trigger`, {
|
fetch(`${NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/api/webhook/trigger`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'content-type': 'application/json',
|
'content-type': 'application/json',
|
||||||
|
|||||||
Reference in New Issue
Block a user