DEV.md

@@ -144,3 +144,7 @@ psql --file=data.sql --dbname=altairgraphql-db --port=5432 --host=localhost --us
 ## Tips
 
 - add `&pgbouncer=true` to your connection url in order to enable pgbouncer mode in Prisma
+
+### Slow running development application
+
+If the local development application feels extremely slow, check if you have the [Angular DevTools extension](https://chromewebstore.google.com/detail/angular-devtools/ienfalfjdbdpebioblfackkekamfmbnh) installed on your browser and disable it. It slows down the application significantly.

Dockerfile

@@ -33,6 +33,9 @@ COPY nx.json nx.json
 COPY tsconfig.json tsconfig.json
 COPY CHECKS CHECKS
 # build the project, running the prepare scripts
+# Somehow get an unknown error if I don't install nx first
+RUN yarn add nx -W
+# yarn install 2> >(grep -v warning 1>&2)
 RUN yarn
 RUN yarn turbo run build --filter=@altairgraphql/api...
 

VERSION

@@ -1 +1 @@
-8.0.0
+8.0.1

chocolatey/altair-graphql.nuspec

@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- version should MATCH as closely as possible with the underlying software -->
     <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
     <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
-    <version>8.0.0</version>
+    <version>8.0.1</version>
     <packageSourceUrl>https://github.com/altair-graphql/altair</packageSourceUrl>
     <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
     <owners>Daniel Richter, Samuel Imolorhe</owners>

chocolatey/tools/chocolateyInstall.ps1

@@ -1,7 +1,7 @@
 $ErrorActionPreference = 'Stop'; # stop on all errors
 
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$fileLocation = Join-Path $toolsDir '..\bins\altair_8.0.0_x64_win.exe'
+$fileLocation = Join-Path $toolsDir '..\bins\altair_8.0.1_x64_win.exe'
 $fileHash = Get-FileHash $fileLocation
 
 $packageArgs = @{

cwex.yml

@@ -11,7 +11,7 @@ manifestOptions:
   name: Altair GraphQL Client
   short_name: Altair
   description: A beautiful feature-rich GraphQL client for all platforms
-  version: 8.0.0
+  version: 8.0.1
   icons:
     16: assets/img/altair_logo_128.png
     48: assets/img/altair_logo_128.png

examples/fastify-v5/package.json

@@ -6,7 +6,7 @@
   "devDependencies": {
     "@types/node": "^22.7.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.2"
+    "typescript": "5.2.2"
   },
   "dependencies": {
     "fastify": "^5.0.0"

lerna.json

@@ -3,7 +3,7 @@
     "packages/*",
     "plugins/*"
   ],
-  "version": "8.0.0",
+  "version": "8.0.1",
   "registry": "https://registry.npmjs.org/",
   "npmClient": "yarn",
   "stream": true,

libs/eslint-config-altair/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-altair",
   "description": "ESlint configurations",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "altair",
   "description": "The best graphQL client you will ever need",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
   "bugs": "https://github.com/altair-graphql/altair/issues",
   "collective": {
@@ -24,7 +24,7 @@
     "inquirer": "^7.3.3",
     "lerna": "^4.0.0",
     "ng-packagr": "^13.0.8",
-    "nx": "19.4.3",
+    "nx": "17.1.3",
     "opencollective": "^1.0.3",
     "path-browserify": "^1.0.0",
     "process": "^0.11.10",

packages/altair-api-utils/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@altairgraphql/api-utils",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "dependencies": {
-    "@altairgraphql/db": "^8.0.0",
-    "altair-graphql-core": "^8.0.0",
+    "@altairgraphql/db": "^8.0.1",
+    "altair-graphql-core": "^8.0.1",
     "ky": "^0.33.2",
     "rxjs": "^7.0.0"
   },

packages/altair-api/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@altairgraphql/api",
   "description": "",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "author": "",
   "dependencies": {
-    "@altairgraphql/api-utils": "^8.0.0",
-    "@altairgraphql/db": "^8.0.0",
+    "@altairgraphql/api-utils": "^8.0.1",
+    "@altairgraphql/db": "^8.0.1",
+    "@altairgraphql/emails": "^8.0.1",
     "@langchain/anthropic": "^0.2.4",
     "@langchain/community": "^0.2.19",
     "@langchain/openai": "^0.2.2",
@@ -18,7 +19,7 @@
     "@nestjs/platform-express": "^10.3.10",
     "@nestjs/schedule": "^4.1.0",
     "@nestjs/swagger": "^7.4.0",
-    "altair-graphql-core": "^8.0.0",
+    "altair-graphql-core": "^8.0.1",
     "bcrypt": "^5.1.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
@@ -33,6 +34,7 @@
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
     "reflect-metadata": "^0.1.13",
+    "resend": "^4.0.0",
     "rimraf": "^5.0.5",
     "rxjs": "^7.8.1",
     "stripe": "^16.2.0",
@@ -67,7 +69,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.5.3"
+    "typescript": "5.2.2"
   },
   "license": "UNLICENSED",
   "private": true,

packages/altair-api/src/app.module.ts

@@ -19,6 +19,7 @@ import { ScheduleModule } from '@nestjs/schedule';
 import { WinstonModule, utilities } from 'nest-winston';
 import { format, transports } from 'winston';
 import { AiModule } from './ai/ai.module';
+import { EmailService } from './email/email.service';
 
 @Module({
   imports: [
@@ -59,6 +60,6 @@ import { AiModule } from './ai/ai.module';
     AiModule,
   ],
   controllers: [AppController, StripeWebhookController],
-  providers: [AppService, PasswordService],
+  providers: [AppService, PasswordService, EmailService],
 })
 export class AppModule {}

packages/altair-api/src/auth/user/user.service.ts

@@ -125,6 +125,17 @@ export class UserService {
     });
   }
 
