Merge pull request #326 from panoratech/mit-27-add-attion-crm

Mit 27 add attion crm

.env.example

@@ -13,9 +13,8 @@ ENV=dev
 DISTRIBUTION=selfhosted
 OAUTH_REDIRECT_BASE=http://localhost:3000
 SENTRY_DSN=
-STYTCH_PROJECT_ID="Temp_STYTCH_PROJECT_ID"
-STYTCH_SECRET="Temp_STYTCH_PROJECT_SECRET"
-FRONT_END_URL=http://localhost
+
+
 # ================================================
 # Database
 # ================================================
@@ -42,6 +41,9 @@ ZENDESK_SELL_CLIENT_SECRET=
 # Freshsales
 FRESHSALES_CLIENT_ID= 
 FRESHSALES_CLIENT_SECRET=
+# Attio
+ATTIO_CLIENT_ID=
+ATTIO_CLIENT_SECRET=
 # ================================================
 # Ticketing
 # ================================================
@@ -55,7 +57,7 @@ ZENDESK_TICKETING_CLIENT_SECRET=
 # Must be set in the perspective of the end user browser
 
 NEXT_PUBLIC_BACKEND_DOMAIN=http://localhost:3000 # https://api.panora.dev/
-NEXT_PUBLIC_FRONTEND_DOMAIN=http://127.0.0.1:5173
+NEXT_PUBLIC_MAGIC_LINK_DOMAIN=http://localhost:81
 NEXT_PUBLIC_POSTHOG_KEY=<ph_project_api_key>
 NEXT_PUBLIC_POSTHOG_HOST=<ph_instance_address>
 NEXT_PUBLIC_DISTRIBUTION="managed" #managed or self-host

.github/workflows/docker.yml

@@ -18,7 +18,7 @@ jobs:
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
       REDIS_HOST: ${{ secrets.REDIS_HOST }}
       NEXT_PUBLIC_BACKEND_DOMAIN: ${{ secrets.NEXT_PUBLIC_BACKEND_DOMAIN }}
-      NEXT_PUBLIC_FRONTEND_DOMAIN: ${{ secrets.NEXT_PUBLIC_FRONTEND_DOMAIN }}
+      NEXT_PUBLIC_MAGIC_LINK_DOMAIN: ${{ secrets.NEXT_PUBLIC_MAGIC_LINK_DOMAIN }}
       NEXT_PUBLIC_STYTCH_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_STYTCH_PROJECT_ID }}
       NEXT_PUBLIC_STYTCH_SECRET: ${{ secrets.NEXT_PUBLIC_STYTCH_SECRET }}
       NEXT_PUBLIC_STYTCH_PROJECT_ENV: ${{ secrets.NEXT_PUBLIC_STYTCH_PROJECT_ENV }}

.github/workflows/sh-build-push-docker.yml

@@ -37,7 +37,6 @@ jobs:
           tags: panoradotdev/frontend-magic-links:latest
           build-args: |
             VITE_BACKEND_DOMAIN=${{ secrets.VITE_BACKEND_DOMAIN }}
-            VITE_ML_FRONTEND_URL=${{ secrets.VITE_FRONTEND_DOMAIN }}
 
       - name: Build and push Frontend (Dashboard)
         uses: docker/build-push-action@v2
@@ -49,7 +48,7 @@ jobs:
           tags: panoradotdev/frontend-webapp:latest
           build-args: |
             NEXT_PUBLIC_BACKEND_DOMAIN=${{ secrets.NEXT_PUBLIC_BACKEND_DOMAIN }}
