Merge pull request #1072 from rocket-admin/backend_company_custom_domain

Artuomka · web-flow · commit 52f9407704da · 2025-03-12T16:55:32.000+02:00
Add custom domain support to company info data structures
diff --git a/backend/src/entities/company-info/application/data-structures/found-company-info.ds.ts b/backend/src/entities/company-info/application/data-structures/found-company-info.ds.ts
@@ -69,6 +69,9 @@ export class FoundUserCompanyInfoDs {
 
   @ApiProperty()
   show_test_connections: boolean;
+
+  @ApiProperty({ required: false })
+  custom_domain: string | null;
 }
 
 export class FoundUserFullCompanyInfoDs extends FoundUserCompanyInfoDs {
diff --git a/backend/src/entities/company-info/use-cases/get-full-user-company-info.use.case.ts b/backend/src/entities/company-info/use-cases/get-full-user-company-info.use.case.ts
@@ -67,6 +67,7 @@ export class GetUserCompanyFullInfoUseCase
 
     let foundUserCompanySaasInfo = null;
 
+    let customDomain = null;
     if (isSaaS()) {
       foundUserCompanySaasInfo = await this.saasCompanyGatewayService.getCompanyInfo(foundFullUserCoreCompanyInfo.id);
       if (!foundUserCompanySaasInfo) {
@@ -77,12 +78,18 @@ export class GetUserCompanyFullInfoUseCase
           HttpStatus.NOT_FOUND,
         );
       }
+      customDomain = await this.saasCompanyGatewayService.getCompanyCustomDomainById(foundCompanyInfoByUserId.id);
     }
 
     if (foundUser.role === UserRoleEnum.ADMIN) {
-      return buildFoundCompanyFullInfoDs(foundFullUserCoreCompanyInfo, foundUserCompanySaasInfo, foundUser.role);
+      return buildFoundCompanyFullInfoDs(
+        foundFullUserCoreCompanyInfo,
+        foundUserCompanySaasInfo,
+        foundUser.role,
+        customDomain,
+      );
     }
 
-    return buildFoundCompanyInfoDs(foundFullUserCoreCompanyInfo, foundUserCompanySaasInfo);
+    return buildFoundCompanyInfoDs(foundFullUserCoreCompanyInfo, foundUserCompanySaasInfo, customDomain);
   }
 }
diff --git a/backend/src/entities/company-info/use-cases/get-user-company.use.case.ts b/backend/src/entities/company-info/use-cases/get-user-company.use.case.ts
@@ -32,6 +32,7 @@ export class GetUserCompanyUseCase extends AbstractUseCase<string, FoundUserComp
     }
 
     let foundUserCompanySaasInfo = null;
+    let customDomain = null;
     if (isSaaS()) {
       foundUserCompanySaasInfo = await this.saasCompanyGatewayService.getCompanyInfo(foundUserCoreCompanyInfo.id);
       if (!foundUserCompanySaasInfo) {
@@ -42,7 +43,8 @@ export class GetUserCompanyUseCase extends AbstractUseCase<string, FoundUserComp
           HttpStatus.NOT_FOUND,
         );
       }
+      customDomain = await this.saasCompanyGatewayService.getCompanyCustomDomainById(foundUserCoreCompanyInfo.id);
     }
-    return buildFoundCompanyInfoDs(foundUserCoreCompanyInfo, foundUserCompanySaasInfo);
+    return buildFoundCompanyInfoDs(foundUserCoreCompanyInfo, foundUserCompanySaasInfo, customDomain);
   }
 }
