feat: return sites from db for email login

src/integration/Sites.spec.ts

@@ -220,31 +220,11 @@ describe("Sites Router", () => {
       const expected = {
         siteNames: [
           {
-            lastUpdated: mockUpdatedAt,
             repoName: mockSite,
-            isPrivate: mockPrivate,
-            permissions: mockPermissions,
           },
         ],
       }
 
-      mockGenericAxios.get.mockResolvedValueOnce({
-        data: [
-          {
-            pushed_at: mockUpdatedAt,
-            permissions: mockPermissions,
-            name: mockSite,
-            private: mockPrivate,
-          },
-          {
-            pushed_at: mockUpdatedAt,
-            permissions: mockPermissions,
-            name: mockAdminSite,
-            private: mockPrivate,
-          },
-        ],
-      })
-
       // Act
       const actual = await request(app).get("/")
 

src/routes/v2/authenticated/sites.ts

@@ -128,7 +128,6 @@ export class SitesRouter {
 
     router.get(
       "/",
-      this.statsMiddleware.countGithubSites,
       this.statsMiddleware.countMigratedSites,
       attachReadRouteHandlerWrapper(this.getSites)
     )

src/services/identity/SitesService.ts

@@ -331,6 +331,21 @@ class SitesService {
       })
     )
 
+    // helper type guard
+    // note: empty strings will return false as well
+    const isString = (val: string | undefined): val is string => !!val
+
+    // get sites from DB for email login users
+    if (!isAdminUser && isEmailUser) {
+      const retrievedSitesByEmail = await this.getSitesForEmailUser(userId)
+      const filteredValidSites = retrievedSitesByEmail.filter(isString)
+
+      const repoData: RepositoryData[] = filteredValidSites.map((site) => ({
+        repoName: site,
+      }))
+      return repoData
+    }
+
     const allSites = await Promise.all(
       paramsArr.map(async (params) => {
         const {
@@ -358,25 +373,22 @@ class SitesService {
               isPrivate,
             } as RepositoryData
           })
-          .filter(
-            (repoData) =>
+          .filter((repoData) => {
+            if (!repoData || !repoData.permissions) {
+              return false
+            }
+            return (
               repoData.permissions.push === true &&
               !ISOMER_ADMIN_REPOS.includes(repoData.repoName)
-          )
+            )
+          })
       })
     )
 
     const flattenedAllSites = _.flatten(allSites)
     // Github users are using their own access token, which already filters sites to only those they have write access to
     // Admin users should have access to all sites regardless
-    if (isAdminUser || !isEmailUser) return flattenedAllSites
-
-    // Email users need to have the list of sites filtered to those they have access to in our db, since our centralised token returns all sites
-    const retrievedSitesByEmail = await this.getSitesForEmailUser(userId)
-
-    return flattenedAllSites.filter((repoData) =>
-      retrievedSitesByEmail.includes(repoData.repoName)
-    )
+    return flattenedAllSites
   }
 
   async checkHasAccessForGitHubUser(sessionData: UserWithSiteSessionData) {

src/services/identity/__tests__/SitesService.spec.ts

@@ -916,10 +916,7 @@ describe("SitesService", () => {
 
       const expectedResp: RepositoryData[] = [
         {
-          lastUpdated: repoInfo.pushed_at,
-          permissions: repoInfo.permissions,
           repoName: repoInfo.name,
-          isPrivate: repoInfo.private,
         },
       ]
       MockIsomerAdminsService.getByUserId.mockImplementationOnce(() => null)
@@ -939,7 +936,7 @@ describe("SitesService", () => {
       expect(MockIsomerAdminsService.getByUserId).toHaveBeenCalledWith(
         mockIsomerUserId
       )
-      expect(mockAxios.get).toHaveBeenCalledTimes(3)
+      expect(mockAxios.get).toHaveBeenCalledTimes(0)
       config.set("sites.pageCount", currRepoCount)
       expect(config.get("sites.pageCount")).toBe(currRepoCount)
     })
@@ -968,7 +965,7 @@ describe("SitesService", () => {
       expect(MockUsersService.findSitesByUserId).toHaveBeenCalledWith(
         mockIsomerUserId
       )
-      expect(mockAxios.get).toHaveBeenCalledTimes(3)
+      expect(mockAxios.get).toHaveBeenCalledTimes(0)
       config.set("sites.pageCount", currRepoCount)
       expect(config.get("sites.pageCount")).toBe(currRepoCount)
     })

src/types/repoInfo.ts

@@ -15,10 +15,10 @@ export type GitHubRepositoryData = {
 }
 
 export type RepositoryData = {
-  lastUpdated: GitHubRepositoryData["pushed_at"]
-  permissions: GitHubRepositoryData["permissions"]
+  lastUpdated?: GitHubRepositoryData["pushed_at"]
+  permissions?: GitHubRepositoryData["permissions"]
   repoName: GitHubRepositoryData["name"]
-  isPrivate: GitHubRepositoryData["private"]
+  isPrivate?: GitHubRepositoryData["private"]
 }
 
 type SiteUrlTypes = "staging" | "prod"