-            NEXT_PUBLIC_FRONTEND_DOMAIN=${{ secrets.NEXT_PUBLIC_FRONTEND_DOMAIN }}
+            NEXT_PUBLIC_MAGIC_LINK_DOMAIN=${{ secrets.NEXT_PUBLIC_MAGIC_LINK_DOMAIN }}
             NEXT_PUBLIC_STYTCH_PROJECT_ID=${{ secrets.NEXT_PUBLIC_STYTCH_PROJECT_ID }}
             NEXT_PUBLIC_STYTCH_SECRET=${{ secrets.NEXT_PUBLIC_STYTCH_SECRET }}
             NEXT_PUBLIC_STYTCH_PROJECT_ENV=${{ secrets.NEXT_PUBLIC_STYTCH_PROJECT_ENV }}

apps/client-ts/.env.example

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_BACKEND_DOMAIN=http://localhost:3001 #http://localhost:3000 #https://api-dev.panora.dev/
-NEXT_PUBLIC_FRONTEND_DOMAIN=http://127.0.0.1:5173
+NEXT_PUBLIC_MAGIC_LINK_DOMAIN=http://127.0.0.1:5173
 NEXT_PUBLIC_POSTHOG_KEY=<ph_project_api_key>
 NEXT_PUBLIC_POSTHOG_HOST=<ph_instance_address>
 NEXT_PUBLIC_DISTRIBUTION="managed" #managed or self-host

apps/client-ts/Dockerfile

@@ -36,7 +36,7 @@ ARG NEXT_PUBLIC_STYTCH_PROJECT_ENV
 ARG NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN
 ARG NEXT_PUBLIC_DISTRIBUTION 
 ARG NEXT_PUBLIC_BACKEND_DOMAIN
-ARG NEXT_PUBLIC_FRONTEND_DOMAIN
+ARG NEXT_PUBLIC_MAGIC_LINK_DOMAIN
 
 ENV NEXT_PUBLIC_STYTCH_PROJECT_ID="$NEXT_PUBLIC_STYTCH_PROJECT_ID"
 ENV NEXT_PUBLIC_STYTCH_SECRET="$NEXT_PUBLIC_STYTCH_SECRET"
@@ -45,7 +45,7 @@ ENV NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN="$NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN"
 
 ENV NEXT_PUBLIC_DISTRIBUTION="$NEXT_PUBLIC_DISTRIBUTION"
 ENV NEXT_PUBLIC_BACKEND_DOMAIN="${NEXT_PUBLIC_BACKEND_DOMAIN}"
-ENV NEXT_PUBLIC_FRONTEND_DOMAIN="${NEXT_PUBLIC_FRONTEND_DOMAIN}"
+ENV NEXT_PUBLIC_MAGIC_LINK_DOMAIN="${NEXT_PUBLIC_MAGIC_LINK_DOMAIN}"
 
 RUN corepack enable
 

apps/client-ts/src/components/Connection/ConnectionTable.tsx

