feat: sync orgs from webapp to desktop app

sync orgs and groups to desktop - require re-auth

This only syncs net-new orgs and does not attempt to merge anything

Author: paustint

apps/api/src/app/controllers/desktop-app.controller.ts

@@ -71,6 +71,13 @@ export const routeDefinition = {
       hasSourceOrg: false,
     } satisfies RouteValidator,
   },
+  getOrgs: {
+    controllerFn: () => getOrgs,
+    responseType: z.any(),
+    validators: {
+      hasSourceOrg: false,
+    } satisfies RouteValidator,
+  },
   dataSyncPull: {
     controllerFn: () => dataSyncPull,
     responseType: z.any(),
@@ -209,6 +216,17 @@ const logout = createRoute(routeDefinition.logout.validators, async ({ user }, _
   }
 });
 
+const getOrgs = createRoute(routeDefinition.getOrgs.validators, async ({ user }, _, res, next) => {
+  try {
+    const orgs = await salesforceOrgsDb.findByUserId(user.id);
+    const organizations = await orgGroupsDb.findByUserId({ userId: user.id });
+
+    sendJson(res, { orgs, organizations });
+  } catch (ex) {
+    next(new UserFacingError(ex));
+  }
+});
+
 const dataSyncPull = createRoute(routeDefinition.dataSyncPull.validators, async ({ user, query }, _, res) => {
   const { lastKey, updatedAt, limit } = query;
   const response = await userSyncDbService.findByUpdatedAt({

apps/api/src/app/routes/desktop-app.routes.ts

@@ -78,6 +78,8 @@ routes.delete('/auth/logout', STRICT_AuthRateLimit, authMiddleware, desktopAppCo
 /**
  * Other Routes
  */
+routes.get('/orgs', authMiddleware, desktopAppController.routeDefinition.getOrgs.controllerFn());
+
 routes.get('/data-sync/pull', authMiddleware, desktopAppController.routeDefinition.dataSyncPull.controllerFn());
 routes.post('/data-sync/push', authMiddleware, desktopAppController.routeDefinition.dataSyncPush.controllerFn());
 

apps/jetstream-desktop/src/controllers/jetstream-data-sync.desktop.controller.ts

@@ -2,8 +2,7 @@ import { HTTP } from '@jetstream/shared/constants';
 import { app } from 'electron';
 import { z } from 'zod';
 import { ENV } from '../config/environment';
-import { getAppData } from '../services/persistence.service';
-import { createRoute, handleErrorResponse, RouteValidator } from '../utils/route.utils';
+import { createRoute, getTokens, handleErrorResponse, RouteValidator } from '../utils/route.utils';
 
 /**
  * FIXME: this file needs to be worked on
@@ -27,16 +26,6 @@ export const routeDefinition = {
   },
 };
 
-function getTokens() {
-  const { accessToken, deviceId } = getAppData();
-
-  if (!accessToken || !deviceId) {
-    throw new Error('Unauthorized');
-  }
-
-  return { authTokens: { accessToken }, extIdentifier: { id: deviceId } };
-}
-
 const pull = createRoute(routeDefinition.pull.validators, async ({ query }) => {
   try {
     const { authTokens, extIdentifier } = getTokens();

apps/jetstream-desktop/src/controllers/orgs.desktop.controller.ts

@@ -1,9 +1,12 @@
 import { ApiRequestError } from '@jetstream/salesforce-api';
-import { ERROR_MESSAGES } from '@jetstream/shared/constants';
-import { SObjectOrganization } from '@jetstream/types';
+import { ERROR_MESSAGES, HTTP } from '@jetstream/shared/constants';
+import { OrgsWithGroupResponse, SObjectOrganization } from '@jetstream/types';
+import { app } from 'electron';
+import logger from 'electron-log';
 import { z } from 'zod';
+import { ENV } from '../config/environment';
 import * as dataService from '../services/persistence.service';
-import { createRoute, handleErrorResponse, handleJsonResponse, RouteValidator } from '../utils/route.utils';
+import { createRoute, getTokens, handleErrorResponse, handleJsonResponse, RouteValidator } from '../utils/route.utils';
 
 export const routeDefinition = {
   getOrgs: {
@@ -52,7 +55,30 @@ export const routeDefinition = {
 
 const getOrgs = createRoute(routeDefinition.getOrgs.validators, async ({}) => {
   try {
-    const orgs = dataService.getSalesforceOrgs().map((org) => ({ ...org, accessToken: undefined }));
+    const { authTokens, extIdentifier } = getTokens();
+
+    const webAppOrgs = await fetch(`${ENV.SERVER_URL}/desktop-app/orgs`, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${authTokens?.accessToken}`,
+        [HTTP.HEADERS.X_EXT_DEVICE_ID]: extIdentifier.id,
+        [HTTP.HEADERS.X_APP_VERSION]: app.getVersion(),
+      },
+    })
+      .then(async (res) => {
+        if (!res.ok) {
+          logger.warn('Failed to fetch orgs from web app', { error: await res.text().catch(() => 'Unable to read response body') });
+          return null;
+        }
+        return (res.json() as Promise<{ data: OrgsWithGroupResponse }>).then(({ data }) => data);
+      })
+      .catch((ex) => {
+        logger.warn('Failed to fetch orgs from web app', { error: ex });
+        return null;
+      });
+
+    const orgs = dataService.mergeWebAppOrgsWithDesktopOrgs(webAppOrgs).map((org) => ({ ...org, accessToken: undefined }));
 
     return handleJsonResponse(orgs);
   } catch (ex) {

apps/jetstream-desktop/src/controllers/user.desktop.controller.ts

@@ -4,7 +4,7 @@ import { app } from 'electron';
 import { z } from 'zod';
 import { ENV } from '../config/environment';
 import * as dataService from '../services/persistence.service';
-import { createRoute, handleErrorResponse, handleJsonResponse, RouteValidator } from '../utils/route.utils';
+import { createRoute, getTokens, handleErrorResponse, handleJsonResponse, RouteValidator } from '../utils/route.utils';
 
 export const routeDefinition = {
   getUserProfile: {
@@ -59,16 +59,6 @@ const updateProfile = createRoute(routeDefinition.updateProfile.validators, asyn
   }
 });
 
-function getTokens() {
-  const { accessToken, deviceId } = dataService.getAppData();
-
-  if (!accessToken || !deviceId) {
-    throw new Error('Unauthorized');
-  }
-
-  return { authTokens: { accessToken }, extIdentifier: { id: deviceId } };
-}
-
 const sendUserFeedbackEmail = createRoute(routeDefinition.sendUserFeedbackEmail.validators, async ({}, req) => {
   try {
     const { authTokens, extIdentifier } = getTokens();