Add deploy buttons and clean environment variables (#974)

* add render.yaml

* Clean environment variables



---------

Co-authored-by: Charles Bochet <charles@twenty.com>

server/.env.example

@@ -1,13 +1,16 @@
-DEBUG_MODE=false
-DEMO_MODE=true
-ACCESS_TOKEN_SECRET=secret_jwt
-ACCESS_TOKEN_EXPIRES_IN=30m
-LOGIN_TOKEN_SECRET=secret_login_token
-LOGIN_TOKEN_EXPIRES_IN=15m
-REFRESH_TOKEN_SECRET=secret_refresh_token
-REFRESH_TOKEN_EXPIRES_IN=90d
 PG_DATABASE_URL=postgres://postgres:postgrespassword@localhost:5432/default?connection_limit=1
-FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify
-STORAGE_TYPE=local
-STORAGE_LOCAL_PATH=.local-storage
+FRONT_BASE_URL=http://localhost:3001
+ACCESS_TOKEN_SECRET=replace_me_with_a_random_string
+LOGIN_TOKEN_SECRET=replace_me_with_a_random_string
+REFRESH_TOKEN_SECRET=replace_me_with_a_random_string
+IS_SIGN_IN_PREFILLED=true
 
+# ———————— Optional ————————
+# DEBUG_MODE=true
+# ACCESS_TOKEN_EXPIRES_IN=30m
+# LOGIN_TOKEN_EXPIRES_IN=15m
+# REFRESH_TOKEN_EXPIRES_IN=90d 
+# FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify 
+# AUTH_GOOGLE_ENABLED=false
+# STORAGE_TYPE=local
+# STORAGE_LOCAL_PATH=.local-storage 

server/.env.test

@@ -1,12 +1,20 @@
 DEBUG_MODE=true
-AUTH_GOOGLE_ENABLED=false
-ACCESS_TOKEN_SECRET=secret_jwt
-ACCESS_TOKEN_EXPIRES_IN=1d
-REFRESH_TOKEN_SECRET=secret_refresh_token
-REFRESH_TOKEN_EXPIRES_IN=30d
-LOGIN_TOKEN_SECRET=secret_login_token
-LOGIN_TOKEN_EXPIRES_IN=15m
-FRONT_AUTH_CALLBACK_URL=http://localhost:3001/auth/callback
 PG_DATABASE_URL=postgres://postgres:postgrespassword@localhost:5432/test?connection_limit=1
-STORAGE_TYPE=local
-STORAGE_LOCAL_PATH=.local-storage
+# the URL of the front-end app
+FRONT_BASE_URL=http://localhost:3001
+# random keys used to generate JWT tokens
+ACCESS_TOKEN_SECRET=secret_jwt 
+LOGIN_TOKEN_SECRET=secret_login_tokens
+REFRESH_TOKEN_SECRET=secret_refresh_token  
+
+
+# ———————— Optional ————————
+# DEBUG_MODE=false
+# IS_SIGN_IN_PREFILLED=false
+# ACCESS_TOKEN_EXPIRES_IN=30m
+# LOGIN_TOKEN_EXPIRES_IN=15m
+# REFRESH_TOKEN_EXPIRES_IN=90d 
+# FRONT_AUTH_CALLBACK_URL=http://localhost:3001/verify 
+# AUTH_GOOGLE_ENABLED=false
+# STORAGE_TYPE=local
+# STORAGE_LOCAL_PATH=.local-storage 

server/scripts/set-env-test.sh

@@ -11,7 +11,14 @@ ENV_PATH="${SCRIPT_DIR}/../.env.test"
 if [ -f "${ENV_PATH}" ]; then
   echo "🔵 - Loading environment variables from "${ENV_PATH}"..."
   # Export env vars
-  export $(grep -v '^#' ${ENV_PATH} | xargs)
+  while IFS= read -r line || [ -n "$line" ]; do
+    if echo "$line" | grep -F = &>/dev/null
+    then
+      varname=$(echo "$line" | cut -d '=' -f 1)
+      varvalue=$(echo "$line" | cut -d '=' -f 2- | cut -d '#' -f 1)
+      export "$varname"="$varvalue"
+    fi
+  done < <(grep -v '^#' "${ENV_PATH}")
 else
   echo "Error: ${ENV_PATH} does not exist."
   exit 1

server/src/ability/handlers/activity-target.ability-handler.ts

@@ -47,9 +47,10 @@ export class UpdateActivityTargetAbilityHandler implements IAbilityHandler {
   async handle(ability: AppAbility, context: ExecutionContext) {
     const gqlContext = GqlExecutionContext.create(context);
     const args = gqlContext.getArgs<ActivityTargetArgs>();
-    const ActivityTarget = await this.prismaService.client.activityTarget.findFirst({
-      where: args.where,
-    });
+    const ActivityTarget =
+      await this.prismaService.client.activityTarget.findFirst({
+        where: args.where,
+      });
     assert(ActivityTarget, '', NotFoundException);
 
     return ability.can(
@@ -66,9 +67,10 @@ export class DeleteActivityTargetAbilityHandler implements IAbilityHandler {
   async handle(ability: AppAbility, context: ExecutionContext) {
     const gqlContext = GqlExecutionContext.create(context);
     const args = gqlContext.getArgs<ActivityTargetArgs>();
-    const ActivityTarget = await this.prismaService.client.activityTarget.findFirst({
-      where: args.where,
-    });
+    const ActivityTarget =
+      await this.prismaService.client.activityTarget.findFirst({
+        where: args.where,
+      });
     assert(ActivityTarget, '', NotFoundException);
 
     return ability.can(

server/src/core/client-config/client-config.entity.ts

@@ -30,7 +30,7 @@ export class ClientConfig {
   telemetry: Telemetry;
 
   @Field(() => Boolean)
-  demoMode: boolean;
+  signInPrefilled: boolean;
 
   @Field(() => Boolean)
   debugMode: boolean;

server/src/core/client-config/client-config.resolver.ts

@@ -12,17 +12,17 @@ export class ClientConfigResolver {
   async clientConfig(): Promise<ClientConfig> {
     const clientConfig: ClientConfig = {
       authProviders: {
-        google: this.environmentService.isAuthGoogleEnabled() ?? false,
+        google: this.environmentService.isAuthGoogleEnabled(),
         magicLink: false,
         password: true,
       },
       telemetry: {
-        enabled: this.environmentService.isTelemetryEnabled() ?? false,
+        enabled: this.environmentService.isTelemetryEnabled(),
         anonymizationEnabled:
-          this.environmentService.isTelemetryAnonymizationEnabled() ?? false,
+          this.environmentService.isTelemetryAnonymizationEnabled(),
       },
-      demoMode: this.environmentService.isDemoMode() ?? false,
-      debugMode: this.environmentService.isDebugMode() ?? false,
+      signInPrefilled: this.environmentService.isSignInPrefilled(),
+      debugMode: this.environmentService.isDebugMode(),
     };
 
     return Promise.resolve(clientConfig);

server/src/integrations/environment/environment.service.ts

@@ -13,15 +13,15 @@ export class EnvironmentService {
     return this.configService.get<boolean>('DEBUG_MODE') ?? false;
   }
 
-  isDemoMode(): boolean {
-    return this.configService.get<boolean>('DEMO_MODE') ?? false;
+  isSignInPrefilled(): boolean {
+    return this.configService.get<boolean>('IS_SIGN_IN_PREFILLED') ?? false;
   }
 
   isTelemetryEnabled(): boolean {
     return this.configService.get<boolean>('TELEMETRY_ENABLED') ?? true;
   }
 
-  isTelemetryAnonymizationEnabled(): boolean | undefined {
+  isTelemetryAnonymizationEnabled(): boolean {
     return (
       this.configService.get<boolean>('TELEMETRY_ANONYMIZATION_ENABLED') ?? true
     );
@@ -31,12 +31,16 @@ export class EnvironmentService {
     return this.configService.get<string>('PG_DATABASE_URL')!;
   }
 
+  getFrontBaseUrl(): string {
+    return this.configService.get<string>('FRONT_BASE_URL')!;
+  }
+
   getAccessTokenSecret(): string {
     return this.configService.get<string>('ACCESS_TOKEN_SECRET')!;
   }
 
   getAccessTokenExpiresIn(): string {
-    return this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN')!;
+    return this.configService.get<string>('ACCESS_TOKEN_EXPIRES_IN') ?? '30m';
   }
 
   getRefreshTokenSecret(): string {
@@ -44,7 +48,7 @@ export class EnvironmentService {
   }
 
   getRefreshTokenExpiresIn(): string {
-    return this.configService.get<string>('REFRESH_TOKEN_EXPIRES_IN')!;
+    return this.configService.get<string>('REFRESH_TOKEN_EXPIRES_IN') ?? '90d';
   }
 
   getLoginTokenSecret(): string {
@@ -52,15 +56,18 @@ export class EnvironmentService {
   }
 
   getLoginTokenExpiresIn(): string {
-    return this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN')!;
+    return this.configService.get<string>('LOGIN_TOKEN_EXPIRES_IN') ?? '15m';
   }
 
   getFrontAuthCallbackUrl(): string {
-    return this.configService.get<string>('FRONT_AUTH_CALLBACK_URL')!;
+    return (
+      this.configService.get<string>('FRONT_AUTH_CALLBACK_URL') ??
+      this.getFrontBaseUrl() + '/auth/callback'
+    );
   }
 
-  isAuthGoogleEnabled(): boolean | undefined {
-    return this.configService.get<boolean>('AUTH_GOOGLE_ENABLED');
+  isAuthGoogleEnabled(): boolean {
+    return this.configService.get<boolean>('AUTH_GOOGLE_ENABLED') ?? false;
   }
 
   getAuthGoogleClientId(): string | undefined {
@@ -75,8 +82,10 @@ export class EnvironmentService {
     return this.configService.get<string>('AUTH_GOOGLE_CALLBACK_URL');
   }
 
-  getStorageType(): StorageType | undefined {
-    return this.configService.get<StorageType>('STORAGE_TYPE');
+  getStorageType(): StorageType {
+    return (
+      this.configService.get<StorageType>('STORAGE_TYPE') ?? StorageType.Local
+    );
   }
 
   getStorageS3Region(): AwsRegion | undefined {
@@ -87,7 +96,9 @@ export class EnvironmentService {
     return this.configService.get<AwsRegion>('STORAGE_S3_NAME');
   }
 
-  getStorageLocalPath(): string | undefined {
-    return this.configService.get<string>('STORAGE_LOCAL_PATH')!;
+  getStorageLocalPath(): string {
+    return (
+      this.configService.get<string>('STORAGE_LOCAL_PATH') ?? '.local-storage'
+    );
   }
 }

server/src/integrations/environment/environment.validation.ts

@@ -27,7 +27,7 @@ export class EnvironmentVariables {
   @CastToBoolean()
   @IsOptional()
   @IsBoolean()
-  DEMO_MODE?: boolean;
+  IS_SIGN_IN_PREFILLED?: boolean;
 
   @CastToBoolean()
   @IsOptional()
@@ -43,24 +43,32 @@ export class EnvironmentVariables {
   @IsUrl({ protocols: ['postgres'], require_tld: false })
   PG_DATABASE_URL: string;
 
+  // Frontend URL
+  @IsUrl({ require_tld: false })
+  FRONT_BASE_URL: string;
+
   // Json Web Token
   @IsString()
   ACCESS_TOKEN_SECRET: string;
   @IsDuration()
+  @IsOptional()
   ACCESS_TOKEN_EXPIRES_IN: string;
 
   @IsString()
   REFRESH_TOKEN_SECRET: string;
   @IsDuration()
+  @IsOptional()
   REFRESH_TOKEN_EXPIRES_IN: string;
 
   @IsString()
   LOGIN_TOKEN_SECRET: string;
   @IsDuration()
+  @IsOptional()
   LOGIN_TOKEN_EXPIRES_IN: string;
 
   // Auth
   @IsUrl({ require_tld: false })
+  @IsOptional()
   FRONT_AUTH_CALLBACK_URL: string;
 
   @CastToBoolean()

server/src/integrations/integrations.module.ts

@@ -19,7 +19,6 @@ const fileStorageModuleFactory = async (
   const type = environmentService.getStorageType();
 
   switch (type) {
-    case undefined:
     case StorageType.Local: {
       const storagePath = environmentService.getStorageLocalPath();