+  updateUserResendContactId(userId: string, resendContactId: string) {
+    return this.prisma.user.update({
+      data: {
+        resendContactId,
+      },
+      where: {
+        id: userId,
+      },
+    });
+  }
+
   async getPlanConfig(userId: string) {
     const res = await this.prisma.userPlan.findUnique({
       where: {

packages/altair-api/src/common/config.ts

@@ -38,6 +38,12 @@ const config = {
       model: process.env.ANTHROPIC_MODEL_NAME ?? 'claude-3-haiku-20240307',
     },
   },
+  email: {
+    resendApiKey: process.env.RESEND_API_KEY,
+    audienceId: process.env.RESEND_AUDIENCE_ID,
+    defaultFrom: 'Altair GraphQL <mail@mail.altairgraphql.dev>',
+    replyTo: 'info@altairgraphql.dev',
+  },
 };
 
 export type Config = typeof config;

packages/altair-api/src/email/email.service.spec.ts

@@ -0,0 +1,29 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { EmailService } from './email.service';
+import { ConfigService } from '@nestjs/config';
+import { testProviders } from 'test/providers';
+
+describe('EmailService', () => {
+  let service: EmailService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        EmailService,
+        {
+          provide: ConfigService,
+          useValue: {
+            get: jest.fn().mockReturnValue('test'),
+          },
+        },
+        ...testProviders,
+      ],
+    }).compile();
+
+    service = module.get<EmailService>(EmailService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});

packages/altair-api/src/email/email.service.ts

