Skip to content

[comp] Production Deploy #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carhartlewis merged 5 commits into from
May 11, 2025
Merged

[comp] Production Deploy #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a99c7bb
feat(trust): add TRUST_PORTAL_PROJECT_ID to environment and update DN…
carhartlewis May 11, 2025
9aa05f7
refactor(trust): remove console logs from DNS record check action
carhartlewis May 11, 2025
366f9e5
fix(trust): update DNS record slug to use TRUST_PORTAL_PROJECT_ID
carhartlewis May 11, 2025
baeaa81
Merge branch 'main' into lewis/comp-trust-center-custom-domains-fix-2
carhartlewis May 11, 2025
e8c6b3f
Merge pull request #573 from trycompai/lewis/comp-trust-center-custom…
carhartlewis May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .../app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/check-dns-record.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,31 +113,31 @@ export const checkDnsRecordAction = authActionClient
};
}

if (!env.VERCEL_PROJECT_ID) {
if (!env.TRUST_PORTAL_PROJECT_ID) {
return {
success: false,
error: "Vercel project ID is not set.",
};
}

const isExistingRecord = await vercel.projects.getProjectDomains({
idOrName: env.VERCEL_PROJECT_ID,
idOrName: env.TRUST_PORTAL_PROJECT_ID,
teamId: env.VERCEL_TEAM_ID,
});

if (isExistingRecord.domains.some((record) => record.name === domain)) {
await vercel.projects.removeProjectDomain({
idOrName: env.VERCEL_PROJECT_ID,
idOrName: env.TRUST_PORTAL_PROJECT_ID,
teamId: env.VERCEL_TEAM_ID,
domain,
});
}

const addDomainToProject = await vercel.projects
.addProjectDomain({
idOrName: env.VERCEL_PROJECT_ID,
idOrName: env.TRUST_PORTAL_PROJECT_ID,
teamId: env.VERCEL_TEAM_ID,
slug: env.VERCEL_PROJECT_ID,
slug: env.TRUST_PORTAL_PROJECT_ID,
requestBody: {
name: domain,
},
Expand Down
2 changes: 1 addition & 1 deletion ...[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export function TrustPortalDomain({
<td>
<div className="flex items-center justify-between gap-2">
<span className="min-w-0 break-words">
compai-domain-verification={orgId}
@
</span>
<Button
variant="ghost"
Expand Down
2 changes: 2 additions & 0 deletions apps/app/src/env.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const env = createEnv({
VERCEL_ACCESS_TOKEN: z.string().optional(),
VERCEL_TEAM_ID: z.string().optional(),
VERCEL_PROJECT_ID: z.string().optional(),
TRUST_PORTAL_PROJECT_ID: z.string().optional(),
NODE_ENV: z.string().optional(),
AWS_ACCESS_KEY_ID: z.string().optional(),
AWS_SECRET_ACCESS_KEY: z.string().optional(),
Expand Down Expand Up @@ -65,6 +66,7 @@ export const env = createEnv({
VERCEL_ACCESS_TOKEN: process.env.VERCEL_ACCESS_TOKEN,
VERCEL_TEAM_ID: process.env.VERCEL_TEAM_ID,
VERCEL_PROJECT_ID: process.env.VERCEL_PROJECT_ID,
TRUST_PORTAL_PROJECT_ID: process.env.TRUST_PORTAL_PROJECT_ID,
NEXT_PUBLIC_VERCEL_URL: process.env.NEXT_PUBLIC_VERCEL_URL,
NEXT_PUBLIC_NOVU_IDENTIFIER: process.env.NEXT_PUBLIC_NOVU_IDENTIFIER,
NODE_ENV: process.env.NODE_ENV,
Expand Down
Loading