Add spaceID

elastic · Nov 8, 2022 · c97cd5b · c97cd5b
1 parent 540e4b4
commit c97cd5b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 2 deletions.
diff --git a/x-pack/plugins/cases/server/client/factory.ts b/x-pack/plugins/cases/server/client/factory.ts
@@ -117,6 +117,7 @@ export class CasesClientFactory {
     const services = this.createServices({
       unsecuredSavedObjectsClient,
       esClient: scopedClusterClient,
+      request,
     });
 
     const userInfo = await this.getUserInfo(request);
@@ -146,9 +147,11 @@ export class CasesClientFactory {
   private createServices({
     unsecuredSavedObjectsClient,
     esClient,
+    request,
   }: {
     unsecuredSavedObjectsClient: SavedObjectsClientContract;
     esClient: ElasticsearchClient;
+    request: KibanaRequest;
   }): CasesServices {
     this.validateInitialization();
 
@@ -178,6 +181,7 @@ export class CasesClientFactory {
       notifications: this.options.notifications,
       security: this.options.securityPluginStart,
       publicBaseUrl: this.options.publicBaseUrl,
+      spaceId: this.options.spacesPluginStart.spacesService.getSpaceId(request),
     });
 
     return {

diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
@@ -146,6 +146,7 @@ export const createCasesClientMockArgs = () => {
       full_name: 'Damaged Raccoon',
       profile_uid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0',
     },
+    spaceId: 'default',
     externalReferenceAttachmentTypeRegistry: createExternalReferenceAttachmentTypeRegistryMock(),
     persistableStateAttachmentTypeRegistry: createPersistableStateAttachmentTypeRegistryMock(),
     securityStartPlugin: securityMock.createStart(),

diff --git a/x-pack/plugins/cases/server/services/notifications/email_notification_service.test.ts b/x-pack/plugins/cases/server/services/notifications/email_notification_service.test.ts
@@ -30,6 +30,7 @@ describe('EmailNotificationService', () => {
       security: clientArgs.securityStartPlugin,
       publicBaseUrl: 'https://example.com',
       notifications,
+      spaceId: 'default',
     });
   });
 
@@ -130,11 +131,43 @@ describe('EmailNotificationService', () => {
     });
   });
 
+  it('adds a backlink URL correctly with spaceId', async () => {
+    emailNotificationService = new EmailNotificationService({
+      logger: clientArgs.logger,
+      security: clientArgs.securityStartPlugin,
+      publicBaseUrl: 'https://example.com',
+      notifications,
+      spaceId: 'test-space',
+    });
+
+    await emailNotificationService.notifyAssignees({
+      assignees,
+      theCase: caseSO,
+    });
+
+    expect(notifications.getEmailService().sendPlainTextEmail).toHaveBeenCalledWith({
+      context: {
+        relatedObjects: [
+          {
+            id: 'mock-id-1',
+            namespace: undefined,
+            type: 'cases',
+          },
+        ],
+      },
+      message:
+        'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/s/test-space/app/security/cases/mock-id-1)',
+      subject: '[Elastic][Cases] Super Bad Security Issue',
+      to: ['damaged_raccoon@elastic.co', 'physical_dinosaur@elastic.co', 'wet_dingo@elastic.co'],
+    });
+  });
+
   it('does not include the backlink of the publicBaseUrl is not defined', async () => {
     emailNotificationService = new EmailNotificationService({
       logger: clientArgs.logger,
       security: clientArgs.securityStartPlugin,
       notifications,
+      spaceId: 'default',
     });
 
     await emailNotificationService.notifyAssignees({

diff --git a/x-pack/plugins/cases/server/services/notifications/email_notification_service.ts b/x-pack/plugins/cases/server/services/notifications/email_notification_service.ts
@@ -23,30 +23,38 @@ export class EmailNotificationService implements NotificationService {
   private readonly logger: Logger;
   private readonly notifications: NotificationsPluginStart;
   private readonly security: SecurityPluginStart;
+  private readonly spaceId: string;
   private readonly publicBaseUrl?: IBasePath['publicBaseUrl'];
 
   constructor({
     logger,
     notifications,
     security,
     publicBaseUrl,
+    spaceId,
   }: {
     logger: Logger;
     notifications: NotificationsPluginStart;
     security: SecurityPluginStart;
+    spaceId: string;
     publicBaseUrl?: IBasePath['publicBaseUrl'];
   }) {
     this.logger = logger;
     this.notifications = notifications;
     this.security = security;
+    this.spaceId = spaceId;
     this.publicBaseUrl = publicBaseUrl;
   }
 
   private static getTitle(theCase: CaseSavedObject) {
     return `[Elastic][Cases] ${theCase.attributes.title}`;
   }
 
-  private static getMessage(theCase: CaseSavedObject, publicBaseUrl?: IBasePath['publicBaseUrl']) {
+  private static getMessage(
+    theCase: CaseSavedObject,
+    spaceId: string,
+    publicBaseUrl?: IBasePath['publicBaseUrl']
+  ) {
     const lineBreak = '\r\n\r\n';
     let message = `You are assigned to an Elastic Kibana Case.${lineBreak}`;
     message = `${message}Title: ${theCase.attributes.title}${lineBreak}`;
@@ -62,6 +70,7 @@ export class EmailNotificationService implements NotificationService {
         publicBaseUrl,
         caseId: theCase.id,
         owner: theCase.attributes.owner,
+        spaceId,
       });
 
       message = `${message}${lineBreak}[View the case details](${caseUrl})`;
@@ -86,7 +95,11 @@ export class EmailNotificationService implements NotificationService {
         .map((user) => user.email);
 
       const subject = EmailNotificationService.getTitle(theCase);
-      const message = EmailNotificationService.getMessage(theCase, this.publicBaseUrl);
+      const message = EmailNotificationService.getMessage(
+        theCase,
+        this.spaceId,
+        this.publicBaseUrl
+      );
 
       await this.notifications.getEmailService().sendPlainTextEmail({
         to,