@@ -0,0 +1,106 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { Resend } from 'resend';
+import { renderWelcomeEmail } from '@altairgraphql/emails';
+import { UserService } from 'src/auth/user/user.service';
+import { Config } from 'src/common/config';
+import { User } from '@altairgraphql/db';
+
+@Injectable()
+export class EmailService {
+  private resend: Resend;
+  constructor(
+    private configService: ConfigService<Config>,
+    private readonly userService: UserService
+  ) {
+    this.resend = new Resend(
+      this.configService.get('email.resendApiKey', { infer: true })
+    );
+  }
+
+  async subscribeUser(userId: string) {
+    const user = await this.userService.mustGetUser(userId);
+    if (user.resendContactId) {
+      return;
+    }
+    const audienceId = this.configService.get('email.audienceId', { infer: true });
+
+    if (!audienceId) {
+      console.error('No audience ID found');
+      return;
+    }
+
+    const { data, error } = await this.resend.contacts.create({
+      email: user.email,
+      audienceId,
+      firstName: this.getFirstName(user),
+      lastName: user.lastName ?? '',
+    });
+
+    if (error) {
+      console.error('Error subscribing user', error);
+      return;
+    }
+
+    if (!data?.id) {
+      console.error('No contact ID found');
+      return;
+    }
+
+    await this.userService.updateUserResendContactId(userId, data.id);
+  }
+
+  async sendWelcomeEmail(userId: string) {
+    const user = await this.userService.mustGetUser(userId);
+    const { data, error } = await this.resend.emails.send({
+      from:
+        this.configService.get('email.defaultFrom', { infer: true }) ??
+        'info@mail.altairgraphql.dev',
+      to: user.email,
+      replyTo: this.configService.get('email.replyTo', { infer: true }),
+      subject: 'Welcome to Altair GraphQL Cloud',
+      html: await renderWelcomeEmail({ username: this.getFirstName(user) }),
+    });
+    if (error) {
+      console.error('Error sending welcome email', error);
+    }
+
+    return { data, error };
+  }
+
+  async sendGoodbyeEmail(userId: string) {
+    const user = await this.userService.mustGetUser(userId);
+    const { data, error } = await this.resend.emails.send({
+      from:
+        this.configService.get('email.defaultFrom', { infer: true }) ??
+        'info@mail.altairgraphql.dev',
+      to: user.email,
+      replyTo: this.configService.get('email.replyTo', { infer: true }),
+      subject: 'Sorry to see you go 👋🏾',
+      html: `Hey ${this.getFirstName(user)},
+      <br><br>
+      Samuel here. I noticed you've cancelled your Altair GraphQL pro subscription and wanted to check in.
+      <br><br>
+      Would you mind sharing what led to your decision? Your feedback helps us make Altair better for everyone. Just hit reply to let me know.
+      <br><br>
+      If you ever want to come back, we'll be here! And of course, you can keep using Altair's free version as long as you like.
+      <br><br>
+      Thanks for giving the pro version a try!
+      <br><br>
+      Best wishes,
+      <br>
+      Samuel
+      <br><br>
+      P.S. If you cancelled because of a technical issue or need help with something, just let me know -- I'm happy to help!`,
+    });
+    if (error) {
+      console.error('Error sending goodbye email', error);
+    }
+
+    return { data, error };
+  }
+
+  private getFirstName(user: User) {
+    return user.firstName ?? user.email;
+  }
+}

packages/altair-api/src/query-collections/dto/create-query-collection.dto.ts

@@ -7,6 +7,7 @@ import {
   IsString,
   IsBoolean,
   ValidateNested,
+  IsArray,
 } from 'class-validator';
 import { CreateQuerySansCollectionIdDto } from 'src/queries/dto/create-query.dto';
 
@@ -17,7 +18,8 @@ export class CreateQueryCollectionDto implements ICreateQueryCollectionDto {
   name!: string;
 
   @IsOptional()
-  @ValidateNested()
+  // @ValidateNested({ each: true })
+  @IsArray()
   @ApiProperty()
   @Type(() => CreateQuerySansCollectionIdDto)
   queries?: CreateQuerySansCollectionIdDto[];

packages/altair-api/src/stripe-webhook/stripe-webhook.controller.ts

@@ -8,6 +8,7 @@ import { BadRequestException, Controller, Header, Post, Req } from '@nestjs/comm
 import { Request } from 'express';
 import { PrismaService } from 'nestjs-prisma';
 import { UserService } from 'src/auth/user/user.service';
+import { EmailService } from 'src/email/email.service';
 import { StripeService } from 'src/stripe/stripe.service';
 import { Stripe } from 'stripe';
 
@@ -16,7 +17,8 @@ export class StripeWebhookController {
   constructor(
     private readonly stripeService: StripeService,
     private readonly userService: UserService,
-    private readonly prisma: PrismaService
+    private readonly prisma: PrismaService,
+    private readonly emailService: EmailService
   ) {
     // TODO: Synchronise with Stripe on startup
   }
@@ -68,14 +70,25 @@ export class StripeWebhookController {
 
         if (planRole === BASIC_PLAN_ID) {
           await this.userService.toBasicPlan(user.id);
+          if (shouldCancelPlan) {
+            // Send goodbye email
+            console.log('Sending goodbye email');
+            await this.emailService.sendGoodbyeEmail(user.id);
+          }
         } else if (planRole === PRO_PLAN_ID) {
           await this.userService.toProPlan(user.id, quantity);
+          // Send welcome email
+          console.log('Sending welcome email');
+          await this.emailService.sendWelcomeEmail(user.id);
+          // Subscribe user
+          console.log('Subscribing user');
+          await this.emailService.subscribeUser(user.id);
         }
         break;
       }
       case 'checkout.session.completed':
       case 'checkout.session.async_payment_succeeded': {
-        // TODO: Handle credit purchase
+        // Handle credit purchase
         const data: Stripe.Checkout.Session = event.data.object;
         const checkoutSession = await this.stripeService.retrieveCheckoutSession(
           data.id