♻️ Store parsed details in session, Change Mac OS -> macOS

staart · Nov 15, 2020 · c499a62 · c499a62
1 parent 3c64599
commit c499a62
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/interceptors/audit-log.interceptor.ts b/src/interceptors/audit-log.interceptor.ts
@@ -60,9 +60,9 @@ export class AuditLogger implements NestInterceptor {
                     ua.getBrowser().version ?? ''
                   }`.trim() || undefined,
                 operatingSystem:
-                  `${ua.getOS().name ?? ''} ${
-                    ua.getOS().version ?? ''
-                  }`.trim() || undefined,
+                  `${ua.getOS().name ?? ''} ${ua.getOS().version ?? ''}`
+                    .replace('Mac OS', 'macOS')
+                    .trim() || undefined,
               };
               if (request.user.id && request.user.type === 'user')
                 data.user = { connect: { id: request.user.id } };

diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts
@@ -16,6 +16,7 @@ import anonymize from 'ip-anonymize';
 import { authenticator } from 'otplib';
 import qrcode from 'qrcode';
 import randomColor from 'randomcolor';
+import { UAParser } from 'ua-parser-js';
 import {
   COMPROMISED_PASSWORD,
   EMAIL_USER_CONFLICT,
@@ -508,8 +509,27 @@ export class AuthService {
     user: users,
   ): Promise<TokenResponse> {
     const token = this.tokensService.generateUuid();
+    const ua = new UAParser(userAgent);
+    const location = await this.geolocationService.getLocation(ipAddress);
     await this.prisma.sessions.create({
-      data: { token, ipAddress, userAgent, user: { connect: { id: user.id } } },
+      data: {
+        token,
+        ipAddress,
+        city: location?.city?.names?.en,
+        region: location?.subdivisions?.pop()?.names?.en,
+        timezone: location?.location?.time_zone,
+        countryCode: location?.country?.iso_code,
+        userAgent,
+        browser:
+          `${ua.getBrowser().name ?? ''} ${
+            ua.getBrowser().version ?? ''
+          }`.trim() || undefined,
+        operatingSystem:
+          `${ua.getOS().name ?? ''} ${ua.getOS().version ?? ''}`
+            .replace('Mac OS', 'macOS')
+            .trim() || undefined,
+        user: { connect: { id: user.id } },
+      },
     });
     return {
       accessToken: await this.getAccessToken(user),