Skip to content

[comp] Production Deploy #1213

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
claudfuen merged 7 commits into from
Aug 1, 2025
Merged

[comp] Production Deploy #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
04579b0
fix: update invitation email domain configuration
claudfuen Aug 1, 2025
1c5db12
Merge pull request #1212 from trycompai/claudio/fix-file-upload
claudfuen Aug 1, 2025
591faca
refactor: update CORS headers for API routes
claudfuen Aug 1, 2025
298e2c3
Merge pull request #1214 from trycompai/claudio/fix-file-upload
claudfuen Aug 1, 2025
d92a745
refactor: enhance logging and update trusted origins in auth configur…
claudfuen Aug 1, 2025
99fffad
feat: add Husky hooks for commit message validation and pre-push checks
claudfuen Aug 1, 2025
72b63cd
Merge pull request #1215 from trycompai/claudio/fix-file-upload
claudfuen Aug 1, 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
0 .husky/commit-msg → .husky/backup/commit-msg
View file
Open in desktop
File renamed without changes.
0 .husky/pre-commit → .husky/backup/pre-commit
View file
Open in desktop
File renamed without changes.
0 .husky/pre-push → .husky/backup/pre-push
View file
Open in desktop
File renamed without changes.
8 changes: 2 additions & 6 deletions apps/app/next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const config: NextConfig = {
async headers() {
return [
{
// Apply CORS headers to all API routes
// Super permissive CORS for all API routes
source: '/api/:path*',
headers: [
{
Expand All @@ -50,13 +50,9 @@ const config: NextConfig = {
key: 'Access-Control-Allow-Headers',
value: 'Content-Type, Authorization, X-Requested-With, Accept, Origin, x-pathname',
},
{
key: 'Access-Control-Allow-Credentials',
value: 'true',
},
{
key: 'Access-Control-Max-Age',
value: '86400', // 24 hours
value: '86400',
},
],
},
Expand Down
2 changes: 2 additions & 0 deletions apps/app/src/utils/auth-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { createAuthClient } from 'better-auth/react';
import { auth } from './auth';
import { ac, allRoles } from './permissions';

console.log('process.env.NEXT_PUBLIC_BETTER_AUTH_URL', process.env.NEXT_PUBLIC_BETTER_AUTH_URL);

export const authClient = createAuthClient({
baseURL: process.env.NEXT_PUBLIC_BETTER_AUTH_URL,
plugins: [
Expand Down
10 changes: 6 additions & 4 deletions apps/app/src/utils/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,19 @@ if (env.AUTH_GITHUB_ID && env.AUTH_GITHUB_SECRET) {
};
}

console.log('process.env.BETTER_AUTH_URL', process.env.BETTER_AUTH_URL);

export const auth = betterAuth({
database: prismaAdapter(db, {
provider: 'postgresql',
}),
baseURL: process.env.BETTER_AUTH_URL,
trustedOrigins: [
'http://localhost:3000',
// 'http://localhost:3000',
'https://app.trycomp.ai',
'https://app.staging.trycomp.ai',
'https://portal.trycomp.ai',
'https://portal.staging.trycomp.ai',
// 'https://app.staging.trycomp.ai',
// 'https://portal.trycomp.ai',
// 'https://portal.staging.trycomp.ai',
],
emailAndPassword: {
enabled: true,
Expand Down
2 changes: 2 additions & 0 deletions apps/portal/src/app/lib/auth-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
import { createAuthClient } from 'better-auth/react';
import { auth } from './auth';

console.log('process.env.NEXT_PUBLIC_BETTER_AUTH_URL', process.env.NEXT_PUBLIC_BETTER_AUTH_URL);

export const authClient = createAuthClient({
baseURL: process.env.NEXT_PUBLIC_BETTER_AUTH_URL,
plugins: [organizationClient(), inferAdditionalFields<typeof auth>(), emailOTPClient()],
Expand Down
15 changes: 10 additions & 5 deletions apps/portal/src/app/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,24 @@ export const auth = betterAuth({
generateId: false,
},
trustedOrigins: [
'http://localhost:3000',
// 'http://localhost:3000',
'https://app.trycomp.ai',
'https://app.staging.trycomp.ai',
'https://portal.trycomp.ai',
'https://portal.staging.trycomp.ai',
// 'https://app.staging.trycomp.ai',
// 'https://portal.trycomp.ai',
// 'https://portal.staging.trycomp.ai',
],
secret: process.env.AUTH_SECRET!,
plugins: [
organization({
async sendInvitationEmail(data) {
console.log(
'process.env.NEXT_PUBLIC_BETTER_AUTH_URL',
process.env.NEXT_PUBLIC_BETTER_AUTH_URL,
);

const isLocalhost = process.env.NODE_ENV === 'development';
const protocol = isLocalhost ? 'http' : 'https';
const domain = isLocalhost ? 'localhost:3000' : 'app.trycomp.ai';
const domain = isLocalhost ? 'localhost:3000' : process.env.NEXT_PUBLIC_BETTER_AUTH_URL!;
const inviteLink = `${protocol}://${domain}/invite/${data.invitation.id}`;

const url = `${protocol}://${domain}/auth`;
Expand Down
Loading