sst 2.3.6 → 2.4.0

package/constructs/EdgeFunction.js

@@ -2,6 +2,7 @@ import fs from "fs";
 import url from "url";
 import path from "path";
 import crypto from "crypto";
+import spawn from "cross-spawn";
 import { Construct } from "constructs";
 import { Effect, Role, Policy, PolicyStatement, CompositePrincipal, ServicePrincipal, ManagedPolicy, } from "aws-cdk-lib/aws-iam";
 import { Version, Code, Runtime, Function as CdkFunction, } from "aws-cdk-lib/aws-lambda";
@@ -135,9 +136,20 @@ export class EdgeFunction extends Construct {
         const filePath = path.join(bundle, handlerFilename);
         const fileData = fs.readFileSync(filePath, "utf8");
         fs.writeFileSync(filePath, `process.env = { ...process.env, ..."{{ _SST_FUNCTION_ENVIRONMENT_ }}" };\n${fileData}`);
+        // Note: cannot point the bundle to the `.open-next/server-function`
+        //       b/c the folder contains node_modules. And pnpm node_modules
+        //       contains symlinks. CDK cannot zip symlinks correctly.
+        //       https://github.com/aws/aws-cdk/issues/9251
+        //       We will zip the folder ourselves.
+        const outputPath = path.resolve(useProject().paths.artifacts, `SsrFunction-${this.node.id}-${this.node.addr}`);
+        const script = path.resolve(__dirname, "../support/ssr-site-function-archiver.mjs");
+        const result = spawn.sync("node", [script, path.join(bundle), path.join(outputPath, "server-function.zip")], { stdio: "inherit" });
+        if (result.status !== 0) {
+            throw new Error(`There was a problem generating the assets package.`);
+        }
         // Create asset
         const asset = new Asset(this.scope, `FunctionAsset`, {
-            path: bundle,
+            path: path.join(outputPath, "server-function.zip"),
         });
         return { handlerFilename, asset };
     }

package/constructs/NextjsSite.d.ts

