@aws-sdk/credential-provider-sso 3.54.0 → 3.54.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.54.1](https://github.com/aws/aws-sdk-js-v3/compare/v3.54.0...v3.54.1) (2022-03-15)
+
+**Note:** Version bump only for package @aws-sdk/credential-provider-sso
+
+
+
+
+
 # [3.54.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.53.1...v3.54.0) (2022-03-11)
 
 **Note:** Version bump only for package @aws-sdk/credential-provider-sso

package/dist-cjs/fromSSO.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromSSO = void 0;
 const property_provider_1 = require("@aws-sdk/property-provider");
-const util_credentials_1 = require("@aws-sdk/util-credentials");
+const shared_ini_file_loader_1 = require("@aws-sdk/shared-ini-file-loader");
 const isSsoProfile_1 = require("./isSsoProfile");
 const resolveSSOCredentials_1 = require("./resolveSSOCredentials");
 const validateSsoProfile_1 = require("./validateSsoProfile");
 const fromSSO = (init = {}) => async () => {
     const { ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoClient } = init;
     if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName) {
-        const profiles = await util_credentials_1.parseKnownFiles(init);
-        const profileName = util_credentials_1.getMasterProfileName(init);
+        const profiles = await shared_ini_file_loader_1.parseKnownFiles(init);
+        const profileName = shared_ini_file_loader_1.getProfileName(init);
         const profile = profiles[profileName];
         if (!isSsoProfile_1.isSsoProfile(profile)) {
             throw new property_provider_1.CredentialsProviderError(`Profile ${profileName} is not configured with SSO credentials.`);

package/dist-cjs/resolveSSOCredentials.js

@@ -4,20 +4,13 @@ exports.resolveSSOCredentials = void 0;
 const client_sso_1 = require("@aws-sdk/client-sso");
 const property_provider_1 = require("@aws-sdk/property-provider");
 const shared_ini_file_loader_1 = require("@aws-sdk/shared-ini-file-loader");
-const crypto_1 = require("crypto");
-const fs_1 = require("fs");
-const path_1 = require("path");
 const EXPIRE_WINDOW_MS = 15 * 60 * 1000;
 const SHOULD_FAIL_CREDENTIAL_CHAIN = false;
-const { readFile } = fs_1.promises;
 const resolveSSOCredentials = async ({ ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoClient, }) => {
-    const hasher = crypto_1.createHash("sha1");
-    const cacheName = hasher.update(ssoStartUrl).digest("hex");
-    const tokenFile = path_1.join(shared_ini_file_loader_1.getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
     let token;
     const refreshMessage = `To refresh this SSO session run aws sso login with the corresponding profile.`;
     try {
-        token = JSON.parse(await readFile(tokenFile, "utf8"));
+        token = await shared_ini_file_loader_1.getSSOTokenFromFile(ssoStartUrl);
     }
     catch (e) {
         throw new property_provider_1.CredentialsProviderError(`The SSO session associated with this profile is invalid. ${refreshMessage}`, SHOULD_FAIL_CREDENTIAL_CHAIN);

package/dist-es/fromSSO.js

@@ -1,6 +1,6 @@
 import { __awaiter, __generator } from "tslib";
 import { CredentialsProviderError } from "@aws-sdk/property-provider";
-import { getMasterProfileName, parseKnownFiles } from "@aws-sdk/util-credentials";
+import { getProfileName, parseKnownFiles } from "@aws-sdk/shared-ini-file-loader";
 import { isSsoProfile } from "./isSsoProfile";
 import { resolveSSOCredentials } from "./resolveSSOCredentials";
 import { validateSsoProfile } from "./validateSsoProfile";
@@ -16,7 +16,7 @@ export var fromSSO = function (init) {
                     return [4, parseKnownFiles(init)];
                 case 1:
                     profiles = _b.sent();
-                    profileName = getMasterProfileName(init);
+                    profileName = getProfileName(init);
                     profile = profiles[profileName];
                     if (!isSsoProfile(profile)) {
                         throw new CredentialsProviderError("Profile " + profileName + " is not configured with SSO credentials.");

package/dist-es/resolveSSOCredentials.js

@@ -1,34 +1,26 @@
 import { __awaiter, __generator } from "tslib";
 import { GetRoleCredentialsCommand, SSOClient } from "@aws-sdk/client-sso";
 import { CredentialsProviderError } from "@aws-sdk/property-provider";
-import { getHomeDir } from "@aws-sdk/shared-ini-file-loader";
-import { createHash } from "crypto";
-import { promises as fsPromises } from "fs";
-import { join } from "path";
+import { getSSOTokenFromFile } from "@aws-sdk/shared-ini-file-loader";
 var EXPIRE_WINDOW_MS = 15 * 60 * 1000;
 var SHOULD_FAIL_CREDENTIAL_CHAIN = false;
-var readFile = fsPromises.readFile;
 export var resolveSSOCredentials = function (_a) {
     var ssoStartUrl = _a.ssoStartUrl, ssoAccountId = _a.ssoAccountId, ssoRegion = _a.ssoRegion, ssoRoleName = _a.ssoRoleName, ssoClient = _a.ssoClient;
     return __awaiter(void 0, void 0, void 0, function () {
-        var hasher, cacheName, tokenFile, token, refreshMessage, _b, _c, e_1, accessToken, sso, ssoResp, e_2, _d, _e, accessKeyId, secretAccessKey, sessionToken, expiration;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var token, refreshMessage, e_1, accessToken, sso, ssoResp, e_2, _b, _c, accessKeyId, secretAccessKey, sessionToken, expiration;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
-                    hasher = createHash("sha1");
-                    cacheName = hasher.update(ssoStartUrl).digest("hex");
-                    tokenFile = join(getHomeDir(), ".aws", "sso", "cache", cacheName + ".json");
                     refreshMessage = "To refresh this SSO session run aws sso login with the corresponding profile.";
-                    _f.label = 1;
+                    _d.label = 1;
                 case 1:
-                    _f.trys.push([1, 3, , 4]);
-                    _c = (_b = JSON).parse;
-                    return [4, readFile(tokenFile, "utf8")];
+                    _d.trys.push([1, 3, , 4]);
+                    return [4, getSSOTokenFromFile(ssoStartUrl)];
                 case 2:
-                    token = _c.apply(_b, [_f.sent()]);
+                    token = _d.sent();
                     return [3, 4];
                 case 3:
-                    e_1 = _f.sent();
+                    e_1 = _d.sent();
                     throw new CredentialsProviderError("The SSO session associated with this profile is invalid. " + refreshMessage, SHOULD_FAIL_CREDENTIAL_CHAIN);
                 case 4:
                     if (new Date(token.expiresAt).getTime() - Date.now() <= EXPIRE_WINDOW_MS) {
@@ -36,22 +28,22 @@ export var resolveSSOCredentials = function (_a) {
                     }
                     accessToken = token.accessToken;
                     sso = ssoClient || new SSOClient({ region: ssoRegion });
-                    _f.label = 5;
+                    _d.label = 5;
                 case 5:
-                    _f.trys.push([5, 7, , 8]);
+                    _d.trys.push([5, 7, , 8]);
                     return [4, sso.send(new GetRoleCredentialsCommand({
                             accountId: ssoAccountId,
                             roleName: ssoRoleName,
                             accessToken: accessToken,
                         }))];
                 case 6:
-                    ssoResp = _f.sent();
+                    ssoResp = _d.sent();
                     return [3, 8];
                 case 7:
-                    e_2 = _f.sent();
+                    e_2 = _d.sent();
                     throw CredentialsProviderError.from(e_2, SHOULD_FAIL_CREDENTIAL_CHAIN);
                 case 8:
-                    _d = ssoResp.roleCredentials, _e = _d === void 0 ? {} : _d, accessKeyId = _e.accessKeyId, secretAccessKey = _e.secretAccessKey, sessionToken = _e.sessionToken, expiration = _e.expiration;
+                    _b = ssoResp.roleCredentials, _c = _b === void 0 ? {} : _b, accessKeyId = _c.accessKeyId, secretAccessKey = _c.secretAccessKey, sessionToken = _c.sessionToken, expiration = _c.expiration;
                     if (!accessKeyId || !secretAccessKey || !sessionToken || !expiration) {
                         throw new CredentialsProviderError("SSO returns an invalid temporary credential.", SHOULD_FAIL_CREDENTIAL_CHAIN);
                     }

package/dist-types/fromSSO.d.ts

@@ -1,6 +1,6 @@
 import { SSOClient } from "@aws-sdk/client-sso";
+import { SourceProfileInit } from "@aws-sdk/shared-ini-file-loader";
 import { CredentialProvider } from "@aws-sdk/types";
-import { SourceProfileInit } from "@aws-sdk/util-credentials";
 export interface SsoCredentialsParameters {
     /**
      * The URL to the AWS SSO service.

package/dist-types/isSsoProfile.d.ts

@@ -1,4 +1,4 @@
-import { Profile } from "@aws-sdk/shared-ini-file-loader";
+import { Profile } from "@aws-sdk/types";
 import { SsoProfile } from "./types";
 /**
  * @internal

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

@@ -1,6 +1,6 @@
 import { SSOClient } from "@aws-sdk/client-sso";
+import { SourceProfileInit } from "@aws-sdk/shared-ini-file-loader";
 import { CredentialProvider } from "@aws-sdk/types";
-import { SourceProfileInit } from "@aws-sdk/util-credentials";
 export interface SsoCredentialsParameters {
     
     ssoStartUrl: string;

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

@@ -1,4 +1,4 @@
-import { Profile } from "@aws-sdk/shared-ini-file-loader";
+import { Profile } from "@aws-sdk/types";
 import { SsoProfile } from "./types";
 
 export declare const isSsoProfile: (arg: Profile) => arg is Partial<SsoProfile>;

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

@@ -1,4 +1,4 @@
-import { Profile } from "@aws-sdk/shared-ini-file-loader";
+import { Profile } from "@aws-sdk/types";
 
 export interface SSOToken {
     accessToken: string;

package/dist-types/types.d.ts

@@ -1,4 +1,4 @@
-import { Profile } from "@aws-sdk/shared-ini-file-loader";
+import { Profile } from "@aws-sdk/types";
 /**
  * Cached SSO token retrieved from SSO login flow.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-sso",
-  "version": "3.54.0",
+  "version": "3.54.1",
   "description": "AWS credential provider that exchanges a resolved SSO login token file for temporary AWS credentials",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -23,11 +23,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/client-sso": "3.54.0",
-    "@aws-sdk/property-provider": "3.54.0",
-    "@aws-sdk/shared-ini-file-loader": "3.52.0",
-    "@aws-sdk/types": "3.54.0",
-    "@aws-sdk/util-credentials": "3.53.0",
+    "@aws-sdk/client-sso": "3.54.1",
+    "@aws-sdk/property-provider": "3.54.1",
+    "@aws-sdk/shared-ini-file-loader": "3.54.1",
+    "@aws-sdk/types": "3.54.1",
     "tslib": "^2.3.0"
   },
   "devDependencies": {