@@ -112,7 +112,7 @@ export default function ConnectionTable() {
               </div>
             </div>
             <DialogFooter>
-              <Button variant="outline" type="submit" onClick={() => window.open(`${config.FRONT_DOMAIN}/?uniqueLink=${uniqueLink}`, '_blank')}>
+              <Button variant="outline" type="submit" onClick={() => window.open(`${config.MAGIC_LINK_DOMAIN}/?uniqueLink=${uniqueLink}`, '_blank')}>
                 <p className="mr-2">Open Link</p>
                 <svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M3 2C2.44772 2 2 2.44772 2 3V12C2 12.5523 2.44772 13 3 13H12C12.5523 13 13 12.5523 13 12V8.5C13 8.22386 12.7761 8 12.5 8C12.2239 8 12 8.22386 12 8.5V12H3V3L6.5 3C6.77614 3 7 2.77614 7 2.5C7 2.22386 6.77614 2 6.5 2H3ZM12.8536 2.14645C12.9015 2.19439 12.9377 2.24964 12.9621 2.30861C12.9861 2.36669 12.9996 2.4303 13 2.497L13 2.5V2.50049V5.5C13 5.77614 12.7761 6 12.5 6C12.2239 6 12 5.77614 12 5.5V3.70711L6.85355 8.85355C6.65829 9.04882 6.34171 9.04882 6.14645 8.85355C5.95118 8.65829 5.95118 8.34171 6.14645 8.14645L11.2929 3H9.5C9.22386 3 9 2.77614 9 2.5C9 2.22386 9.22386 2 9.5 2H12.4999H12.5C12.5678 2 12.6324 2.01349 12.6914 2.03794C12.7504 2.06234 12.8056 2.09851 12.8536 2.14645Z" fill="currentColor" fillRule="evenodd" clipRule="evenodd"></path></svg>
               </Button>

apps/client-ts/src/components/Connection/CopyLinkInput.tsx

@@ -15,7 +15,7 @@ const CopyLinkInput = () => {
 
   const handleCopy = async () => {
     try {
-      await navigator.clipboard.writeText(`${config.FRONT_DOMAIN}/?uniqueLink=${uniqueLink}`);
+      await navigator.clipboard.writeText(`${config.MAGIC_LINK_DOMAIN}/?uniqueLink=${uniqueLink}`);
       setCopied(true);
       setTimeout(() => setCopied(false), 2000); // Reset copied state after 2 seconds
     } catch (err) {
@@ -28,7 +28,7 @@ const CopyLinkInput = () => {
       {uniqueLink !== 'https://' ? 
       <>
         <Input
-          defaultValue={`${config.FRONT_DOMAIN}/?uniqueLink=${uniqueLink}`}
+          defaultValue={`${config.MAGIC_LINK_DOMAIN}/?uniqueLink=${uniqueLink}`}
           readOnly
           className="col-span-3 flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none  focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"                              
         /> 

apps/client-ts/src/lib/config.ts

@@ -1,6 +1,6 @@
 const config = {
     API_URL: process.env.NEXT_PUBLIC_BACKEND_DOMAIN,
-    FRONT_DOMAIN: process.env.NEXT_PUBLIC_FRONTEND_DOMAIN,
+    MAGIC_LINK_DOMAIN: process.env.NEXT_PUBLIC_MAGIC_LINK_DOMAIN,
     POSTHOG_HOST: process.env.NEXT_PUBLIC_POSTHOG_HOST,
     POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
     DISTRIBUTION: process.env.NEXT_PUBLIC_DISTRIBUTION,

apps/client-ts/src/middleware.ts

@@ -186,7 +186,7 @@ export async function middleware(request: NextRequest) {
   try {
     // Authenticate the session JWT. If an error is thrown the session authentication has failed.
     await stytchClient.sessions.authenticateJwt({session_jwt: sessionJWT});
-    return { props: {} };
+    return NextResponse.next();
   } catch (e) {
     return NextResponse.redirect(new URL("/b2c/login", request.url));
   }

apps/magic-link/.env.example

@@ -1,2 +1 @@
 VITE_BACKEND_DOMAIN=http://localhost:3000
-VITE_ML_FRONTEND_URL=http://127.0.0.1:5173

apps/magic-link/Dockerfile

@@ -27,12 +27,10 @@ ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
 ARG VITE_BACKEND_DOMAIN
-ARG VITE_ML_FRONTEND_URL
 ARG VITE_FRONTEND_DOMAIN
 
 ENV VITE_BACKEND_DOMAIN="$VITE_BACKEND_DOMAIN"
 ENV VITE_FRONTEND_DOMAIN="$VITE_FRONTEND_DOMAIN"
-ENV VITE_ML_FRONTEND_URL="$VITE_ML_FRONTEND_URL"
 
 RUN corepack enable
 

apps/magic-link/Dockerfile.dev

@@ -11,12 +11,10 @@ ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
 ARG VITE_BACKEND_DOMAIN
-ARG VITE_ML_FRONTEND_URL
 ARG VITE_FRONTEND_DOMAIN
 
 ENV VITE_BACKEND_DOMAIN="$VITE_BACKEND_DOMAIN"
 ENV VITE_FRONTEND_DOMAIN="$VITE_FRONTEND_DOMAIN"
-ENV VITE_ML_FRONTEND_URL="$VITE_ML_FRONTEND_URL"
 
 RUN corepack enable
 

apps/magic-link/src/helpers/config.ts

@@ -1,6 +1,5 @@
 const config = {
     API_URL: import.meta.env.VITE_BACKEND_DOMAIN,
-    ML_FRONTEND_URL: import.meta.env.VITE_ML_FRONTEND_URL
 };
 
 export default config;

apps/magic-link/src/lib/ProviderModal.tsx

@@ -47,7 +47,7 @@ const ProviderModal = () => {
 
   const { open, isReady } = useOAuth({
     providerName: selectedProvider,
-    returnUrl: config.ML_FRONTEND_URL!,
+    returnUrl: "https://google.com", //TODO: handle the redirection URL (let customer put their confetti or success page redirect url ? )
     projectId: linkedUser?.id_project as string,
     linkedUserId: linkedUser?.id_linked_user as string,
     onSuccess: () => console.log('OAuth successful'),

docker-compose.dev.yml

@@ -37,6 +37,8 @@ services:
         ENCRYPT_CRYPTO_SECRET_KEY: ${ENCRYPT_CRYPTO_SECRET_KEY}
         HUBSPOT_CLIENT_ID: ${HUBSPOT_CLIENT_ID}
         HUBSPOT_CLIENT_SECRET: ${HUBSPOT_CLIENT_SECRET}
+        ATTIO_CLIENT_ID: ${ATTIO_CLIENT_ID}
+        ATTIO_CLIENT_SECRET: ${ATTIO_CLIENT_SECRET}
         ZOHOCRM_CLIENT_ID: ${ZOHOCRM_CLIENT_ID}
         ZOHOCRM_CLIENT_SECRET: ${ZOHOCRM_CLIENT_SECRET}
         PIPEDRIVE_CLIENT_ID: ${PIPEDRIVE_CLIENT_ID}
@@ -47,9 +49,6 @@ services:
         ZENDESK_TICKETING_SUBDOMAIN: ${ZENDESK_TICKETING_SUBDOMAIN}
         ZENDESK_TICKETING_CLIENT_ID: ${ZENDESK_TICKETING_CLIENT_ID}
         ZENDESK_TICKETING_CLIENT_SECRET: ${ZENDESK_TICKETING_CLIENT_SECRET}
-        STYTCH_PROJECT_ID: ${STYTCH_PROJECT_ID}
-        STYTCH_SECRET: ${STYTCH_SECRET}
-        FRONT_END_URL: ${FRONT_END_URL}
     restart:
       unless-stopped
     ports:
@@ -82,16 +81,16 @@ services:
       dockerfile: ./apps/client-ts/Dockerfile.dev
       context: ./
       args:
-        VITE_BACKEND_DOMAIN: ${VITE_BACKEND_DOMAIN}
-        VITE_FRONTEND_DOMAIN: ${VITE_FRONTEND_DOMAIN}
+        VITE_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
+        VITE_FRONTEND_DOMAIN: ${NEXT_PUBLIC_MAGIC_LINK_DOMAIN}
     environment:
       NEXT_PUBLIC_STYTCH_SECRET: ${NEXT_PUBLIC_STYTCH_SECRET}
       NEXT_PUBLIC_STYTCH_PROJECT_ID: ${NEXT_PUBLIC_STYTCH_PROJECT_ID}
       NEXT_PUBLIC_DISTRIBUTION: ${DISTRIBUTION}
       NEXT_PUBLIC_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
       NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN: ${NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN}
       NEXT_PUBLIC_STYTCH_PROJECT_ENV: ${NEXT_PUBLIC_STYTCH_PROJECT_ENV}
-      NEXT_PUBLIC_FRONTEND_DOMAIN: ${NEXT_PUBLIC_FRONTEND_DOMAIN}
+      NEXT_PUBLIC_MAGIC_LINK_DOMAIN: ${NEXT_PUBLIC_MAGIC_LINK_DOMAIN}
       NEXT_PUBLIC_WEBAPP_DOMAIN: ${NEXT_PUBLIC_WEBAPP_DOMAIN}
     restart:
       unless-stopped
@@ -111,6 +110,8 @@ services:
     build:
       dockerfile: ./apps/magic-link/Dockerfile.dev
       context: ./
+      args:
+        VITE_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
     restart:
       always
     ports:

docker-compose.source.yml

@@ -37,6 +37,8 @@ services:
       ENCRYPT_CRYPTO_SECRET_KEY: ${ENCRYPT_CRYPTO_SECRET_KEY}
       HUBSPOT_CLIENT_ID: ${HUBSPOT_CLIENT_ID}
       HUBSPOT_CLIENT_SECRET: ${HUBSPOT_CLIENT_SECRET}
+      ATTIO_CLIENT_ID: ${ATTIO_CLIENT_ID}
+      ATTIO_CLIENT_SECRET: ${ATTIO_CLIENT_SECRET}
       ZOHOCRM_CLIENT_ID: ${ZOHOCRM_CLIENT_ID}
       ZOHOCRM_CLIENT_SECRET: ${ZOHOCRM_CLIENT_SECRET}
       PIPEDRIVE_CLIENT_ID: ${PIPEDRIVE_CLIENT_ID}
@@ -47,8 +49,6 @@ services:
       ZENDESK_TICKETING_SUBDOMAIN: ${ZENDESK_TICKETING_SUBDOMAIN}
       ZENDESK_TICKETING_CLIENT_ID: ${ZENDESK_TICKETING_CLIENT_ID}
       ZENDESK_TICKETING_CLIENT_SECRET: ${ZENDESK_TICKETING_CLIENT_SECRET}
-      STYTCH_PROJECT_ID: ${STYTCH_PROJECT_ID}
-      STYTCH_SECRET: ${STYTCH_SECRET}
     restart: unless-stopped
     ports:
       - 3000:3000
@@ -79,7 +79,7 @@ services:
         NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN: ${NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN}
         NEXT_PUBLIC_DISTRIBUTION: ${DISTRIBUTION}
         NEXT_PUBLIC_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
-        NEXT_PUBLIC_FRONTEND_DOMAIN: ${NEXT_PUBLIC_FRONTEND_DOMAIN}
+        NEXT_PUBLIC_MAGIC_LINK_DOMAIN: ${NEXT_PUBLIC_MAGIC_LINK_DOMAIN}
         NEXT_PUBLIC_WEBAPP_DOMAIN: ${NEXT_PUBLIC_WEBAPP_DOMAIN}
     restart: unless-stopped
     ports:

docker-compose.yml

@@ -32,6 +32,8 @@ services:
         ENCRYPT_CRYPTO_SECRET_KEY: ${ENCRYPT_CRYPTO_SECRET_KEY}
         HUBSPOT_CLIENT_ID: ${HUBSPOT_CLIENT_ID}
         HUBSPOT_CLIENT_SECRET: ${HUBSPOT_CLIENT_SECRET}
+        ATTIO_CLIENT_ID: ${ATTIO_CLIENT_ID}
+        ATTIO_CLIENT_SECRET: ${ATTIO_CLIENT_SECRET}
         ZOHOCRM_CLIENT_ID: ${ZOHOCRM_CLIENT_ID}
         ZOHOCRM_CLIENT_SECRET: ${ZOHOCRM_CLIENT_SECRET}
         PIPEDRIVE_CLIENT_ID: ${PIPEDRIVE_CLIENT_ID}
@@ -42,9 +44,6 @@ services:
         ZENDESK_TICKETING_SUBDOMAIN: ${ZENDESK_TICKETING_SUBDOMAIN}
         ZENDESK_TICKETING_CLIENT_ID: ${ZENDESK_TICKETING_CLIENT_ID}
         ZENDESK_TICKETING_CLIENT_SECRET: ${ZENDESK_TICKETING_CLIENT_SECRET}
-        STYTCH_PROJECT_ID: ${STYTCH_PROJECT_ID}
-        STYTCH_SECRET: ${STYTCH_SECRET}
-        FRONT_END_URL: ${FRONT_END_URL}
 
     restart:
       unless-stopped
@@ -108,7 +107,7 @@ services:
       NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN: ${NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN}
       NEXT_PUBLIC_DISTRIBUTION: ${DISTRIBUTION}
       NEXT_PUBLIC_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
-      NEXT_PUBLIC_FRONTEND_DOMAIN: ${NEXT_PUBLIC_FRONTEND_DOMAIN}
+      NEXT_PUBLIC_MAGIC_LINK_DOMAIN: ${NEXT_PUBLIC_MAGIC_LINK_DOMAIN}
       NEXT_PUBLIC_WEBAPP_DOMAIN: ${NEXT_PUBLIC_WEBAPP_DOMAIN}
     restart: unless-stopped
     ports:

packages/api/src/@core/auth/auth.controller.ts

@@ -69,19 +69,4 @@ export class AuthController {
       data.keyName,
     );
   }
-
-  @Get('/callback')
-  async callback(@Query() query: { token: string }, @Res() res: Response) {
-    const user = await this.authService.validateStytchToken(query.token);
-
-    await this.authService.createUser({
-      email: user.emails[0].email,
-      first_name: user.name.first_name,
-      last_name: user.name.last_name,
-      password_hash: '',
-    });
-
-    //TODO make it dynamic
-    res.redirect('http://localhost/callback/?token=' + query.token);
-  }
 }

packages/api/src/@core/auth/auth.module.ts

@@ -8,7 +8,6 @@ import { PrismaService } from '../prisma/prisma.service';
 import { ConfigService } from '@nestjs/config';
 import { LoggerService } from '@@core/logger/logger.service';
 import { AuthController } from './auth.controller';
-import { StytchModule } from './stytch/stytch.module';
 
 @Module({
   controllers: [AuthController],
@@ -22,7 +21,6 @@ import { StytchModule } from './stytch/stytch.module';
     LoggerService,
   ],
   imports: [
-    StytchModule,
     PassportModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET,

packages/api/src/@core/auth/auth.service.ts

@@ -13,15 +13,13 @@ import { LoggerService } from '@@core/logger/logger.service';
 import { handleServiceError } from '@@core/utils/errors';
 import { LoginDto } from './dto/login.dto';
 import { users as User } from '@prisma/client';
-import { StytchService } from './stytch/stytch.service';
 
 //TODO: Ensure the JWT is used for user session authentication and that it's short-lived.
 @Injectable()
 export class AuthService {
   constructor(
     private prisma: PrismaService,
     private jwtService: JwtService,
-    private stytchService: StytchService,
     private logger: LoggerService,
   ) {
     this.logger.setContext(AuthService.name);
@@ -53,16 +51,7 @@ export class AuthService {
         throw new BadRequestException('email already exists');
       }
 
-      const stytchUser = await this.stytchService.passwords.create({
-        email: user.email,
-        password: user.password_hash,
-        name: {
-          first_name: user.first_name,
-          last_name: user.last_name,
-        },
-      });
-
-      const savedUser = await this.createUser(user, stytchUser.user_id);
+      const savedUser = await this.createUser(user);
 
       const { password_hash, ...resp_user } = savedUser;
       return resp_user;
@@ -133,17 +122,6 @@ export class AuthService {
     }
   }
 
-  async validateStytchToken(token: string) {
-    try {
-      const { user } = await this.stytchService.oauth.authenticate({
-        token,
-      });
-      return user;
-    } catch (error) {
-      handleServiceError(error, this.logger);
-    }
-  }
-
   hashApiKey(apiKey: string): string {
     return crypto.createHash('sha256').update(apiKey).digest('hex');
   }