@aws-sdk/token-providers 3.947.0 → 3.952.0

package/dist-cjs/index.js

@@ -23,9 +23,9 @@ const fromEnvSigningName = ({ logger, signingName } = {}) => async () => {
 const EXPIRE_WINDOW_MS = 5 * 60 * 1000;
 const REFRESH_MESSAGE = `To refresh this SSO session run 'aws sso login' with the corresponding profile.`;
 
-const getSsoOidcClient = async (ssoRegion, init = {}) => {
+const getSsoOidcClient = async (ssoRegion, init = {}, callerClientConfig) => {
     const { SSOOIDCClient } = await import('@aws-sdk/nested-clients/sso-oidc');
-    const coalesce = (prop) => init.clientConfig?.[prop] ?? init.parentClientConfig?.[prop];
+    const coalesce = (prop) => init.clientConfig?.[prop] ?? init.parentClientConfig?.[prop] ?? callerClientConfig?.[prop];
     const ssoOidcClient = new SSOOIDCClient(Object.assign({}, init.clientConfig ?? {}, {
         region: ssoRegion ?? init.clientConfig?.region,
         logger: coalesce("logger"),
@@ -34,9 +34,9 @@ const getSsoOidcClient = async (ssoRegion, init = {}) => {
     return ssoOidcClient;
 };
 
-const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}) => {
+const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}, callerClientConfig) => {
     const { CreateTokenCommand } = await import('@aws-sdk/nested-clients/sso-oidc');
-    const ssoOidcClient = await getSsoOidcClient(ssoRegion, init);
+    const ssoOidcClient = await getSsoOidcClient(ssoRegion, init, callerClientConfig);
     return ssoOidcClient.send(new CreateTokenCommand({
         clientId: ssoToken.clientId,
         clientSecret: ssoToken.clientSecret,
@@ -65,14 +65,7 @@ const writeSSOTokenToFile = (id, ssoToken) => {
 };
 
 const lastRefreshAttemptTime = new Date(0);
-const fromSso = (_init = {}) => async ({ callerClientConfig } = {}) => {
-    const init = {
-        ..._init,
-        parentClientConfig: {
-            ...callerClientConfig,
-            ..._init.parentClientConfig,
-        },
-    };
+const fromSso = (init = {}) => async ({ callerClientConfig } = {}) => {
     init.logger?.debug("@aws-sdk/token-providers - fromSso");
     const profiles = await sharedIniFileLoader.parseKnownFiles(init);
     const profileName = sharedIniFileLoader.getProfileName({
@@ -121,7 +114,7 @@ const fromSso = (_init = {}) => async ({ callerClientConfig } = {}) => {
     validateTokenKey("refreshToken", ssoToken.refreshToken, true);
     try {
         lastRefreshAttemptTime.setTime(Date.now());
-        const newSsoOidcToken = await getNewSsoOidcToken(ssoToken, ssoRegion, init);
+        const newSsoOidcToken = await getNewSsoOidcToken(ssoToken, ssoRegion, init, callerClientConfig);
         validateTokenKey("accessToken", newSsoOidcToken.accessToken);
         validateTokenKey("expiresIn", newSsoOidcToken.expiresIn);
         const newTokenExpiration = new Date(Date.now() + newSsoOidcToken.expiresIn * 1000);

package/dist-es/fromSso.js

@@ -6,14 +6,7 @@ import { validateTokenExpiry } from "./validateTokenExpiry";
 import { validateTokenKey } from "./validateTokenKey";
 import { writeSSOTokenToFile } from "./writeSSOTokenToFile";
 const lastRefreshAttemptTime = new Date(0);
-export const fromSso = (_init = {}) => async ({ callerClientConfig } = {}) => {
-    const init = {
-        ..._init,
-        parentClientConfig: {
-            ...callerClientConfig,
-            ..._init.parentClientConfig,
-        },
-    };
+export const fromSso = (init = {}) => async ({ callerClientConfig } = {}) => {
     init.logger?.debug("@aws-sdk/token-providers - fromSso");
     const profiles = await parseKnownFiles(init);
     const profileName = getProfileName({
@@ -62,7 +55,7 @@ export const fromSso = (_init = {}) => async ({ callerClientConfig } = {}) => {
     validateTokenKey("refreshToken", ssoToken.refreshToken, true);
     try {
         lastRefreshAttemptTime.setTime(Date.now());
-        const newSsoOidcToken = await getNewSsoOidcToken(ssoToken, ssoRegion, init);
+        const newSsoOidcToken = await getNewSsoOidcToken(ssoToken, ssoRegion, init, callerClientConfig);
         validateTokenKey("accessToken", newSsoOidcToken.accessToken);
         validateTokenKey("expiresIn", newSsoOidcToken.expiresIn);
         const newTokenExpiration = new Date(Date.now() + newSsoOidcToken.expiresIn * 1000);

package/dist-es/getNewSsoOidcToken.js

@@ -1,7 +1,7 @@
 import { getSsoOidcClient } from "./getSsoOidcClient";
-export const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}) => {
+export const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}, callerClientConfig) => {
     const { CreateTokenCommand } = await import("@aws-sdk/nested-clients/sso-oidc");
-    const ssoOidcClient = await getSsoOidcClient(ssoRegion, init);
+    const ssoOidcClient = await getSsoOidcClient(ssoRegion, init, callerClientConfig);
     return ssoOidcClient.send(new CreateTokenCommand({
         clientId: ssoToken.clientId,
         clientSecret: ssoToken.clientSecret,

package/dist-es/getSsoOidcClient.js

@@ -1,6 +1,6 @@
-export const getSsoOidcClient = async (ssoRegion, init = {}) => {
+export const getSsoOidcClient = async (ssoRegion, init = {}, callerClientConfig) => {
     const { SSOOIDCClient } = await import("@aws-sdk/nested-clients/sso-oidc");
-    const coalesce = (prop) => init.clientConfig?.[prop] ?? init.parentClientConfig?.[prop];
+    const coalesce = (prop) => init.clientConfig?.[prop] ?? init.parentClientConfig?.[prop] ?? callerClientConfig?.[prop];
     const ssoOidcClient = new SSOOIDCClient(Object.assign({}, init.clientConfig ?? {}, {
         region: ssoRegion ?? init.clientConfig?.region,
         logger: coalesce("logger"),

package/dist-types/fromSso.d.ts

@@ -9,4 +9,4 @@ export interface FromSsoInit extends SourceProfileInit, CredentialProviderOption
 /**
  * Creates a token provider that will read from SSO token cache or ssoOidc.createToken() call.
  */
-export declare const fromSso: (_init?: FromSsoInit) => RuntimeConfigIdentityProvider<TokenIdentity>;
+export declare const fromSso: (init?: FromSsoInit) => RuntimeConfigIdentityProvider<TokenIdentity>;

package/dist-types/getNewSsoOidcToken.d.ts

@@ -1,7 +1,8 @@
+import type { AwsIdentityProperties } from "@aws-sdk/types";
 import { SSOToken } from "@smithy/shared-ini-file-loader";
 import { FromSsoInit } from "./fromSso";
 /**
- * Returns a new SSO OIDC token from ssoOids.createToken() API call.
+ * Returns a new SSO OIDC token from SSOOIDC::createToken() API call.
  * @internal
  */
-export declare const getNewSsoOidcToken: (ssoToken: SSOToken, ssoRegion: string, init?: FromSsoInit) => Promise<import("@aws-sdk/nested-clients/sso-oidc").CreateTokenCommandOutput>;
+export declare const getNewSsoOidcToken: (ssoToken: SSOToken, ssoRegion: string, init?: FromSsoInit, callerClientConfig?: AwsIdentityProperties["callerClientConfig"]) => Promise<import("@aws-sdk/nested-clients/sso-oidc").CreateTokenCommandOutput>;

package/dist-types/getSsoOidcClient.d.ts

@@ -1,6 +1,7 @@
+import type { AwsIdentityProperties } from "@aws-sdk/types";
 import { FromSsoInit } from "./fromSso";
 /**
  * Returns a SSOOIDC client for the given region.
  * @internal
  */
-export declare const getSsoOidcClient: (ssoRegion: string, init?: FromSsoInit) => Promise<import("@aws-sdk/nested-clients/sso-oidc").SSOOIDCClient>;
+export declare const getSsoOidcClient: (ssoRegion: string, init?: FromSsoInit, callerClientConfig?: AwsIdentityProperties["callerClientConfig"]) => Promise<import("@aws-sdk/nested-clients/sso-oidc").SSOOIDCClient>;

package/dist-types/ts3.4/fromSso.d.ts

@@ -10,5 +10,5 @@ export interface FromSsoInit
   clientConfig?: any;
 }
 export declare const fromSso: (
-  _init?: FromSsoInit
+  init?: FromSsoInit
 ) => RuntimeConfigIdentityProvider<TokenIdentity>;

package/dist-types/ts3.4/getNewSsoOidcToken.d.ts

@@ -1,9 +1,11 @@
+import { AwsIdentityProperties } from "@aws-sdk/types";
 import { SSOToken } from "@smithy/shared-ini-file-loader";
 import { FromSsoInit } from "./fromSso";
 export declare const getNewSsoOidcToken: (
   ssoToken: SSOToken,
   ssoRegion: string,
-  init?: FromSsoInit
+  init?: FromSsoInit,
+  callerClientConfig?: AwsIdentityProperties["callerClientConfig"]
 ) => Promise<
   import("@aws-sdk/nested-clients/sso-oidc").CreateTokenCommandOutput
 >;

package/dist-types/ts3.4/getSsoOidcClient.d.ts

@@ -1,5 +1,7 @@
+import { AwsIdentityProperties } from "@aws-sdk/types";
 import { FromSsoInit } from "./fromSso";
 export declare const getSsoOidcClient: (
   ssoRegion: string,
-  init?: FromSsoInit
+  init?: FromSsoInit,
+  callerClientConfig?: AwsIdentityProperties["callerClientConfig"]
 ) => Promise<import("@aws-sdk/nested-clients/sso-oidc").SSOOIDCClient>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/token-providers",
-  "version": "3.947.0",
+  "version": "3.952.0",
   "description": "A collection of token providers",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -30,7 +30,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-sdk/core": "3.947.0",
-    "@aws-sdk/nested-clients": "3.947.0",
+    "@aws-sdk/nested-clients": "3.952.0",
     "@aws-sdk/types": "3.936.0",
     "@smithy/property-provider": "^4.2.5",
     "@smithy/shared-ini-file-loader": "^4.4.0",