From 1af85472309fb6f8e42733fac3582641d28a5804 Mon Sep 17 00:00:00 2001
From: Danilo Alonso <damusix@gmail.com>
Date: Tue, 13 Aug 2024 11:52:35 -0400
Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=92=84=20superfluous=20intersece?=
 =?UTF-8?q?tion,=20cleanup=20respones=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/types/request.d.ts  | 2 +-
 lib/types/response.d.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/types/request.d.ts b/lib/types/request.d.ts
index 969f6a19f..078fc3c95 100644
--- a/lib/types/request.d.ts
+++ b/lib/types/request.d.ts
@@ -307,7 +307,7 @@ export type MergeType<T, U> = {
     [K in keyof T]: K extends keyof U
         ? U[K]
         : T[K];
-} & U;
+};
 
 export type MergeRefs<T extends ReqRef> = MergeType<ReqRefDefaults, T>;
 
diff --git a/lib/types/response.d.ts b/lib/types/response.d.ts
index 0489e3fae..f7c131787 100644
--- a/lib/types/response.d.ts
+++ b/lib/types/response.d.ts
@@ -6,7 +6,6 @@ import {
     UserCredentials,
     AppCredentials,
     AuthArtifacts,
-    MergeType,
     AuthCredentials,
     ReqRef,
     ReqRefDefaults,
@@ -391,7 +390,7 @@ export interface AuthenticationData<
     CredentialsExtra = Record<string, unknown>,
     ArtifactsExtra = AuthArtifacts
 > {
-    credentials: MergeType<CredentialsExtra, AuthCredentials<AuthUser, AuthApp>>;
+    credentials: AuthCredentials<AuthUser, AuthApp> & CredentialsExtra;
     artifacts?: ArtifactsExtra | undefined;
 }