diff --git a/backend/src/entities/company-info/utils/build-found-company-info-ds.ts b/backend/src/entities/company-info/utils/build-found-company-info-ds.ts
@@ -13,13 +13,19 @@ export function buildFoundCompanyFullInfoDs(
   companyInfoFromCore: CompanyInfoEntity,
   companyInfoFromSaas: FoundSassCompanyInfoDS | null,
   userRole: UserRoleEnum,
+  companyCustomDomain: string | null,
 ): FoundUserFullCompanyInfoDs {
   if (!companyInfoFromCore.show_test_connections) {
     companyInfoFromCore.connections = companyInfoFromCore.connections.filter(
       (connection) => !connection.isTestConnection,
     );
   }
-  const responseObject = buildFoundCompanyInfoDs(companyInfoFromCore, companyInfoFromSaas, userRole) as any;
+  const responseObject = buildFoundCompanyInfoDs(
+    companyInfoFromCore,
+    companyInfoFromSaas,
+    companyCustomDomain,
+    userRole,
+  ) as any;
   const connectionsRO: Array<FoundSipleConnectionInfoDS> = companyInfoFromCore.connections.map((connection) => {
     return {
       id: connection.id,
@@ -57,6 +63,7 @@ export function buildFoundCompanyFullInfoDs(
 export function buildFoundCompanyInfoDs(
   companyInfoFromCore: CompanyInfoEntity,
   companyInfoFromSaas: FoundSassCompanyInfoDS | null,
+  companyCustomDomain: string,
   userRole?: UserRoleEnum,
 ): FoundUserCompanyInfoDs {
   if (!companyInfoFromSaas) {
@@ -65,6 +72,7 @@ export function buildFoundCompanyInfoDs(
       name: companyInfoFromCore.name,
       is2faEnabled: companyInfoFromCore.is2faEnabled,
       show_test_connections: companyInfoFromCore.show_test_connections,
+      custom_domain: companyCustomDomain ? companyCustomDomain : null,
     };
   }
   const isUserAdmin = userRole === UserRoleEnum.ADMIN;
@@ -77,6 +85,7 @@ export function buildFoundCompanyInfoDs(
     is_payment_method_added: isUserAdmin ? companyInfoFromSaas.is_payment_method_added : undefined,
     is2faEnabled: isUserAdmin ? companyInfoFromCore.is2faEnabled : undefined,
     show_test_connections: companyInfoFromCore.show_test_connections,
+    custom_domain: companyCustomDomain ? companyCustomDomain : null,
     address: {
       id: companyInfoFromSaas.address?.id,
       city: companyInfoFromSaas.address?.city,
diff --git a/backend/test/ava-tests/non-saas-tests/non-saas-company-info-e2e.test.ts b/backend/test/ava-tests/non-saas-tests/non-saas-company-info-e2e.test.ts
@@ -81,7 +81,7 @@ test.serial(`${currentTest} should return found company info for user`, async (t
     const foundCompanyInfoRO = JSON.parse(foundCompanyInfo.text);
     t.is(foundCompanyInfoRO.hasOwnProperty('id'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('name'), true);
-    t.is(Object.keys(foundCompanyInfoRO).length, 4);
+    t.is(Object.keys(foundCompanyInfoRO).length, 5);
   } catch (error) {
     console.error(error);
   }
@@ -121,7 +121,7 @@ test.serial(`${currentTest} should return full found company info for company ad
     t.is(foundCompanyInfo.status, 200);
     t.is(foundCompanyInfoRO.hasOwnProperty('id'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('name'), true);
-    t.is(Object.keys(foundCompanyInfoRO).length, 6);
+    t.is(Object.keys(foundCompanyInfoRO).length, 7);
     t.is(foundCompanyInfoRO.hasOwnProperty('connections'), true);
     t.is(foundCompanyInfoRO.connections.length > 3, true);
     t.is(foundCompanyInfoRO.hasOwnProperty('invitations'), true);
@@ -175,7 +175,7 @@ test.serial(`${currentTest} should return found company info for non-admin user`
     t.is(foundCompanyInfo.status, 200);
     t.is(foundCompanyInfoRO.hasOwnProperty('id'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('name'), true);
-    t.is(Object.keys(foundCompanyInfoRO).length, 4);
+    t.is(Object.keys(foundCompanyInfoRO).length, 5);
   } catch (error) {
     console.error(error);
     throw error;
diff --git a/backend/test/ava-tests/saas-tests/company-info-e2e.test.ts b/backend/test/ava-tests/saas-tests/company-info-e2e.test.ts
@@ -81,7 +81,7 @@ test.serial(`${currentTest} should return found company info for user`, async (t
 
     t.is(foundCompanyInfo.status, 200);
     const foundCompanyInfoRO = JSON.parse(foundCompanyInfo.text);
-    t.is(Object.keys(foundCompanyInfoRO).length, 8);
+    t.is(Object.keys(foundCompanyInfoRO).length, 9);
     t.is(foundCompanyInfoRO.hasOwnProperty('id'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('name'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('additional_info'), true);
@@ -122,7 +122,7 @@ test.serial(`${currentTest} should return full found company info for company ad
     t.is(foundCompanyInfoRO.hasOwnProperty('address'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('createdAt'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('updatedAt'), true);
-    t.is(Object.keys(foundCompanyInfoRO).length, 13);
+    t.is(Object.keys(foundCompanyInfoRO).length, 14);
     t.is(foundCompanyInfoRO.hasOwnProperty('connections'), true);
     t.is(foundCompanyInfoRO.connections.length > 3, true);
     t.is(foundCompanyInfoRO.hasOwnProperty('invitations'), true);
@@ -174,7 +174,7 @@ test.serial(`${currentTest} should return found company info for non-admin user`
     const foundCompanyInfoRO = JSON.parse(foundCompanyInfo.text);
 
     t.is(foundCompanyInfo.status, 200);
-    t.is(Object.keys(foundCompanyInfoRO).length, 8);
+    t.is(Object.keys(foundCompanyInfoRO).length, 9);
     t.is(foundCompanyInfoRO.hasOwnProperty('id'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('name'), true);
     t.is(foundCompanyInfoRO.hasOwnProperty('additional_info'), true);
diff --git a/backend/test/ava-tests/saas-tests/custom-domains-e2e.test.ts b/backend/test/ava-tests/saas-tests/custom-domains-e2e.test.ts
@@ -200,6 +200,17 @@ test.serial(`${currentTest} - should return found custom domain`, async (t) => {
     t.is(domainInfo.hasOwnProperty('id'), true);
     t.is(domainInfo.hasOwnProperty('createdAt'), true);
     t.is(Object.keys(domainInfo).length, 5);
+
+    const foundCompanyFullInfoResponse = await request(app.getHttpServer())
+      .get('/company/my/full')
+      .set('Content-Type', 'application/json')
+      .set('Cookie', simpleUserToken)
+      .set('Accept', 'application/json');
+
+    t.is(foundCompanyFullInfoResponse.status, 200);
+    const foundCompanyFullInfoResponseRO = JSON.parse(foundCompanyFullInfoResponse.text);
+    t.is(foundCompanyFullInfoResponseRO.hasOwnProperty('custom_domain'), true);
+    t.is(foundCompanyFullInfoResponseRO.custom_domain, requestDomainData.hostname);
   } catch (error) {
     t.fail(error.message);
   }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ export class FoundUserCompanyInfoDs {`
`69`	`69`
`70`	`70`	`@ApiProperty()`
`71`	`71`	`show_test_connections: boolean;`
	`72`	`+`
	`73`	`+ @ApiProperty({ required: false })`
	`74`	`+ custom_domain: string \| null;`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`export class FoundUserFullCompanyInfoDs extends FoundUserCompanyInfoDs {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ export class GetUserCompanyFullInfoUseCase`
`67`	`67`
`68`	`68`	`let foundUserCompanySaasInfo = null;`
`69`	`69`
	`70`	`+ let customDomain = null;`
`70`	`71`	`if (isSaaS()) {`
`71`	`72`	`foundUserCompanySaasInfo = await this.saasCompanyGatewayService.getCompanyInfo(foundFullUserCoreCompanyInfo.id);`
`72`	`73`	`if (!foundUserCompanySaasInfo) {`
`@@ -77,12 +78,18 @@ export class GetUserCompanyFullInfoUseCase`
`77`	`78`	`HttpStatus.NOT_FOUND,`
`78`	`79`	`);`
`79`	`80`	`}`
	`81`	`+ customDomain = await this.saasCompanyGatewayService.getCompanyCustomDomainById(foundCompanyInfoByUserId.id);`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`if (foundUser.role === UserRoleEnum.ADMIN) {`
`83`		`- return buildFoundCompanyFullInfoDs(foundFullUserCoreCompanyInfo, foundUserCompanySaasInfo, foundUser.role);`
	`85`	`+ return buildFoundCompanyFullInfoDs(`
	`86`	`+ foundFullUserCoreCompanyInfo,`
	`87`	`+ foundUserCompanySaasInfo,`
	`88`	`+ foundUser.role,`
	`89`	`+ customDomain,`
	`90`	`+ );`
`84`	`91`	`}`
`85`	`92`
`86`		`- return buildFoundCompanyInfoDs(foundFullUserCoreCompanyInfo, foundUserCompanySaasInfo);`
	`93`	`+ return buildFoundCompanyInfoDs(foundFullUserCoreCompanyInfo, foundUserCompanySaasInfo, customDomain);`
`87`	`94`	`}`
`88`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ export class GetUserCompanyUseCase extends AbstractUseCase<string, FoundUserComp`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`let foundUserCompanySaasInfo = null;`
	`35`	`+ let customDomain = null;`
`35`	`36`	`if (isSaaS()) {`
`36`	`37`	`foundUserCompanySaasInfo = await this.saasCompanyGatewayService.getCompanyInfo(foundUserCoreCompanyInfo.id);`
`37`	`38`	`if (!foundUserCompanySaasInfo) {`
`@@ -42,7 +43,8 @@ export class GetUserCompanyUseCase extends AbstractUseCase<string, FoundUserComp`
`42`	`43`	`HttpStatus.NOT_FOUND,`
`43`	`44`	`);`
`44`	`45`	`}`
	`46`	`+ customDomain = await this.saasCompanyGatewayService.getCompanyCustomDomainById(foundUserCoreCompanyInfo.id);`
`45`	`47`	`}`
`46`		`- return buildFoundCompanyInfoDs(foundUserCoreCompanyInfo, foundUserCompanySaasInfo);`
	`48`	`+ return buildFoundCompanyInfoDs(foundUserCoreCompanyInfo, foundUserCompanySaasInfo, customDomain);`
`47`	`49`	`}`
`48`	`50`	`}`