From fcf22343fcd3e9b999f4f32e50fd48fc85cc12b9 Mon Sep 17 00:00:00 2001
From: Timothy Sullivan <tsullivan@elastic.co>
Date: Wed, 26 Jun 2024 13:30:44 -0700
Subject: [PATCH 1/2] [Cloud Defend Plugin] Migrate authc.getCurrentUser usage
 to coreContext.security

---
 .../plugins/cloud_defend/server/routes/setup_routes.ts   | 9 ++++-----
 x-pack/plugins/cloud_defend/server/types.ts              | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/cloud_defend/server/routes/setup_routes.ts b/x-pack/plugins/cloud_defend/server/routes/setup_routes.ts
index 1a9ef57ba83c7..6e5106c2df5c2 100644
--- a/x-pack/plugins/cloud_defend/server/routes/setup_routes.ts
+++ b/x-pack/plugins/cloud_defend/server/routes/setup_routes.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from '@kbn/core/server';
-import type { AuthenticatedUser } from '@kbn/security-plugin/common';
+import type { AuthenticatedUser, CoreSetup, Logger } from '@kbn/core/server';
 import type {
   CloudDefendRequestHandlerContext,
   CloudDefendPluginStart,
@@ -33,8 +32,8 @@ export function setupRoutes({
 
   core.http.registerRouteHandlerContext<CloudDefendRequestHandlerContext, typeof PLUGIN_ID>(
     PLUGIN_ID,
-    async (context, request) => {
-      const [, { security, fleet }] = await core.getStartServices();
+    async (context, _request) => {
+      const [_, { fleet }] = await core.getStartServices();
       const coreContext = await context.core;
       await fleet.fleetSetupCompleted();
 
@@ -44,7 +43,7 @@ export function setupRoutes({
         get user() {
           // We want to call getCurrentUser only when needed and only once
           if (!user) {
-            user = security.authc.getCurrentUser(request);
+            user = coreContext.security.authc.getCurrentUser();
           }
           return user;
         },
diff --git a/x-pack/plugins/cloud_defend/server/types.ts b/x-pack/plugins/cloud_defend/server/types.ts
index e6a5d9454ba81..6b341c552f532 100644
--- a/x-pack/plugins/cloud_defend/server/types.ts
+++ b/x-pack/plugins/cloud_defend/server/types.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import type { CloudSetup } from '@kbn/cloud-plugin/server';
+import type { AuthenticatedUser } from '@kbn/core-security-common';
 import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import type {
   IRouter,
@@ -48,7 +49,7 @@ export interface CloudDefendPluginStartDeps {
 }
 
 export interface CloudDefendApiRequestHandlerContext {
-  user: ReturnType<SecurityPluginStart['authc']['getCurrentUser']>;
+  user: AuthenticatedUser | null;
   logger: Logger;
   esClient: IScopedClusterClient;
   soClient: SavedObjectsClientContract;

From 4371d8748b10fd3a96c6feff93dc83b995b68af8 Mon Sep 17 00:00:00 2001
From: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 26 Jun 2024 20:47:00 +0000
Subject: [PATCH 2/2] [CI] Auto-commit changed files from 'node
 scripts/lint_ts_projects --fix'

---
 x-pack/plugins/cloud_defend/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/cloud_defend/tsconfig.json b/x-pack/plugins/cloud_defend/tsconfig.json
index f63d751ec2a44..2e71cfde9128d 100755
--- a/x-pack/plugins/cloud_defend/tsconfig.json
+++ b/x-pack/plugins/cloud_defend/tsconfig.json
@@ -37,7 +37,8 @@
     "@kbn/core-http-router-server-mocks",
     "@kbn/core-elasticsearch-server",
     "@kbn/code-editor",
-    "@kbn/code-editor-mock"
+    "@kbn/code-editor-mock",
+    "@kbn/core-security-common"
   ],
   "exclude": ["target/**/*"]
 }