Merge branch 'main' into oauth

CrowdDotDev · Jul 10, 2023 · 85dbc7e · 85dbc7e
2 parents 4ad459b + e4d3bfd
commit 85dbc7e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/backend/src/services/memberService.ts b/backend/src/services/memberService.ts
@@ -327,6 +327,27 @@ export default class MemberService extends LoggerBase {
             organizationsIds.push(organizationRecord.id)
           }
         }
+
+        // Auto assign member to organization if email domain matches
+        if (data.emails) {
+          const emailDomains = new Set()
+
+          // Collect unique domains
+          for (const email of data.emails) {
+            const domain = email.split('@')[1]
+            emailDomains.add(domain)
+          }
+
+          // Fetch organization ids for these domains
+          const organizationService = new OrganizationService(this.options)
+          for (const domain of emailDomains) {
+            const organizationRecord = await organizationService.findByUrl(domain)
+            if (organizationRecord) {
+              organizationsIds.push(organizationRecord.id)
+            }
+          }
+        }
+
         // Remove dups
         data.organizations = [...new Set(organizationsIds)]
       }

diff --git a/backend/src/services/organizationService.ts b/backend/src/services/organizationService.ts
@@ -192,6 +192,10 @@ export default class OrganizationService extends LoggerBase {
     return OrganizationRepository.findAndCountAll(args, this.options)
   }
 
+  async findByUrl(url) {
+    return OrganizationRepository.findByUrl(url, this.options)
+  }
+
   async query(data) {
     const advancedFilter = data.filter
     const orderBy = data.orderBy

diff --git a/frontend/src/modules/layout/components/layout.vue b/frontend/src/modules/layout/components/layout.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container>
     <app-menu />
-    <el-container :style="elMainStyle">
+    <el-container v-if="currentTenant" :style="elMainStyle">
       <el-main id="main-page-wrapper" class="relative">
         <div
           :class="{

diff --git a/services/apps/data_sink_worker/src/repo/dataSink.repo.ts b/services/apps/data_sink_worker/src/repo/dataSink.repo.ts
@@ -65,20 +65,10 @@ export default class DataSinkRepository extends RepositoryBase<DataSinkRepositor
     this.checkUpdateRowCount(result.rowCount, 1)
   }
 
-  public async markResultProcessed(resultId: string): Promise<void> {
-    const result = await this.db().result(
-      `update integration.results
-       set  state = $(state),
-            "processedAt" = now(),
-            "updatedAt" = now()
-       where id = $(resultId)`,
-      {
-        resultId,
-        state: IntegrationResultState.PROCESSED,
-      },
-    )
-
-    this.checkUpdateRowCount(result.rowCount, 1)
+  public async deleteResult(resultId: string): Promise<void> {
+    await this.db().none(`delete from integration.results where id = $(resultId)`, {
+      resultId,
+    })
   }
 
   public async touchRun(runId: string): Promise<void> {

diff --git a/services/apps/data_sink_worker/src/service/dataSink.service.ts b/services/apps/data_sink_worker/src/service/dataSink.service.ts
@@ -100,7 +100,7 @@ export default class DataSinkService extends LoggerBase {
           throw new Error(`Unknown result type: ${data.type}`)
         }
       }
-      await this.repo.markResultProcessed(resultId)
+      await this.repo.deleteResult(resultId)
     } catch (err) {
       this.log.error(err, 'Error processing result.')
       await this.triggerResultError(