sst 2.24.11 → 2.24.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bootstrap.js +2 -0
- package/constructs/ApiGatewayV1Api.d.ts +2 -2
- package/constructs/ApiGatewayV1Api.js +2 -1
- package/constructs/Stack.js +2 -0
- package/node/future/auth/adapter/microsoft.d.ts +1 -0
- package/node/future/auth/adapter/microsoft.js +8 -6
- package/node/service/index.d.ts +3 -0
- package/node/service/index.js +4 -0
- package/package.json +1 -1
- package/project.d.ts +2 -0
- package/runtime/handlers/node.js +8 -1
- package/support/event-bus-retrier/index.mjs +21 -21
- package/support/python-runtime/Dockerfile.dependencies +1 -1
package/bootstrap.js
CHANGED
|
@@ -161,10 +161,12 @@ export async function bootstrapSST(cdkBucket) {
|
|
|
161
161
|
},
|
|
162
162
|
synthesizer: new DefaultStackSynthesizer({
|
|
163
163
|
qualifier: cdk?.qualifier,
|
|
164
|
+
bootstrapStackVersionSsmParameter: cdk?.bootstrapStackVersionSsmParameter,
|
|
164
165
|
fileAssetsBucketName: cdk?.fileAssetsBucketName,
|
|
165
166
|
deployRoleArn: cdk?.deployRoleArn,
|
|
166
167
|
fileAssetPublishingRoleArn: cdk?.fileAssetPublishingRoleArn,
|
|
167
168
|
imageAssetPublishingRoleArn: cdk?.imageAssetPublishingRoleArn,
|
|
169
|
+
imageAssetsRepositoryName: cdk?.imageAssetsRepositoryName,
|
|
168
170
|
cloudFormationExecutionRole: cdk?.cloudFormationExecutionRole,
|
|
169
171
|
lookupRoleArn: cdk?.lookupRoleArn,
|
|
170
172
|
}),
|
|
@@ -145,7 +145,7 @@ export interface ApiGatewayV1ApiProps<Authorizers extends Record<string, ApiGate
|
|
|
145
145
|
* });
|
|
146
146
|
* ```
|
|
147
147
|
*/
|
|
148
|
-
authorizer?: "none" | "iam" | (string extends AuthorizerKeys ?
|
|
148
|
+
authorizer?: "none" | "iam" | (string extends AuthorizerKeys ? Omit<AuthorizerKeys, "none" | "iam"> : AuthorizerKeys);
|
|
149
149
|
/**
|
|
150
150
|
* An array of scopes to include in the authorization when using `user_pool` or `jwt` authorizers. These will be merged with the scopes from the attached authorizer.
|
|
151
151
|
* @default []
|
|
@@ -220,7 +220,7 @@ export type ApiGatewayV1ApiRouteProps<AuthorizerKeys> = FunctionInlineDefinition
|
|
|
220
220
|
*/
|
|
221
221
|
export interface ApiGatewayV1ApiFunctionRouteProps<AuthorizerKeys = never> {
|
|
222
222
|
function?: FunctionDefinition;
|
|
223
|
-
authorizer?: "none" | "iam" | (string extends AuthorizerKeys ?
|
|
223
|
+
authorizer?: "none" | "iam" | (string extends AuthorizerKeys ? Omit<AuthorizerKeys, "none" | "iam"> : AuthorizerKeys);
|
|
224
224
|
authorizationScopes?: string[];
|
|
225
225
|
cdk?: {
|
|
226
226
|
method?: Omit<apig.MethodOptions, "authorizer" | "authorizationType" | "authorizationScopes">;
|
|
@@ -735,7 +735,8 @@ export class ApiGatewayV1Api extends Construct {
|
|
|
735
735
|
...routeProps.cdk?.method,
|
|
736
736
|
};
|
|
737
737
|
}
|
|
738
|
-
if (!this.props.authorizers ||
|
|
738
|
+
if (!this.props.authorizers ||
|
|
739
|
+
!this.props.authorizers[authorizerKey]) {
|
|
739
740
|
throw new Error(`Cannot find authorizer "${authorizerKey.toString()}"`);
|
|
740
741
|
}
|
|
741
742
|
const authorizer = this.authorizersData[authorizerKey];
|
package/constructs/Stack.js
CHANGED
|
@@ -205,10 +205,12 @@ export class Stack extends CDKStack {
|
|
|
205
205
|
const { config } = useProject();
|
|
206
206
|
const props = {
|
|
207
207
|
qualifier: config.cdk?.qualifier,
|
|
208
|
+
bootstrapStackVersionSsmParameter: config.cdk?.bootstrapStackVersionSsmParameter,
|
|
208
209
|
fileAssetsBucketName: config.cdk?.fileAssetsBucketName,
|
|
209
210
|
deployRoleArn: config.cdk?.deployRoleArn,
|
|
210
211
|
fileAssetPublishingRoleArn: config.cdk?.fileAssetPublishingRoleArn,
|
|
211
212
|
imageAssetPublishingRoleArn: config.cdk?.imageAssetPublishingRoleArn,
|
|
213
|
+
imageAssetsRepositoryName: config.cdk?.imageAssetsRepositoryName,
|
|
212
214
|
cloudFormationExecutionRole: config.cdk?.cloudFormationExecutionRole,
|
|
213
215
|
lookupRoleArn: config.cdk?.lookupRoleArn,
|
|
214
216
|
};
|
|
@@ -2,6 +2,7 @@ import { OidcBasicConfig } from "./oidc.js";
|
|
|
2
2
|
type MicrosoftConfig = OidcBasicConfig & {
|
|
3
3
|
mode: "oidc";
|
|
4
4
|
prompt?: "login" | "none" | "consent" | "select_account";
|
|
5
|
+
tenantID?: string;
|
|
5
6
|
};
|
|
6
7
|
export declare function MicrosoftAdapter(config: MicrosoftConfig): () => Promise<{
|
|
7
8
|
type: "success";
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { Issuer } from "openid-client";
|
|
2
2
|
import { OidcAdapter } from "./oidc.js";
|
|
3
|
-
// These are the different Microsoft auth urls for different types of accounts:
|
|
4
|
-
// Common: https://login.microsoftonline.com/common/v2.0 (both business and private)
|
|
5
|
-
// Business: https://login.microsoftonline.com/{tenant}/v2.0
|
|
6
|
-
// Private: https://login.microsoftonline.com/consumers/v2.0
|
|
7
|
-
const issuer = await Issuer.discover("https://login.microsoftonline.com/common/v2.0");
|
|
8
3
|
export function MicrosoftAdapter(config) {
|
|
4
|
+
const authority = config?.tenantID ?? "common";
|
|
5
|
+
const issuer = `https://login.microsoftonline.com/${authority}`;
|
|
9
6
|
return OidcAdapter({
|
|
10
|
-
issuer
|
|
7
|
+
issuer: new Issuer({
|
|
8
|
+
issuer: `${issuer}/v2.0`,
|
|
9
|
+
authorization_endpoint: `${issuer}/oauth2/v2.0/authorize`,
|
|
10
|
+
token_endpoint: `${issuer}/oauth2/v2.0/token`,
|
|
11
|
+
jwks_uri: `${issuer}/discovery/v2.0/keys`,
|
|
12
|
+
}),
|
|
11
13
|
scope: "openid email profile",
|
|
12
14
|
...config,
|
|
13
15
|
});
|
package/package.json
CHANGED
package/project.d.ts
CHANGED
|
@@ -24,12 +24,14 @@ export interface ConfigOptions {
|
|
|
24
24
|
cdk?: {
|
|
25
25
|
toolkitStackName?: string;
|
|
26
26
|
qualifier?: string;
|
|
27
|
+
bootstrapStackVersionSsmParameter?: string;
|
|
27
28
|
fileAssetsBucketName?: string;
|
|
28
29
|
customPermissionsBoundary?: string;
|
|
29
30
|
publicAccessBlockConfiguration?: boolean;
|
|
30
31
|
deployRoleArn?: string;
|
|
31
32
|
fileAssetPublishingRoleArn?: string;
|
|
32
33
|
imageAssetPublishingRoleArn?: string;
|
|
34
|
+
imageAssetsRepositoryName?: string;
|
|
33
35
|
cloudFormationExecutionRole?: string;
|
|
34
36
|
lookupRoleArn?: string;
|
|
35
37
|
pathMetadata?: boolean;
|
package/runtime/handlers/node.js
CHANGED
|
@@ -158,7 +158,14 @@ export const useNodeHandler = Context.memo(async () => {
|
|
|
158
158
|
: undefined,
|
|
159
159
|
}),
|
|
160
160
|
outfile: target,
|
|
161
|
-
|
|
161
|
+
// always generate sourcemaps in local
|
|
162
|
+
// never generate sourcemaps if explicitly false
|
|
163
|
+
// otherwise generate sourcemaps
|
|
164
|
+
sourcemap: input.mode === "start"
|
|
165
|
+
? "linked"
|
|
166
|
+
: nodejs.sourcemap === false
|
|
167
|
+
? false
|
|
168
|
+
: true,
|
|
162
169
|
minify: nodejs.minify,
|
|
163
170
|
...override,
|
|
164
171
|
};
|