fix ObjectTypeOptions

elastic · Apr 17, 2020 · 996cd13 · 996cd13
1 parent 58e2756
commit 996cd13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/packages/kbn-config-schema/src/types/object_type.ts b/packages/kbn-config-schema/src/types/object_type.ts
@@ -57,10 +57,7 @@ interface UnknownOptions {
   unknowns?: 'allow' | 'ignore' | 'forbid';
 }
 
-export type ObjectTypeOptions<P extends Props = any> = TypeOptions<
-  { [K in keyof OptionalProperties<P>]?: TypeOf<P[K]> } &
-    { [K in keyof RequiredProperties<P>]: TypeOf<P[K]> }
-> &
+export type ObjectTypeOptions<P extends Props = any> = TypeOptions<ObjectResultType<P>> &
   UnknownOptions;
 
 export class ObjectType<P extends Props = any> extends Type<ObjectResultType<P>> {

diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
@@ -104,8 +104,8 @@ const providersConfigSchema = schema.object(
   {
     validate(config) {
       const checks = { sameOrder: new Map<number, string>(), sameName: new Map<string, string>() };
-      for (const [providerType, providerGroup] of Object.entries<any>(config)) {
-        for (const [providerName, { enabled, order }] of Object.entries<any>(providerGroup ?? {})) {
+      for (const [providerType, providerGroup] of Object.entries(config)) {
+        for (const [providerName, { enabled, order }] of Object.entries(providerGroup ?? {})) {
           if (!enabled) {
             continue;
           }