fix: news letter sending

activepieces · Dec 7, 2023 · 00eaadf · 00eaadf
1 parent 9bfb6b9
commit 00eaadf
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 43 deletions.
diff --git a/packages/backend/src/app/authentication/authentication-service/index.ts b/packages/backend/src/app/authentication/authentication-service/index.ts
@@ -80,6 +80,7 @@ export const authenticationService = {
         await sendTelemetry({
             user, project: authnResponse.project,
         })
+        await saveNewsLetterSubscriber(user)
 
         return {
             ...userWithoutPassword,
@@ -199,6 +200,25 @@ const sendTelemetry = async ({ user, project }: SendTelemetryParams): Promise<vo
     }
 }
 
+async function saveNewsLetterSubscriber(user: User): Promise<void> {
+    const isPlatformUserOrNotSubscribed = !isNil(user.platformId) || !user.newsLetter
+    if (isPlatformUserOrNotSubscribed) {
+        return
+    }
+    try {
+        const response = await fetch('https://us-central1-activepieces-b3803.cloudfunctions.net/addContact', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ email: user.email }),
+        })
+        return await response.json()
+    }
+    catch (error) {
+        logger.warn(error)
+    }
+}
 type SendTelemetryParams = {
     user: User
     project: Project

diff --git a/packages/ee/shared/src/index.ts b/packages/ee/shared/src/index.ts
@@ -10,7 +10,6 @@ export * from './lib/referral/referral';
 export * from './lib/project-members/project-member-request';
 export * from './lib/project-members/project-member';
 export * from './lib/flow-templates/flow-templates-requests.ee';
-export * from './lib/firebase-auth';
 export * from './lib/product-embed/app-credentials/index';
 export * from './lib/product-embed/connection-keys/index';
 export * from './lib/signing-key'

diff --git a/packages/ee/shared/src/lib/firebase-auth/firebase-sign-in-request.ts b/packages/ee/shared/src/lib/firebase-auth/firebase-sign-in-request.ts
diff --git a/packages/ee/shared/src/lib/firebase-auth/firebase-sign-up-request.ts b/packages/ee/shared/src/lib/firebase-auth/firebase-sign-up-request.ts
diff --git a/packages/ee/shared/src/lib/firebase-auth/index.ts b/packages/ee/shared/src/lib/firebase-auth/index.ts
diff --git a/packages/ui/common/src/lib/service/authentication.service.ts b/packages/ui/common/src/lib/service/authentication.service.ts
@@ -102,13 +102,6 @@ export class AuthenticationService {
     this.router.navigate(['sign-in']);
   }
 
-  // TODO - move to a separate service
-  saveNewsLetterSubscriber(email: string) {
-    return this.http.post(
-      'https://us-central1-activepieces-b3803.cloudfunctions.net/addContact',
-      { email: email }
-    );
-  }
   getDecodedToken(): Principal | null {
     const token = localStorage.getItem(environment.jwtTokenName);
     const decodedToken = this.jwtHelper.decodeToken(token || '');

diff --git a/packages/ui/feature-authentication/src/lib/pages/sign-up/sign-up.component.ts b/packages/ui/feature-authentication/src/lib/pages/sign-up/sign-up.component.ts
@@ -98,20 +98,6 @@ export class SignUpComponent implements OnInit {
             this.authenticationService.saveUser(response);
           }
         }),
-        switchMap((response) => {
-          if (this.registrationForm.controls.newsLetter.value && response) {
-            return this.authenticationService
-              .saveNewsLetterSubscriber(request.email)
-              .pipe(
-                map(() => response),
-                catchError((err) => {
-                  console.error(err);
-                  return of(response);
-                })
-              );
-          }
-          return of(response);
-        }),
         tap((response) => {
           if (response && response.body?.status === UserStatus.VERIFIED) {
             this.redirect();