From c4f12ae883ee9035389846fe30d8233b1d605c72 Mon Sep 17 00:00:00 2001
From: Kurt <kc13greiner@users.noreply.github.com>
Date: Wed, 10 Jul 2024 14:26:34 -0400
Subject: [PATCH 1/3] TS fixes: adding Type where needed

---
 .../src/user_profiles_selectable.tsx          | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/packages/kbn-user-profile-components/src/user_profiles_selectable.tsx b/packages/kbn-user-profile-components/src/user_profiles_selectable.tsx
index 5d2b6c5457727..0f046413a67f9 100644
--- a/packages/kbn-user-profile-components/src/user_profiles_selectable.tsx
+++ b/packages/kbn-user-profile-components/src/user_profiles_selectable.tsx
@@ -264,11 +264,8 @@ export const UserProfilesSelectable = <Option extends UserProfileWithAvatar | nu
   return (
     <EuiSelectable
       data-test-subj={props['data-test-subj']}
-      // @ts-expect-error upgrade typescript v5.1.6
       options={displayedOptions}
-      onChange={(
-        nextOptions: Array<EuiSelectableOption<{ data: Partial<UserProfileWithAvatar> }>>
-      ) => {
+      onChange={(nextOptions: SelectableOption[]) => {
         if (!onChange) {
           return;
         }
@@ -330,34 +327,27 @@ export const UserProfilesSelectable = <Option extends UserProfileWithAvatar | nu
       noMatchesMessage={noMatchesMessage}
       emptyMessage={emptyMessage}
       errorMessage={errorMessage}
-      renderOption={(option, searchValue) => {
-        // @ts-expect-error upgrade typescript v5.1.6
+      renderOption={(option: SelectableOption, searchValue) => {
         if (option.user) {
-          // @ts-expect-error upgrade typescript v5.1.6
           const displayName = getUserDisplayName(option.user);
           return (
             <>
               <div className="eui-textTruncate">
                 <EuiHighlight search={searchValue}>{displayName}</EuiHighlight>
               </div>
-              {
-                /* @ts-expect-error upgrade typescript v5.1.6 */
-                option.user.email && option.user.email !== displayName ? (
-                  <EuiText
-                    size={'xs'}
-                    color={option.disabled ? 'disabled' : 'subdued'}
-                    className="eui-textTruncate"
-                  >
-                    {searchValue ? (
-                      /* @ts-expect-error upgrade typescript v5.1.6 */
-                      <EuiHighlight search={searchValue}>{option.user.email}</EuiHighlight>
-                    ) : (
-                      /* @ts-expect-error upgrade typescript v5.1.6 */
-                      option.user.email
-                    )}
-                  </EuiText>
-                ) : undefined
-              }
+              {option.user.email && option.user.email !== displayName ? (
+                <EuiText
+                  size={'xs'}
+                  color={option.disabled ? 'disabled' : 'subdued'}
+                  className="eui-textTruncate"
+                >
+                  {searchValue ? (
+                    <EuiHighlight search={searchValue}>{option.user.email}</EuiHighlight>
+                  ) : (
+                    option.user.email
+                  )}
+                </EuiText>
+              ) : undefined}
             </>
           );
         }

From 196d905f29d1feab8d7dfae5dc2a086641438610 Mon Sep 17 00:00:00 2001
From: Kurt <kc13greiner@users.noreply.github.com>
Date: Wed, 10 Jul 2024 21:52:57 -0400
Subject: [PATCH 2/3] Fixing other TS errors in Security files

---
 .../security/server/authentication/providers/anonymous.ts  | 6 ++----
 x-pack/plugins/security/server/lib/flatten_object.ts       | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
index 39ce2f2686185..5c0440a32dcba 100644
--- a/x-pack/plugins/security/server/authentication/providers/anonymous.ts
+++ b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
@@ -105,10 +105,8 @@ export class AnonymousAuthenticationProvider extends BaseAuthenticationProvider
     return new HTTPAuthorizationHeader(
       'Basic',
       new BasicHTTPAuthorizationHeaderCredentials(
-        // @ts-expect-error upgrade typescript v5.1.6
-        credentials.username,
-        // @ts-expect-error upgrade typescript v5.1.6
-        credentials.password
+        (credentials as UsernameAndPasswordCredentials).username,
+        (credentials as UsernameAndPasswordCredentials).password
       ).toString()
     );
   }
diff --git a/x-pack/plugins/security/server/lib/flatten_object.ts b/x-pack/plugins/security/server/lib/flatten_object.ts
index 043414296907d..63ea26542709c 100644
--- a/x-pack/plugins/security/server/lib/flatten_object.ts
+++ b/x-pack/plugins/security/server/lib/flatten_object.ts
@@ -10,7 +10,7 @@ import { compact, isObject } from 'lodash';
 // Inspired by x-pack/plugins/observability_solution/apm/public/utils/flatten_object.ts
 // Slighly modified to have key/value exposed as Object.
 export const flattenObject = (
-  item: Record<any, any | any[]> | null | undefined,
+  item: Record<any, unknown | unknown[]> | null | undefined,
   accDefault: Record<string, any> = {},
   parentKey?: string
 ): Record<string, any> => {
@@ -22,12 +22,9 @@ export const flattenObject = (
         const childKey = isArrayWithSingleValue ? '' : key;
         const currentKey = compact([parentKey, childKey]).join('.');
         // item[key] can be a primitive (string, number, boolean, null, undefined) or Object or Array
-        // @ts-expect-error upgrade typescript v5.1.6
         if (isObject(item[key])) {
-          // @ts-expect-error upgrade typescript v5.1.6
-          flattenObject(item[key], acc, currentKey);
+          flattenObject(item[key] as any, acc, currentKey);
         } else {
-          // @ts-expect-error upgrade typescript v5.1.6
           acc[currentKey] = item[key];
         }
 

From f7cc8c05162c63a370f8bc3fa247a5eab3faa90e Mon Sep 17 00:00:00 2001
From: Kurt <kc13greiner@users.noreply.github.com>
Date: Thu, 11 Jul 2024 14:37:21 -0400
Subject: [PATCH 3/3] PR feedback

---
 .../authentication/providers/anonymous.ts     |  6 +++---
 .../security/server/lib/flatten_object.ts     | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
index 5c0440a32dcba..fdd2e1e5f1f2f 100644
--- a/x-pack/plugins/security/server/authentication/providers/anonymous.ts
+++ b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
@@ -57,7 +57,7 @@ function isAPIKeyCredentials(
     | ElasticsearchAnonymousUserCredentials
     | APIKeyCredentials
     | UsernameAndPasswordCredentials
-): credentials is APIKeyCredentials {
+): credentials is Readonly<APIKeyCredentials> {
   return !!(credentials as APIKeyCredentials).apiKey;
 }
 
@@ -105,8 +105,8 @@ export class AnonymousAuthenticationProvider extends BaseAuthenticationProvider
     return new HTTPAuthorizationHeader(
       'Basic',
       new BasicHTTPAuthorizationHeaderCredentials(
-        (credentials as UsernameAndPasswordCredentials).username,
-        (credentials as UsernameAndPasswordCredentials).password
+        credentials.username,
+        credentials.password
       ).toString()
     );
   }
diff --git a/x-pack/plugins/security/server/lib/flatten_object.ts b/x-pack/plugins/security/server/lib/flatten_object.ts
index 63ea26542709c..61a300f17851a 100644
--- a/x-pack/plugins/security/server/lib/flatten_object.ts
+++ b/x-pack/plugins/security/server/lib/flatten_object.ts
@@ -7,25 +7,25 @@
 
 import { compact, isObject } from 'lodash';
 
-// Inspired by x-pack/plugins/observability_solution/apm/public/utils/flatten_object.ts
-// Slighly modified to have key/value exposed as Object.
+// Slightly modified to have key/value exposed as Object.
 export const flattenObject = (
-  item: Record<any, unknown | unknown[]> | null | undefined,
-  accDefault: Record<string, any> = {},
+  item: Record<PropertyKey, unknown> | null | undefined,
+  accDefault: Record<PropertyKey, unknown> = {},
   parentKey?: string
-): Record<string, any> => {
+): Record<PropertyKey, unknown> => {
   if (item) {
     const isArrayWithSingleValue = Array.isArray(item) && item.length === 1;
     return Object.keys(item)
       .sort()
-      .reduce<Record<string, any>>((acc, key) => {
+      .reduce<Record<PropertyKey, unknown>>((acc, key) => {
         const childKey = isArrayWithSingleValue ? '' : key;
         const currentKey = compact([parentKey, childKey]).join('.');
-        // item[key] can be a primitive (string, number, boolean, null, undefined) or Object or Array
-        if (isObject(item[key])) {
-          flattenObject(item[key] as any, acc, currentKey);
+
+        const value = item[key];
+        if (isObject(value)) {
+          flattenObject(value as Record<PropertyKey, unknown>, acc, currentKey);
         } else {
-          acc[currentKey] = item[key];
+          acc[currentKey] = value;
         }
 
         return acc;