fix: social - redis

.github/workflows/deploy.yml

@@ -42,9 +42,10 @@ jobs:
       - name: Deploy
         env:
           FLY_APP_NAME: ${{ vars.FLY_APP_NAME }}
+          FLY_CONFIG_FILE_NAME: ${{ github.ref == 'refs/heads/main' && 'fly.prod.toml' || 'flu.stage.toml' }}
         run: |
           ~/.fly/bin/fly deploy \
-            --config fly.toml \
+            --config $FLY_CONFIG_FILE_NAME \
             --dockerfile Dockerfile \
             --app $FLY_APP_NAME \
             --access-token $FLY_ACCESS_TOKEN

fly.prod.toml

@@ -0,0 +1,33 @@
+primary_region = "syd"
+
+[http_service]
+  internal_port = 4200
+  force_https = true
+  auto_stop_machines = false
+  auto_start_machines = false
+  min_machines_running = 1
+  [http_service.concurrency]
+    type = "requests"
+    soft_limit = 500
+    hard_limit = 750
+
+[http_service.tls_options]
+  alpn = ["h2", "http/1.1"]
+  versions = ["TLSv1.2", "TLSv1.3"]
+  default_self_signed = true
+
+[[http_service.checks]]
+  grace_period = "10s"
+  interval = "30s"
+  method = "GET"
+  timeout = "10s"
+  path = "/api/health"
+  protocol = "http"
+  port = 4200
+  tls_skip_verify = true
+
+[[vm]]
+  size = "shared-cpu-1x"
+  memory = "512mb"
+  cpus = 1
+  cpu_kind = "shared"

fly.toml → fly.stage.toml

@@ -3,8 +3,8 @@ primary_region = "syd"
 [http_service]
   internal_port = 4200
   force_https = true
-  auto_stop_machines = false
-  auto_start_machines = false
+  auto_stop_machines = true
+  auto_start_machines = true
   min_machines_running = 0
   [http_service.concurrency]
     type = "requests"

package.json

@@ -48,6 +48,7 @@
     "cheerio": "1.0.0-rc.12",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "connect-redis": "^7.1.1",
     "crypto-js": "^4.2.0",
     "expo-server-sdk": "^3.10.0",
     "express": "^4.19.2",

src/app/app.module.ts

@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
+import { Inject, MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AuthModule } from '../auth/auth.module';
 import { UserModule } from '../user/user.module';
@@ -14,6 +14,10 @@ import { ConnectionsModule } from '../../src/connections/connections.module';
 import { AppLoggerMiddleware } from '../../src/middlewares/logger.middleware';
 import { CommonModule } from '../common/common.module';
 import { NotificationsModule } from '../../src/notifications/notifications.module';
+import RedisStore from 'connect-redis';
+import * as session from 'express-session';
+import Redis from 'ioredis';
+import { REDIS_CLIENT } from '../../src/provider/redis.provider';
 
 @Module({
   imports: [
@@ -40,7 +44,19 @@ import { NotificationsModule } from '../../src/notifications/notifications.modul
   ],
 })
 export class AppModule implements NestModule {
+  constructor(@Inject(REDIS_CLIENT) private redis: Redis) {}
+
   configure(consumer: MiddlewareConsumer): void {
-    consumer.apply(AppLoggerMiddleware).forRoutes('*');
+    consumer
+      .apply(
+        AppLoggerMiddleware,
+        session({
+          secret: process.env.SESSION_SECRET || 'lala',
+          resave: false,
+          saveUninitialized: false,
+          store: new RedisStore({ client: this.redis }),
+        }),
+      )
+      .forRoutes('*');
   }
 }

src/auth/service/auth.service.ts

@@ -155,13 +155,13 @@ export class AuthService {
   }
 
   async handleAppleOAuthLogin(req: any) {
-    const { email, name } = req.user;
-    const displayName = name.firstName + ' ' + name.lastName;
+    const { email, displayName } = req.user;
     const user = await this.createUserIfNotExists(
       email,
       AuthType.APPLE,
       displayName,
       null,
+      false,
     );
 
     const token = await this.generateToken(user);

src/main.ts

@@ -3,7 +3,6 @@ import { AppModule } from './app/app.module';
 import { ValidationPipe } from '@nestjs/common';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 import { json } from 'express';
-import * as session from 'express-session';
 
 function initializeSwagger(app: any) {
   const config = new DocumentBuilder()
@@ -19,7 +18,6 @@ function initializeSwagger(app: any) {
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   const globalPrefix = 'api';
-  app.use(session({ secret: process.env.SESSION_SECRET }));
 
   app.setGlobalPrefix(globalPrefix);
   app.enableCors();