fix: 修复配额说明重复和undefined问题
- 在editStorageForm中初始化oss_storage_quota_value和oss_quota_unit - 删除重复的旧配额说明块,保留新的当前配额设置显示 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
83
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/fromSSO.js
generated
vendored
Normal file
83
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/fromSSO.js
generated
vendored
Normal file
@@ -0,0 +1,83 @@
|
||||
import { CredentialsProviderError } from "@smithy/property-provider";
|
||||
import { getProfileName, loadSsoSessionData, parseKnownFiles } from "@smithy/shared-ini-file-loader";
|
||||
import { isSsoProfile } from "./isSsoProfile";
|
||||
import { resolveSSOCredentials } from "./resolveSSOCredentials";
|
||||
import { validateSsoProfile } from "./validateSsoProfile";
|
||||
export const fromSSO = (init = {}) => async ({ callerClientConfig } = {}) => {
|
||||
init.logger?.debug("@aws-sdk/credential-provider-sso - fromSSO");
|
||||
const { ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoSession } = init;
|
||||
const { ssoClient } = init;
|
||||
const profileName = getProfileName({
|
||||
profile: init.profile ?? callerClientConfig?.profile,
|
||||
});
|
||||
if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName && !ssoSession) {
|
||||
const profiles = await parseKnownFiles(init);
|
||||
const profile = profiles[profileName];
|
||||
if (!profile) {
|
||||
throw new CredentialsProviderError(`Profile ${profileName} was not found.`, { logger: init.logger });
|
||||
}
|
||||
if (!isSsoProfile(profile)) {
|
||||
throw new CredentialsProviderError(`Profile ${profileName} is not configured with SSO credentials.`, {
|
||||
logger: init.logger,
|
||||
});
|
||||
}
|
||||
if (profile?.sso_session) {
|
||||
const ssoSessions = await loadSsoSessionData(init);
|
||||
const session = ssoSessions[profile.sso_session];
|
||||
const conflictMsg = ` configurations in profile ${profileName} and sso-session ${profile.sso_session}`;
|
||||
if (ssoRegion && ssoRegion !== session.sso_region) {
|
||||
throw new CredentialsProviderError(`Conflicting SSO region` + conflictMsg, {
|
||||
tryNextLink: false,
|
||||
logger: init.logger,
|
||||
});
|
||||
}
|
||||
if (ssoStartUrl && ssoStartUrl !== session.sso_start_url) {
|
||||
throw new CredentialsProviderError(`Conflicting SSO start_url` + conflictMsg, {
|
||||
tryNextLink: false,
|
||||
logger: init.logger,
|
||||
});
|
||||
}
|
||||
profile.sso_region = session.sso_region;
|
||||
profile.sso_start_url = session.sso_start_url;
|
||||
}
|
||||
const { sso_start_url, sso_account_id, sso_region, sso_role_name, sso_session } = validateSsoProfile(profile, init.logger);
|
||||
return resolveSSOCredentials({
|
||||
ssoStartUrl: sso_start_url,
|
||||
ssoSession: sso_session,
|
||||
ssoAccountId: sso_account_id,
|
||||
ssoRegion: sso_region,
|
||||
ssoRoleName: sso_role_name,
|
||||
ssoClient: ssoClient,
|
||||
clientConfig: init.clientConfig,
|
||||
parentClientConfig: init.parentClientConfig,
|
||||
callerClientConfig: init.callerClientConfig,
|
||||
profile: profileName,
|
||||
filepath: init.filepath,
|
||||
configFilepath: init.configFilepath,
|
||||
ignoreCache: init.ignoreCache,
|
||||
logger: init.logger,
|
||||
});
|
||||
}
|
||||
else if (!ssoStartUrl || !ssoAccountId || !ssoRegion || !ssoRoleName) {
|
||||
throw new CredentialsProviderError("Incomplete configuration. The fromSSO() argument hash must include " +
|
||||
'"ssoStartUrl", "ssoAccountId", "ssoRegion", "ssoRoleName"', { tryNextLink: false, logger: init.logger });
|
||||
}
|
||||
else {
|
||||
return resolveSSOCredentials({
|
||||
ssoStartUrl,
|
||||
ssoSession,
|
||||
ssoAccountId,
|
||||
ssoRegion,
|
||||
ssoRoleName,
|
||||
ssoClient,
|
||||
clientConfig: init.clientConfig,
|
||||
parentClientConfig: init.parentClientConfig,
|
||||
callerClientConfig: init.callerClientConfig,
|
||||
profile: profileName,
|
||||
filepath: init.filepath,
|
||||
configFilepath: init.configFilepath,
|
||||
ignoreCache: init.ignoreCache,
|
||||
logger: init.logger,
|
||||
});
|
||||
}
|
||||
};
|
||||
4
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/index.js
generated
vendored
Normal file
4
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/index.js
generated
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
export * from "./fromSSO";
|
||||
export * from "./isSsoProfile";
|
||||
export * from "./types";
|
||||
export * from "./validateSsoProfile";
|
||||
6
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/isSsoProfile.js
generated
vendored
Normal file
6
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/isSsoProfile.js
generated
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
export const isSsoProfile = (arg) => arg &&
|
||||
(typeof arg.sso_start_url === "string" ||
|
||||
typeof arg.sso_account_id === "string" ||
|
||||
typeof arg.sso_session === "string" ||
|
||||
typeof arg.sso_region === "string" ||
|
||||
typeof arg.sso_role_name === "string");
|
||||
2
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/loadSso.js
generated
vendored
Normal file
2
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/loadSso.js
generated
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
import { GetRoleCredentialsCommand, SSOClient } from "@aws-sdk/client-sso";
|
||||
export { GetRoleCredentialsCommand, SSOClient };
|
||||
90
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/resolveSSOCredentials.js
generated
vendored
Normal file
90
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/resolveSSOCredentials.js
generated
vendored
Normal file
@@ -0,0 +1,90 @@
|
||||
import { setCredentialFeature } from "@aws-sdk/core/client";
|
||||
import { fromSso as getSsoTokenProvider } from "@aws-sdk/token-providers";
|
||||
import { CredentialsProviderError } from "@smithy/property-provider";
|
||||
import { getSSOTokenFromFile } from "@smithy/shared-ini-file-loader";
|
||||
const SHOULD_FAIL_CREDENTIAL_CHAIN = false;
|
||||
export const resolveSSOCredentials = async ({ ssoStartUrl, ssoSession, ssoAccountId, ssoRegion, ssoRoleName, ssoClient, clientConfig, parentClientConfig, callerClientConfig, profile, filepath, configFilepath, ignoreCache, logger, }) => {
|
||||
let token;
|
||||
const refreshMessage = `To refresh this SSO session run aws sso login with the corresponding profile.`;
|
||||
if (ssoSession) {
|
||||
try {
|
||||
const _token = await getSsoTokenProvider({
|
||||
profile,
|
||||
filepath,
|
||||
configFilepath,
|
||||
ignoreCache,
|
||||
})();
|
||||
token = {
|
||||
accessToken: _token.token,
|
||||
expiresAt: new Date(_token.expiration).toISOString(),
|
||||
};
|
||||
}
|
||||
catch (e) {
|
||||
throw new CredentialsProviderError(e.message, {
|
||||
tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
|
||||
logger,
|
||||
});
|
||||
}
|
||||
}
|
||||
else {
|
||||
try {
|
||||
token = await getSSOTokenFromFile(ssoStartUrl);
|
||||
}
|
||||
catch (e) {
|
||||
throw new CredentialsProviderError(`The SSO session associated with this profile is invalid. ${refreshMessage}`, {
|
||||
tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
|
||||
logger,
|
||||
});
|
||||
}
|
||||
}
|
||||
if (new Date(token.expiresAt).getTime() - Date.now() <= 0) {
|
||||
throw new CredentialsProviderError(`The SSO session associated with this profile has expired. ${refreshMessage}`, {
|
||||
tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
|
||||
logger,
|
||||
});
|
||||
}
|
||||
const { accessToken } = token;
|
||||
const { SSOClient, GetRoleCredentialsCommand } = await import("./loadSso");
|
||||
const sso = ssoClient ||
|
||||
new SSOClient(Object.assign({}, clientConfig ?? {}, {
|
||||
logger: clientConfig?.logger ?? callerClientConfig?.logger ?? parentClientConfig?.logger,
|
||||
region: clientConfig?.region ?? ssoRegion,
|
||||
userAgentAppId: clientConfig?.userAgentAppId ?? callerClientConfig?.userAgentAppId ?? parentClientConfig?.userAgentAppId,
|
||||
}));
|
||||
let ssoResp;
|
||||
try {
|
||||
ssoResp = await sso.send(new GetRoleCredentialsCommand({
|
||||
accountId: ssoAccountId,
|
||||
roleName: ssoRoleName,
|
||||
accessToken,
|
||||
}));
|
||||
}
|
||||
catch (e) {
|
||||
throw new CredentialsProviderError(e, {
|
||||
tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
|
||||
logger,
|
||||
});
|
||||
}
|
||||
const { roleCredentials: { accessKeyId, secretAccessKey, sessionToken, expiration, credentialScope, accountId } = {}, } = ssoResp;
|
||||
if (!accessKeyId || !secretAccessKey || !sessionToken || !expiration) {
|
||||
throw new CredentialsProviderError("SSO returns an invalid temporary credential.", {
|
||||
tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
|
||||
logger,
|
||||
});
|
||||
}
|
||||
const credentials = {
|
||||
accessKeyId,
|
||||
secretAccessKey,
|
||||
sessionToken,
|
||||
expiration: new Date(expiration),
|
||||
...(credentialScope && { credentialScope }),
|
||||
...(accountId && { accountId }),
|
||||
};
|
||||
if (ssoSession) {
|
||||
setCredentialFeature(credentials, "CREDENTIALS_SSO", "s");
|
||||
}
|
||||
else {
|
||||
setCredentialFeature(credentials, "CREDENTIALS_SSO_LEGACY", "u");
|
||||
}
|
||||
return credentials;
|
||||
};
|
||||
1
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/types.js
generated
vendored
Normal file
1
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/types.js
generated
vendored
Normal file
@@ -0,0 +1 @@
|
||||
export {};
|
||||
9
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/validateSsoProfile.js
generated
vendored
Normal file
9
backend/node_modules/@aws-sdk/credential-provider-sso/dist-es/validateSsoProfile.js
generated
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
import { CredentialsProviderError } from "@smithy/property-provider";
|
||||
export const validateSsoProfile = (profile, logger) => {
|
||||
const { sso_start_url, sso_account_id, sso_region, sso_role_name } = profile;
|
||||
if (!sso_start_url || !sso_account_id || !sso_region || !sso_role_name) {
|
||||
throw new CredentialsProviderError(`Profile is configured with invalid SSO credentials. Required parameters "sso_account_id", ` +
|
||||
`"sso_region", "sso_role_name", "sso_start_url". Got ${Object.keys(profile).join(", ")}\nReference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.html`, { tryNextLink: false, logger });
|
||||
}
|
||||
return profile;
|
||||
};
|
||||
Reference in New Issue
Block a user