Remove support for regional TLDs (#502)

.github/workflows/marketing.yml

@@ -2,7 +2,7 @@ name: 'Marketing Build'
 
 on:
   push:
-    branches: [v503/reset-de]
+    branches: [v502/cookie]
 
 jobs:
   marketing:

backend/src/db/actions/users.ts

@@ -212,13 +212,19 @@ export async function associateUserWithAdWordsCampaign(
         id: user.id,
       },
     });
-    if (userEntity && tracking.campaignId && tracking.creativeId) {
+    if (
+      userEntity &&
+      tracking.campaignId &&
+      tracking.creativeId &&
+      !userEntity.tracking.trackedAt
+    ) {
       userEntity.tracking = new TrackingEntity();
       userEntity.tracking.campaignId = tracking.campaignId;
       userEntity.tracking.creativeId = tracking.creativeId;
       userEntity.tracking.device = tracking.device || null;
       userEntity.tracking.keyword = tracking.keyword || null;
       userEntity.tracking.gclid = tracking.gclid || null;
+      userEntity.tracking.trackedAt = new Date();
       await userRepository.save(userEntity);
     }
   });

backend/src/db/entities/TrackingEntity.ts

@@ -11,12 +11,15 @@ export default class TrackingEntity {
   public keyword: string | null;
   @Column({ nullable: true, type: 'character varying' })
   public gclid: string | null;
+  @Column({ nullable: true, type: 'timestamp with time zone' })
+  public trackedAt: Date | null;
 
   constructor() {
     this.campaignId = null;
     this.creativeId = null;
     this.device = null;
     this.keyword = null;
     this.gclid = null;
+    this.trackedAt = null;
   }
 }

backend/src/db/migrations/1679043892889-tracked-at.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class trackedAt1679043892889 implements MigrationInterface {
+    name = 'trackedAt1679043892889'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "users" ADD "tracking_tracked_at" TIMESTAMP WITH TIME ZONE`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "tracking_tracked_at"`);
+    }
+
+}

backend/src/index.ts

@@ -321,7 +321,7 @@ db().then(() => {
 
   app.get('/api/me', async (req, res) => {
     const user = await getUserViewFromRequest(req);
-    const trackingString: string = req.cookies['retro-aw-tracking'];
+    const trackingString: string = req.cookies['retro_aw'];
     if (trackingString && user) {
       const tracking: Partial<TrackingInfo> = JSON.parse(trackingString);
       // We don't await this because we don't want to block the response

marketing/.env.example

@@ -3,4 +3,5 @@ NEXT_PUBLIC_APP_URL=http://localhost:3000
 NEXT_PUBLIC_MEASUREMENT_ID=G-XXXXXXXXXX
 NEXT_PUBLIC_GOOGLE_AD_WORDS_ID=AW-XXXXXXXXXX
 NEXT_PUBLIC_GOOGLE_AD_WORDS_CONVERSION_ID=AW-XXXXXXXXXX/XXXXXXXXXX
-NEXT_PUBLIC_GOOGLE_AD_WORDS_DOMAINS=foo.com,bar.com
+NEXT_PUBLIC_GOOGLE_AD_WORDS_DOMAINS=foo.com,bar.com
+NEXT_PUBLIC_COOKIE_DOMAIN=.retrospected.com

marketing/Dockerfile

@@ -26,7 +26,7 @@ ARG NEXT_PUBLIC_APP_URL=APP_NEXT_PUBLIC_APP_URL
 ARG NEXT_PUBLIC_GOOGLE_AD_WORDS_ID=APP_NEXT_PUBLIC_GOOGLE_AD_WORDS_ID
 ARG NEXT_PUBLIC_GOOGLE_AD_WORDS_CONVERSION_ID=APP_NEXT_PUBLIC_GOOGLE_AD_WORDS_CONVERSION_ID
 ARG NEXT_PUBLIC_GOOGLE_AD_WORDS_DOMAINS=APP_NEXT_PUBLIC_GOOGLE_AD_WORDS_DOMAINS
-ARG NEXT_BACKEND_SUB_DOMAIN=APP_NEXT_BACKEND_SUB_DOMAIN
+ARG NEXT_PUBLIC_COOKIE_DOMAIN=APP_NEXT_PUBLIC_COOKIE_DOMAIN
 RUN yarn build
 
 # If using npm comment out above and use below instead

marketing/Makefile

@@ -3,5 +3,4 @@ run:
 	docker run \
 		--env NEXT_PUBLIC_MEASUREMENT_ID=G-BLAH \
 		--env NEXT_PUBLIC_APP_URL=http://localhost:3000 \
-		--env NEXT_BACKEND_SUB_DOMAIN=www-beta \
 		-it --rm -p 3333:3000 retrospected/marketing:local

marketing/next-i18next.config.js

@@ -1,22 +1,6 @@
-const subDomain = process.env.NEXT_BACKEND_SUB_DOMAIN;
-
 module.exports = {
   i18n: {
     defaultLocale: 'en',
-    locales: ['en', 'fr', 'de'], // , 'de', 'nl'],
-    domains: [
-      {
-        domain: `${subDomain}.retrospected.com`,
-        defaultLocale: 'en',
-      },
-      {
-        domain: `${subDomain}.retrospected.fr`,
-        defaultLocale: 'fr',
-      },
-      {
-        domain: `${subDomain}.retrospected.de`,
-        defaultLocale: 'de',
-      }
-    ],
+    locales: ['en', 'fr', 'de'],
   },
 }

marketing/src/middleware.ts

@@ -5,7 +5,7 @@ import parse from 'url-parse';
 
 // https://www.retrospected.com/?campaignid=19686942887&creative=648178043912&device=c&keyword=retro
 
-const COOKIE_NAME = 'retro-aw-tracking';
+const COOKIE_NAME = 'retro_aw';
 
 export type TrackingInfo = {
   campaignId: string;
@@ -33,16 +33,12 @@ export function middleware(request: NextRequest) {
     const cookie: ResponseCookie = {
       name: COOKIE_NAME,
       value: JSON.stringify(tracking),
-      sameSite: 'lax',
       expires: addYears(new Date(), 1),
-      domain:
-        host.includes('localhost') || host.split('.').length < 3
-          ? undefined
-          : host.split('.').slice(1).join('.'),
+      domain: host.includes('localhost')
+        ? undefined
+        : process.env.NEXT_PUBLIC_COOKIE_DOMAIN,
     };
 
-    console.log('tracking', tracking);
-
     response.cookies.set(cookie);
   }