Refactor: made security plugin a dep for the cloud plugin

Author: cqliu1

x-pack/plugins/cloud/kibana.json

@@ -3,7 +3,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "cloud"],
-  "optionalPlugins": ["usageCollection", "home"],
+  "optionalPlugins": ["usageCollection", "home", "security"],
   "server": true,
   "ui": true
 }

x-pack/plugins/cloud/public/index.ts

@@ -7,7 +7,7 @@
 import { PluginInitializerContext } from '../../../../src/core/public';
 import { CloudPlugin } from './plugin';
 
-export { CloudSetup } from './plugin';
+export { CloudSetup, CloudConfigType } from './plugin';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new CloudPlugin(initializerContext);
 }

x-pack/plugins/cloud/public/plugin.ts

@@ -6,11 +6,13 @@
 
 import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
 import { i18n } from '@kbn/i18n';
+import { SecurityPluginStart } from '../../security/public';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
 import { ELASTIC_SUPPORT_LINK } from '../common/constants';
 import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import { createUserMenuLinks } from './user_menu_links';
 
-interface CloudConfigType {
+export interface CloudConfigType {
   id?: string;
   resetPasswordUrl?: string;
   deploymentUrl?: string;
@@ -22,6 +24,10 @@ interface CloudSetupDependencies {
   home?: HomePublicPluginSetup;
 }
 
+interface CloudStartDependencies {
+  security?: SecurityPluginStart;
+}
+
 export interface CloudSetup {
   cloudId?: string;
   cloudDeploymentUrl?: string;
@@ -33,33 +39,32 @@ export interface CloudSetup {
 
 export class CloudPlugin implements Plugin<CloudSetup> {
   private config!: CloudConfigType;
+  private isCloudEnabled: boolean;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.config = this.initializerContext.config.get<CloudConfigType>();
+    this.isCloudEnabled = false;
   }
 
   public async setup(core: CoreSetup, { home }: CloudSetupDependencies) {
-    const { id, resetPasswordUrl, deploymentUrl, accountUrl, securityUrl } = this.config;
-    const isCloudEnabled = getIsCloudEnabled(id);
+    const { id, resetPasswordUrl, deploymentUrl } = this.config;
+    this.isCloudEnabled = getIsCloudEnabled(id);
 
     if (home) {
-      home.environment.update({ cloud: isCloudEnabled });
-      if (isCloudEnabled) {
+      home.environment.update({ cloud: this.isCloudEnabled });
+      if (this.isCloudEnabled) {
         home.tutorials.setVariable('cloud', { id, resetPasswordUrl });
       }
     }
 
     return {
       cloudId: id,
       cloudDeploymentUrl: deploymentUrl,
-      isCloudEnabled,
-      resetPasswordUrl,
-      accountUrl,
-      securityUrl,
+      isCloudEnabled: this.isCloudEnabled,
     };
   }
 
-  public start(coreStart: CoreStart) {
+  public start(coreStart: CoreStart, { security }: CloudStartDependencies) {
     const { deploymentUrl } = this.config;
     coreStart.chrome.setHelpSupportUrl(ELASTIC_SUPPORT_LINK);
     if (deploymentUrl) {
@@ -71,5 +76,10 @@ export class CloudPlugin implements Plugin<CloudSetup> {
         href: deploymentUrl,
       });
     }
+
+    if (security && this.isCloudEnabled) {
+      const userMenuLinks = createUserMenuLinks(this.config);
+      security.navControlService.setUserMenuLinks(userMenuLinks);
+    }
   }
 }

x-pack/plugins/cloud/public/user_menu_links.tsx

@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { UserMenuLink } from '../../security/public';
+import { CloudConfigType } from '.';
+
+export const createUserMenuLinks = (config: CloudConfigType): UserMenuLink[] => {
+  const { resetPasswordUrl, accountUrl, securityUrl } = config;
+  const userMenuLinks = [] as UserMenuLink[];
+
+  if (resetPasswordUrl) {
+    userMenuLinks.push({
+      label: i18n.translate('xpack.cloud.userMenuLinks.profileLinkText', {
+        defaultMessage: 'Cloud profile',
+      }),
+      iconType: 'logoCloud',
+      href: resetPasswordUrl,
+      order: 100,
+    });
+  }
+
+  if (accountUrl) {
+    userMenuLinks.push({
+      label: i18n.translate('xpack.cloud.userMenuLinks.accountLinkText', {
+        defaultMessage: 'Account',
+      }),
+      iconType: 'gear',
+      href: accountUrl,
+      order: 200,
+    });
+  }
+
+  if (securityUrl) {
+    userMenuLinks.push({
+      label: i18n.translate('xpack.cloud.userMenuLinks.securityLinkText', {
+        defaultMessage: 'Security',
+      }),
+      iconType: 'lock',
+      href: securityUrl,
+      order: 300,
+    });
+  }
+
+  return userMenuLinks;
+};

x-pack/plugins/security/kibana.json

@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "security"],
   "requiredPlugins": ["data", "features", "licensing", "taskManager", "securityOss"],
-  "optionalPlugins": ["home", "management", "usageCollection", "cloud"],
+  "optionalPlugins": ["home", "management", "usageCollection"],
   "server": true,
   "ui": true,
   "requiredBundles": [

x-pack/plugins/security/public/index.ts

@@ -16,6 +16,7 @@ import {
 export { SecurityPluginSetup, SecurityPluginStart };
 export { AuthenticatedUser } from '../common/model';
 export { SecurityLicense, SecurityLicenseFeatures } from '../common/licensing';
+export { UserMenuLink } from '../public/nav_control';
 
 export const plugin: PluginInitializer<
   SecurityPluginSetup,

x-pack/plugins/security/public/mocks.ts

@@ -7,6 +7,7 @@
 import { authenticationMock } from './authentication/index.mock';
 import { createSessionTimeoutMock } from './session/session_timeout.mock';
 import { licenseMock } from '../common/licensing/index.mock';
+import { navControlServiceMock } from './nav_control/index.mock';
 
 function createSetupMock() {
   return {
@@ -15,7 +16,13 @@ function createSetupMock() {
     license: licenseMock.create(),
   };
 }
+function createStartMock() {
+  return {
+    navControlService: navControlServiceMock.createStart(),
+  };
+}
 
 export const securityMock = {
   createSetup: createSetupMock,
+  createStart: createStartMock,
 };

x-pack/plugins/security/public/nav_control/index.mock.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SecurityNavControlServiceStart } from '.';
+
+export const navControlServiceMock = {
+  createStart: (): jest.Mocked<SecurityNavControlServiceStart> => ({
+    getUserMenuLinks$: jest.fn(),
+    setUserMenuLinks: jest.fn(),
+  }),
+};

x-pack/plugins/security/public/nav_control/index.ts

@@ -4,4 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { SecurityNavControlService } from './nav_control_service';
+export { SecurityNavControlService, SecurityNavControlServiceStart } from './nav_control_service';
+export { UserMenuLink } from './nav_control_component';

x-pack/plugins/security/public/nav_control/nav_control_component.scss

@@ -2,8 +2,4 @@
   .euiPopoverTitle {
     text-transform: none;
   }
-
-  .securityNavControlComponent__logoutLink {
-    border-top: $euiBorderThin;
-  }
 }