Merge pull request #1130 from jetstreamapp/bug/fix-profile-session-lo…

…cation Fix profile session location
jetstreamapp · Jan 1, 2025 · 5916b6c · 5916b6c
2 parents 020409c + 5937d87
commit 5916b6c
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 22 deletions.
diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -330,6 +330,24 @@ if (ENV.NODE_ENV === 'production' && !ENV.CI && cluster.isPrimary) {
   server.on('error', (error: Error) => {
     logger.error(getExceptionLog(error), '[SERVER][ERROR]');
   });
+
+  process.on('SIGTERM', () => {
+    logger.info('SIGTERM received, shutting down gracefully');
+    server.close(() => {
+      logger.info('Server closed');
+
+      pgPool.end().then(() => {
+        logger.info('DB pool closed');
+        process.exit(0);
+      });
+    });
+
+    // Force close after 30s
+    setTimeout(() => {
+      logger.error('Could not close connections in time, forcefully shutting down');
+      process.exit(1);
+    }, 30_000);
+  });
 }
 
 /**

diff --git a/apps/geo-ip-api/src/main.ts b/apps/geo-ip-api/src/main.ts
@@ -127,13 +127,10 @@ app.use('*', (req, res, next) => {
 });
 
 app.use((err: Error | ZodError, req: express.Request, res: express.Response, next: express.NextFunction) => {
-  res.log.error('Unhandled error:', err);
-
-  if (!res.statusCode) {
-    res.status(500);
-  }
+  res.log.error({ ...getExceptionLog(err) }, 'Unhandled error');
 
   if (err instanceof ZodError) {
+    res.status(400);
     res.json({
       success: false,
       message: 'Validation error',
@@ -142,6 +139,10 @@ app.use((err: Error | ZodError, req: express.Request, res: express.Response, nex
     return;
   }
 
+  if (!res.statusCode || res.statusCode < 400) {
+    res.status(500);
+  }
+
   res.json({
     success: false,
     message: err.message,
@@ -153,6 +154,7 @@ const port = Number(process.env.PORT || 3334);
 const server = app.listen(port, () => {
   logger.info(`Listening at http://localhost:${port}/api`);
 });
+
 server.on('error', (error) => {
   logger.error(getExceptionLog(error, true), 'Server error: %s', error.message);
 });

diff --git a/apps/jetstream/src/app/components/profile/2fa/Profile2fa.tsx b/apps/jetstream/src/app/components/profile/2fa/Profile2fa.tsx
@@ -37,7 +37,7 @@ export const Profile2fa: FunctionComponent<Profile2faProps> = ({ authFactors, on
       `}
     >
       {!has2faEnabled && (
-        <ScopedNotification theme="warning" className="slds-m-vertical_medium">
+        <ScopedNotification theme="warning" className="slds-m-around_medium">
           You don't have two-factor authentication enabled. Enable it to add an extra layer of security to your account.
         </ScopedNotification>
       )}

diff --git a/apps/jetstream/src/app/components/profile/session/ProfileSessionItem.tsx b/apps/jetstream/src/app/components/profile/session/ProfileSessionItem.tsx
@@ -82,10 +82,21 @@ function Location({ location }: { location: SessionIpData }) {
   if (location.status !== 'success') {
     return null;
   }
-  const { city, countryCode } = location;
-  return (
-    <span>
-      ({city}, {countryCode})
-    </span>
-  );
+  const { city, region, countryCode, lat, lon } = location;
+
+  const estimatedLocation = [city, region, countryCode].filter(Boolean).join(', ');
+
+  if (lat && lon) {
+    return (
+      <span>
+        (Est. location:{' '}
+        <a href={`https://www.google.com/maps?q=${lat},${lon}`} target="_blank" rel="noopener noreferrer">
+          {estimatedLocation}
+        </a>
+        )
+      </span>
+    );
+  }
+
+  return <span>(Est. location: {estimatedLocation})</span>;
 }
diff --git a/libs/auth/server/src/lib/auth.db.service.ts b/libs/auth/server/src/lib/auth.db.service.ts
@@ -296,25 +296,39 @@ export async function getUserSessions(userId: string, omitLocationData?: boolean
           },
           body: JSON.stringify({ ips: ipAddresses }),
         });
+        if (response?.ok) {
+          const locations = (await response.json()) as
+            | { success: true; results: SessionIpData[] }
+            | { success: false; message: string; details?: string };
+
+          if (locations.success) {
+            return sessions.map(
+              (session, i): UserSessionWithLocation => ({
+                ...session,
+                location: locations.results[i],
+              })
+            );
+          }
+        }
       } else if (ENV.IP_API_KEY) {
         const params = new URLSearchParams({
-          fields: 'status,country,countryCode,region,regionName,city,isp,query',
+          fields: 'status,country,countryCode,region,regionName,city,isp,lat,lon,query',
           key: ENV.IP_API_KEY,
         });
 
         response = await fetch(`https://pro.ip-api.com/batch?${params.toString()}`, {
           method: 'POST',
           body: JSON.stringify(ipAddresses),
         });
-      }
-      if (response?.ok) {
-        const locations = (await response.json()) as SessionIpData[];
-        return sessions.map(
-          (session, i): UserSessionWithLocation => ({
-            ...session,
-            location: locations[i],
-          })
-        );
+        if (response?.ok) {
+          const locations = (await response.json()) as SessionIpData[];
+          return sessions.map(
+            (session, i): UserSessionWithLocation => ({
+              ...session,
+              location: locations[i],
+            })
+          );
+        }
       }
     } catch (ex) {
       logger.warn({ ...getErrorMessageAndStackObj(ex) }, 'Error fetching location data for sessions');

diff --git a/libs/auth/types/src/lib/auth-types.ts b/libs/auth/types/src/lib/auth-types.ts
@@ -112,6 +112,8 @@ export interface SessionIpSuccess {
   regionName: string | null;
   city: string | null;
   isp: string | null;
+  lat: number | null;
+  lon: number | null;
   query: string | null;
 }