@@ -1,9 +1,10 @@
 import { Construct } from "constructs";
 import { Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
-import { Distribution, CachePolicy } from "aws-cdk-lib/aws-cloudfront";
+import { Distribution } from "aws-cdk-lib/aws-cloudfront";
+import { EdgeFunction } from "./EdgeFunction.js";
 import { SsrSite, SsrSiteProps } from "./SsrSite.js";
 import { Size } from "./util/size.js";
-export interface NextjsSiteProps extends Omit<SsrSiteProps, "edge" | "nodejs"> {
+export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
     imageOptimization?: {
         /**
          * The amount of memory in MB allocated for image optimization function.
@@ -43,9 +44,15 @@ export declare class NextjsSite extends SsrSite {
         clientBuildVersionedSubDir: string;
     };
     protected createFunctionForRegional(): CdkFunction;
-    private createImageOptimizationFunctionForRegional;
-    private createMiddlewareEdgeFunctionForRegional;
+    protected createFunctionForEdge(): EdgeFunction;
+    private createImageOptimizationFunction;
     protected createCloudFrontDistributionForRegional(): Distribution;
-    protected createCloudFrontServerCachePolicy(): CachePolicy;
+    protected createCloudFrontDistributionForEdge(): Distribution;
+    private buildServerBehaviorForRegional;
+    private buildServerBehaviorForEdge;
+    private buildImageBehavior;
+    private buildStaticFileBehavior;
+    private buildDefaultNextjsBehaviorForRegional;
+    private buildDefaultNextjsBehaviorForEdge;
     protected generateBuildId(): string;
 }

package/constructs/NextjsSite.js

@@ -4,7 +4,7 @@ import path from "path";
 import { Fn, Duration as CdkDuration, RemovalPolicy } from "aws-cdk-lib";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Function as CdkFunction, Code, Runtime, Architecture, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
-import { Distribution, ViewerProtocolPolicy, AllowedMethods, LambdaEdgeEventType, CachedMethods, CachePolicy, CacheQueryStringBehavior, CacheCookieBehavior, CacheHeaderBehavior, } from "aws-cdk-lib/aws-cloudfront";
+import { Distribution, ViewerProtocolPolicy, AllowedMethods, LambdaEdgeEventType, CachedMethods, CachePolicy, } from "aws-cdk-lib/aws-cloudfront";
 import { S3Origin, HttpOrigin, OriginGroup, } from "aws-cdk-lib/aws-cloudfront-origins";
 import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
@@ -54,7 +54,20 @@ export class NextjsSite extends SsrSite {
         });
         return ssrFn.function;
     }
-    createImageOptimizationFunctionForRegional() {
+    createFunctionForEdge() {
+        const { runtime, timeout, memorySize, bind, permissions, environment } = this.props;
+        return new EdgeFunction(this, "ServerFunction", {
+            bundle: path.join(this.props.path, ".open-next", "server-function"),
+            handler: "index.handler",
+            runtime,
+            timeout,
+            memorySize,
+            bind,
+            permissions,
+            environment,
+        });
+    }
+    createImageOptimizationFunction() {
         const { imageOptimization, path: sitePath } = this.props;
         return new CdkFunction(this, `ImageFunction`, {
             description: "Image optimization handler for Next.js",
@@ -83,86 +96,7 @@ export class NextjsSite extends SsrSite {
             ],
         });
     }
-    createMiddlewareEdgeFunctionForRegional() {
-        const { permissions, environment, path: sitePath } = this.props;
-        const middlewarePath = path.resolve(sitePath, ".open-next/middleware-function");
-        if (fs.existsSync(middlewarePath)) {
-            return new EdgeFunction(this, "Middleware", {
-                bundle: middlewarePath,
-                handler: "index.handler",
-                runtime: "nodejs18.x",
-                timeout: 5,
-                memorySize: 128,
-                permissions,
-                environment,
-                nodejs: {
-                    format: "esm",
-                },
-            });
-        }
-    }
     createCloudFrontDistributionForRegional() {
-        const { cdk } = this.props;
-        const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new S3Origin(this.cdk.bucket);
-        // Create server behavior
-        const middlewareFn = this.createMiddlewareEdgeFunctionForRegional();
-        const serverFnUrl = this.serverLambdaForRegional.addFunctionUrl({
-            authType: FunctionUrlAuthType.NONE,
-        });
-        const serverBehavior = {
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            origin: new HttpOrigin(Fn.parseDomainName(serverFnUrl.url)),
-            allowedMethods: AllowedMethods.ALLOW_ALL,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
-            edgeLambdas: middlewareFn && [
-                {
-                    eventType: LambdaEdgeEventType.VIEWER_REQUEST,
-                    functionVersion: middlewareFn.currentVersion,
-                },
-            ],
-        };
-        // Create image optimization behavior
-        const imageFn = this.createImageOptimizationFunctionForRegional();
-        const imageFnUrl = imageFn.addFunctionUrl({
-            authType: FunctionUrlAuthType.NONE,
-        });
-        const imageBehavior = {
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            origin: new HttpOrigin(Fn.parseDomainName(imageFnUrl.url)),
-            allowedMethods: AllowedMethods.ALLOW_ALL,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy: serverBehavior.cachePolicy,
-        };
-        // Create statics behavior
-        const staticFileBehaviour = {
-            origin: s3Origin,
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy: CachePolicy.CACHING_OPTIMIZED,
-        };
-        // Create default behavior
-        // default handler for requests that don't match any other path:
-        //   - try lambda handler first
-        //   - if failed, fall back to S3
-        const fallbackOriginGroup = new OriginGroup({
-            primaryOrigin: serverBehavior.origin,
-            fallbackOrigin: s3Origin,
-            fallbackStatusCodes: [404],
-        });
-        const defaultBehavior = {
-            origin: fallbackOriginGroup,
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            compress: true,
-            cachePolicy: serverBehavior.cachePolicy,
-            edgeLambdas: serverBehavior.edgeLambdas,
-            ...(cfDistributionProps.defaultBehavior || {}),
-        };
         /**
          * Next.js requests
          *
@@ -212,6 +146,42 @@ export class NextjsSite extends SsrSite {
          *    - Cache-Control: public, max-age=0, must-revalidate
          *    - x-vercel-cache: MISS
          */
+        const { cdk } = this.props;
+        const cfDistributionProps = cdk?.distribution || {};
+        const s3Origin = new S3Origin(this.cdk.bucket);
+        const serverFnUrl = this.serverLambdaForRegional.addFunctionUrl({
+            authType: FunctionUrlAuthType.NONE,
+        });
+        const serverOrigin = new HttpOrigin(Fn.parseDomainName(serverFnUrl.url));
+        const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
+        const originRequestPolicy = this.buildServerOriginRequestPolicy();
+        const serverBehavior = this.buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy);
+        return new Distribution(this, "Distribution", {
+            // these values can be overwritten by cfDistributionProps
+            defaultRootObject: "",
+            // Override props.
+            ...cfDistributionProps,
+            // these values can NOT be overwritten by cfDistributionProps
+            domainNames: this.buildDistributionDomainNames(),
+            certificate: this.cdk.certificate,
+            defaultBehavior: this.buildDefaultNextjsBehaviorForRegional(serverOrigin, s3Origin, cachePolicy, originRequestPolicy),
+            additionalBehaviors: {
+                "api/*": serverBehavior,
+                "_next/data/*": serverBehavior,
+                "_next/image*": this.buildImageBehavior(cachePolicy),
+                "_next/*": this.buildStaticFileBehavior(s3Origin),
+                ...(cfDistributionProps.additionalBehaviors || {}),
+            },
+        });
+    }
+    createCloudFrontDistributionForEdge() {
+        const { cdk } = this.props;
+        const cfDistributionProps = cdk?.distribution || {};
+        const s3Origin = new S3Origin(this.cdk.bucket);
+        const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
+        const originRequestPolicy = this.buildServerOriginRequestPolicy();
+        const functionVersion = this.serverLambdaForEdge.currentVersion;
+        const serverBehavior = this.buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy);
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",
@@ -220,34 +190,111 @@ export class NextjsSite extends SsrSite {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.cdk.certificate,
-            defaultBehavior: defaultBehavior,
+            defaultBehavior: this.buildDefaultNextjsBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy),
             additionalBehaviors: {
                 "api/*": serverBehavior,
                 "_next/data/*": serverBehavior,
-                "_next/image*": imageBehavior,
-                "_next/*": staticFileBehaviour,
+                "_next/image*": this.buildImageBehavior(cachePolicy),
+                "_next/*": this.buildStaticFileBehavior(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
     }
-    createCloudFrontServerCachePolicy() {
-        return new CachePolicy(this, "ServerCache", {
-            queryStringBehavior: CacheQueryStringBehavior.all(),
-            headerBehavior: CacheHeaderBehavior.allowList(
-            // required by image optimization request
-            "accept", 
-            // required by server request
-            "x-op-middleware-request-headers", "x-op-middleware-response-headers", "x-nextjs-data", "x-middleware-prefetch", 
-            // required by server request (in-place routing)
-            "rsc", "next-router-prefetch", "next-router-state-tree"),
-            cookieBehavior: CacheCookieBehavior.all(),
-            defaultTtl: CdkDuration.days(0),
-            maxTtl: CdkDuration.days(365),
-            minTtl: CdkDuration.days(0),
-            enableAcceptEncodingBrotli: true,
-            enableAcceptEncodingGzip: true,
-            comment: "SST server response cache policy",
+    buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy) {
+        return {
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            origin: serverOrigin,
+            allowedMethods: AllowedMethods.ALLOW_ALL,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            compress: true,
+            cachePolicy,
+            originRequestPolicy,
+        };
+    }
+    buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy) {
+        return {
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            origin: s3Origin,
+            allowedMethods: AllowedMethods.ALLOW_ALL,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            compress: true,
+            cachePolicy,
+            originRequestPolicy,
+            edgeLambdas: [
+                {
+                    includeBody: true,
+                    eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
+                    functionVersion,
+                },
+            ],
+        };
+    }
+    buildImageBehavior(cachePolicy) {
+        const imageFn = this.createImageOptimizationFunction();
+        const imageFnUrl = imageFn.addFunctionUrl({
+            authType: FunctionUrlAuthType.NONE,
         });
+        return {
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            origin: new HttpOrigin(Fn.parseDomainName(imageFnUrl.url)),
+            allowedMethods: AllowedMethods.ALLOW_ALL,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            compress: true,
+            cachePolicy,
+        };
+    }
+    buildStaticFileBehavior(s3Origin) {
+        return {
+            origin: s3Origin,
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            compress: true,
+            cachePolicy: CachePolicy.CACHING_OPTIMIZED,
+        };
+    }
+    buildDefaultNextjsBehaviorForRegional(serverOrigin, s3Origin, cachePolicy, originRequestPolicy) {
+        // Create default behavior
+        // default handler for requests that don't match any other path:
+        //   - try lambda handler first
+        //   - if failed, fall back to S3
+        const { cdk } = this.props;
+        const cfDistributionProps = cdk?.distribution || {};
+        const fallbackOriginGroup = new OriginGroup({
+            primaryOrigin: serverOrigin,
+            fallbackOrigin: s3Origin,
+            fallbackStatusCodes: [404],
+        });
+        return {
+            origin: fallbackOriginGroup,
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            compress: true,
+            cachePolicy,
+            originRequestPolicy,
+            ...(cfDistributionProps.defaultBehavior || {}),
+        };
+    }
+    buildDefaultNextjsBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy) {
+        const { cdk } = this.props;
+        const cfDistributionProps = cdk?.distribution || {};
+        return {
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            origin: s3Origin,
+            allowedMethods: AllowedMethods.ALLOW_ALL,
+            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
+            compress: true,
+            cachePolicy,
+            originRequestPolicy,
+            ...(cfDistributionProps.defaultBehavior || {}),
+            edgeLambdas: [
+                {
+                    includeBody: true,
+                    eventType: LambdaEdgeEventType.ORIGIN_REQUEST,
+                    functionVersion,
+                },
+                ...(cfDistributionProps.defaultBehavior?.edgeLambdas || []),
+            ],
+        };
     }
     generateBuildId() {
         const filePath = path.join(this.props.path, ".next/BUILD_ID");

package/constructs/SsrSite.d.ts

@@ -4,7 +4,6 @@ import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
 import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy } from "aws-cdk-lib/aws-cloudfront";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
-import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, Function } from "./Function.js";
 import { EdgeFunction } from "./EdgeFunction.js";
@@ -198,7 +197,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected props: SsrSiteNormalizedProps;
     private doNotDeploy;
     protected buildConfig: SsrBuildConfig;
-    private serverLambdaForEdge?;
+    protected serverLambdaForEdge?: EdgeFunction;
     protected serverLambdaForRegional?: CdkFunction;
     private serverLambdaForDev?;
     private bucket;
@@ -264,14 +263,14 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private createFunctionPermissionsForEdge;
     private validateCloudFrontDistributionSettings;
     protected createCloudFrontDistributionForRegional(): Distribution;
-    private createCloudFrontDistributionForEdge;
+    protected createCloudFrontDistributionForEdge(): Distribution;
     protected buildDistributionDomainNames(): string[];
-    private buildDistributionDefaultBehaviorForRegional;
-    private buildDistributionDefaultBehaviorForEdge;
+    protected buildDefaultBehaviorForRegional(): BehaviorOptions;
+    private buildDefaultBehaviorForEdge;
     private buildBehaviorFunctionAssociations;
-    protected buildDistributionStaticFileBehaviors(origin: S3Origin): Record<string, BehaviorOptions>;
-    protected createCloudFrontServerCachePolicy(): CachePolicy;
-    protected createCloudFrontServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;
+    private buildStaticFileBehaviors;
+    protected buildServerCachePolicy(): CachePolicy;
+    protected buildServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;
     private createCloudFrontInvalidation;
     protected validateCustomDomainSettings(): void;
     protected lookupHostedZone(): IHostedZone | undefined;

package/constructs/SsrSite.js

@@ -466,9 +466,9 @@ export class SsrSite extends Construct {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
-            defaultBehavior: this.buildDistributionDefaultBehaviorForRegional(),
+            defaultBehavior: this.buildDefaultBehaviorForRegional(),
             additionalBehaviors: {
-                ...this.buildDistributionStaticFileBehaviors(s3Origin),
+                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -485,9 +485,9 @@ export class SsrSite extends Construct {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
-            defaultBehavior: this.buildDistributionDefaultBehaviorForEdge(s3Origin),
+            defaultBehavior: this.buildDefaultBehaviorForEdge(s3Origin),
             additionalBehaviors: {
-                ...this.buildDistributionStaticFileBehaviors(s3Origin),
+                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -511,7 +511,7 @@ export class SsrSite extends Construct {
         }
         return domainNames;
     }
-    buildDistributionDefaultBehaviorForRegional() {
+    buildDefaultBehaviorForRegional() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         const fnUrl = this.serverLambdaForRegional.addFunctionUrl({
@@ -524,12 +524,12 @@ export class SsrSite extends Construct {
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
-            originRequestPolicy: this.createCloudFrontServerOriginRequestPolicy(),
+            cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
+            originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
         };
     }
-    buildDistributionDefaultBehaviorForEdge(origin) {
+    buildDefaultBehaviorForEdge(origin) {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         return {
@@ -539,10 +539,9 @@ export class SsrSite extends Construct {
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
-            originRequestPolicy: this.createCloudFrontServerOriginRequestPolicy(),
+            cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
+            originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
-            // concatenate edgeLambdas
             edgeLambdas: [
                 {
                     includeBody: true,
@@ -568,7 +567,7 @@ function handler(event) {
             },
         ];
     }
-    buildDistributionStaticFileBehaviors(origin) {
+    buildStaticFileBehaviors(origin) {
         const { cdk } = this.props;
         // Create additional behaviours for statics
         const staticBehaviourOptions = {
@@ -592,7 +591,7 @@ function handler(event) {
         }
         return staticsBehaviours;
     }
-    createCloudFrontServerCachePolicy() {
+    buildServerCachePolicy() {
         return new CachePolicy(this, "ServerCache", {
             queryStringBehavior: CacheQueryStringBehavior.all(),
             headerBehavior: CacheHeaderBehavior.none(),
@@ -605,7 +604,7 @@ function handler(event) {
             comment: "SST server response cache policy",
         });
     }
-    createCloudFrontServerOriginRequestPolicy() {
+    buildServerOriginRequestPolicy() {
         // CloudFront's Managed-AllViewerExceptHostHeader policy
         return OriginRequestPolicy.fromOriginRequestPolicyId(this, "ServerOriginRequestPolicy", "b689b0a8-53d0-40ab-baf2-68738e2966ac");
     }

package/node/future/auth/adapter/facebook.d.ts

@@ -0,0 +1,16 @@
+import { OauthBasicConfig } from "./oauth.js";
+export declare const FacebookAdapter: (config: OauthBasicConfig) => () => Promise<{
+    type: "success";
+    properties: {
+        tokenset: import("openid-client").TokenSet;
+        client: import("openid-client").BaseClient;
+    };
+} | {
+    type: "step";
+    properties: {
+        statusCode: number;
+        headers: {
+            location: string;
+        };
+    };
+}>;

package/node/future/auth/adapter/facebook.js

@@ -0,0 +1,27 @@
+import { Issuer } from "openid-client";
+import { OauthAdapter } from "./oauth.js";
+// Facebook's OIDC flow returns "id_token" as uri hash in redirect uri. Hashes
+// are not passed to Lambda event object. It is likely that Facebook only wants
+// to support redirecting to a frontend uri.
+//
+// We are only going to support the OAuth flow for now. More details about the flow:
+// https://developers.facebook.com/docs/facebook-login/guides/advanced/oidc-token
+//
+// Also note that Facebook's discover uri does not work for the OAuth flow, as the
+// token_endpoint and userinfo_endpoint are not included in the response.
+// await Issuer.discover("https://www.facebook.com/.well-known/openid-configuration/");
+const issuer = new Issuer({
+    issuer: "https://www.facebook.com",
+    authorization_endpoint: "https://facebook.com/dialog/oauth/",
+    jwks_uri: "https://www.facebook.com/.well-known/oauth/openid/jwks/",
+    token_endpoint: "https://graph.facebook.com/oauth/access_token",
+    userinfo_endpoint: "https://graph.facebook.com/oauth/access_token",
+});
+export const FacebookAdapter = 
+/* @__PURE__ */
+(config) => {
+    return OauthAdapter({
+        issuer,
+        ...config,
+    });
+};

package/node/future/auth/index.d.ts

@@ -5,7 +5,9 @@ export * from "./adapter/oidc.js";
 export * from "./adapter/google.js";
 export * from "./adapter/link.js";
 export * from "./adapter/github.js";
+export * from "./adapter/facebook.js";
 export * from "./adapter/oauth.js";
 export type { Adapter } from "./adapter/adapter.js";
 export * from "./session.js";
 export * from "./handler.js";
+export { Issuer } from "openid-client";

package/node/future/auth/index.js

@@ -5,6 +5,8 @@ export * from "./adapter/oidc.js";
 export * from "./adapter/google.js";
 export * from "./adapter/link.js";
 export * from "./adapter/github.js";
+export * from "./adapter/facebook.js";
 export * from "./adapter/oauth.js";
 export * from "./session.js";
 export * from "./handler.js";
+export { Issuer } from "openid-client";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.3.6",
+  "version": "2.4.0",
   "bin": {
     "sst": "cli/sst.js"
   },