feat: welcomeText (#562)

* feat: welcomeText

* clean default text block

Author: flipvh

backend/emails/components/email-reply-to.tsx

@@ -0,0 +1,30 @@
+import { config } from 'config';
+import i18n from 'i18next';
+import { Link, Text } from 'jsx-email';
+import { AppLogo } from './app-logo';
+
+const link = {
+  color: '#0366d6',
+  fontSize: '.75rem',
+  lineHeight: '1.13rem',
+};
+
+export const EmailReplyTo = ({ email, emailText }: { email?: string; emailText?: string }) => (
+  <>
+    <AppLogo />
+    <Text
+      style={{ marginTop: '1.25rem', gap: '0.25rem', textAlign: 'center' as const, alignItems: 'center', display: 'flex', justifyContent: 'center' }}
+    >
+      {email && (
+        <Link style={link} href={`mailto:${email}`}>
+          {emailText ? emailText : i18n.t('backend:email.inviter_email')}
+        </Link>
+      )}
+      ・
+      <Link style={link} href={`mailto:${config.supportEmail}`}>
+        {i18n.t('backend:email.support_email')}
+      </Link>
+      {!email && '・'}
+    </Text>
+  </>
+);

backend/package.json

@@ -9,6 +9,7 @@
     "quick": "cross-env PGLITE=true tsx scripts/quick.ts && cross-env PGLITE=true pnpm dev",
     "start": "cross-env NODE_ENV=production tsx dist/index.js",
     "dev": "cross-env NODE_ENV=development tsx --watch-path=src src/index.ts",
+    "tunnel": "cross-env NODE_ENV=tunnel tsx --watch-path=src src/index.ts",
     "check": "tsc --pretty",
     "check:beta": "tsgo --pretty",
     "tsperf": "rm -rf dist && tsc --extendedDiagnostics",

backend/src/env.ts

@@ -18,8 +18,8 @@ export const env = createEnv({
       .string()
       .optional()
       .transform((v) => v === 'true'),
-    DATABASE_URL: z.string().url(),
-    NODE_ENV: z.union([z.literal('development'), z.literal('production'), z.literal('test')]),
+    DATABASE_URL: z.url(),
+    NODE_ENV: z.union([z.literal('development'), z.literal('production'), z.literal('staging'), z.literal('tunnel')]),
     PORT: z.string().optional(),
     UNSUBSCRIBE_SECRET: z.string(),
 
@@ -60,6 +60,8 @@ export const env = createEnv({
     S3_ACCESS_KEY_SECRET: z.string().default(''),
 
     TRIGGER_SECRET_KEY: z.string().optional(),
+
+    WEBHOOK_SECRET: z.string().optional(),
   },
   runtimeEnv: process.env,
   emptyStringAsUndefined: true,

backend/src/index.ts

@@ -16,7 +16,7 @@ import { env } from './env';
 
 // import { sdk } from './tracing';
 
-const startTunnel = config.mode === 'development' ? (await import('#/lib/start-tunnel')).default : () => null;
+const startTunnel = config.mode === 'tunnel' ? (await import('#/lib/start-tunnel')).default : () => null;
 
 const isPGliteDatabase = (_db: unknown): _db is PgliteDatabase => !!env.PGLITE;
 

backend/src/modules/auth/handlers.ts

@@ -590,6 +590,12 @@ const authRouteHandlers = app
   .openapi(authRoutes.githubSignInCallback, async (ctx) => {
     const { code, state, error } = ctx.req.valid('query');
 
+    // Handle redirect flow for custom app use (e.g not auth)
+    try {
+      const parsedState = JSON.parse(atob(state));
+      if (parsedState.redirectUrl) return ctx.redirect(`${parsedState.redirectUrl}?code=${code}&state=${state}&error=${error}`, 302);
+    } catch (_) {} // silently ignore (standard OAuth state)
+
     // redirect if there is no code or error in callback
     if (error || !code) throw new ApiError({ status: 400, type: 'oauth_failed', severity: 'warn', redirectToFrontend: true });
 

backend/src/modules/auth/helpers/cookie.ts

@@ -28,7 +28,7 @@ export type CookieName =
 export const setAuthCookie = async (ctx: Context, name: CookieName, content: string, timeSpan: TimeSpan) => {
   const versionedName = `${config.slug}-${name}-${config.cookieVersion}`;
   const options = {
-    secure: isProduction,
+    secure: config.mode !== 'development',
     path: '/',
     domain: isProduction ? config.domain : undefined,
     httpOnly: true,

backend/src/modules/organizations/handlers.ts

@@ -22,6 +22,7 @@ import { defaultHook } from '#/utils/default-hook';
 import { getIsoDate } from '#/utils/iso-date';
 import { getOrderColumn } from '#/utils/order-column';
 import { prepareStringForILikeFilter } from '#/utils/sql';
+import { defaultWelcomeText } from '#json/text-blocks.json';
 
 const app = new OpenAPIHono<Env>({ defaultHook });
 
@@ -51,6 +52,7 @@ const organizationRouteHandlers = app
         shortName: name,
         slug,
         languages: [config.defaultLanguage],
+        welcomeText: defaultWelcomeText,
         defaultLanguage: config.defaultLanguage,
         createdBy: user.id,
       })

backend/tsconfig.json

@@ -19,7 +19,8 @@
     "baseUrl": ".",
 
     "paths": {
-      "#/*": ["./src/*"]
+      "#/*": ["./src/*"],
+      "#json/*": ["../json/*"],
     }
   },
   "include": ["src/**/*", "drizzle.config.ts", "emails", "scripts", "trigger.config.ts", "../config/*"],

cella.config.js

@@ -73,6 +73,7 @@ export const config = {
     'backend/src/permissions/permissions-config.ts',
     'backend/src/lib/docs-config.ts',
     'backend/src/lib/notifications/novu-config.ts',
+    'json/text-blocks.json',
     'locales/en/about.json',
     'locales/en/app.json',
   ],

config/staging.ts

@@ -6,10 +6,10 @@ export default {
   debug: false,
 
   domain: 'cella.dev',
-  frontendUrl: 'https://cella.dev',
-  backendUrl: 'https://api.cella.dev',
-  backendAuthUrl: 'https://api.cella.dev/auth',
-  electricUrl: 'https://electric.cella.dev',
+  frontendUrl: 'https://staging.cella.dev',
+  backendUrl: 'https://api-staging.cella.dev',
+  backendAuthUrl: 'https://api-staging.cella.dev/auth',
+  electricUrl: 'https://electric-staging.cella.dev',
 
   // Hide chat widget in staging
   gleapToken: undefined,