npm - sst - Versions diffs - 2.1.16 → 2.1.18 - Mend

sst 2.1.16 → 2.1.18

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.

Files changed (53) hide show

package/bootstrap.js +1 -1
package/cli/commands/bind.js +1 -1
package/cli/commands/env.js +1 -1
package/constructs/App.js +3 -3
package/constructs/AstroSite.js +8 -41
package/constructs/EdgeFunction.d.ts +19 -21
package/constructs/EdgeFunction.js +235 -167
package/constructs/Function.d.ts +1 -1
package/constructs/Function.js +3 -3
package/constructs/Job.js +2 -2
package/constructs/NextjsSite.d.ts +6 -5
package/constructs/NextjsSite.js +5 -3
package/constructs/RDS.js +1 -1
package/constructs/RemixSite.d.ts +2 -3
package/constructs/RemixSite.js +42 -71
package/constructs/SolidStartSite.js +8 -41
package/constructs/SsrFunction.d.ts +9 -6
package/constructs/SsrFunction.js +61 -50
package/constructs/SsrSite.d.ts +6 -4
package/constructs/SsrSite.js +0 -4
package/constructs/Stack.js +2 -1
package/constructs/future/Auth.d.ts +79 -0
package/constructs/future/Auth.js +116 -0
package/constructs/future/index.d.ts +1 -0
package/constructs/future/index.js +1 -0
package/context/handler.d.ts +1 -1
package/node/api/index.d.ts +27 -4
package/node/api/index.js +64 -2
package/node/auth/index.d.ts +3 -0
package/node/auth/index.js +3 -0
package/node/future/auth/adapter/adapter.d.ts +10 -0
package/node/future/auth/adapter/adapter.js +1 -0
package/node/future/auth/adapter/github.d.ts +16 -0
package/node/future/auth/adapter/github.js +22 -0
package/node/future/auth/adapter/google.d.ts +20 -0
package/node/future/auth/adapter/google.js +10 -0
package/node/future/auth/adapter/link.d.ts +11 -0
package/node/future/auth/adapter/link.js +48 -0
package/node/future/auth/adapter/oauth.d.ts +34 -0
package/node/future/auth/adapter/oauth.js +66 -0
package/node/future/auth/adapter/oidc.d.ts +26 -0
package/node/future/auth/adapter/oidc.js +62 -0
package/node/future/auth/handler.d.ts +18 -0
package/node/future/auth/handler.js +189 -0
package/node/future/auth/index.d.ts +10 -0
package/node/future/auth/index.js +10 -0
package/node/future/auth/session.d.ts +46 -0
package/node/future/auth/session.js +99 -0
package/node/util/index.js +1 -1
package/package.json +4 -1
package/runtime/handlers/node.js +1 -1
package/sst.mjs +4 -4
package/support/nodejs-runtime/index.mjs +62 -14629

package/node/future/auth/handler.js ADDED Viewed

@@ -0,0 +1,189 @@
+import { createSigner, createVerifier } from "fast-jwt";
+import { ApiHandler, useCookie, useCookies, useFormValue, usePathParam, useQueryParam, useQueryParams, useResponse, } from "../../api/index.js";
+import { Config } from "../../config/index.js";
+export function AuthHandler(input) {
+    return ApiHandler(async (evt) => {
+        const step = usePathParam("step");
+        if (!step) {
+            return {
+                statusCode: 200,
+                headers: {
+                    "Content-Type": "text/html",
+                },
+                body: `
+          <html>
+            <body>
+            ${Object.keys(input.providers).map((name) => {
+                    return `<a href="/authorize?provider=${name}&response_type=code&client_id=local&redirect_uri=http://localhost:300">${name}</a>`;
+                })}
+            </body>
+          </html>
+        `,
+            };
+        }
+        if (step === "token") {
+            if (useFormValue("grant_type") !== "authorization_code") {
+                return {
+                    statusCode: 400,
+                    body: "Invalid grant_type",
+                };
+            }
+            const code = useFormValue("code");
+            if (!code) {
+                return {
+                    statusCode: 400,
+                    body: "Missing code",
+                };
+            }
+            // @ts-expect-error
+            const pub = Config[process.env.AUTH_ID + "PublicKey"];
+            const verified = createVerifier({
+                algorithms: ["RS512"],
+                key: pub,
+            })(code);
+            if (verified.redirect_uri !== useFormValue("redirect_uri")) {
+                return {
+                    statusCode: 400,
+                    body: "redirect_uri mismatch",
+                };
+            }
+            if (verified.client_id !== useFormValue("client_id")) {
+                return {
+                    statusCode: 400,
+                    body: "client_id mismatch",
+                };
+            }
+            return {
+                statusCode: 200,
+                headers: {
+                    "content-type": "application/json",
+                },
+                body: JSON.stringify({
+                    access_token: verified.token,
+                }),
+            };
+        }
+        let provider = useCookie("provider");
+        if (step === "authorize") {
+            provider = useQueryParam("provider");
+            if (input.onAuthorize) {
+                const result = await input.onAuthorize(evt);
+                if (result)
+                    provider = result;
+            }
+            if (!provider) {
+                return {
+                    statusCode: 400,
+                    body: "Missing provider",
+                };
+            }
+            const { response_type, client_id, redirect_uri, state } = useQueryParams();
+            if (!provider) {
+                return {
+                    statusCode: 400,
+                    body: "Missing provider",
+                };
+            }
+            if (!response_type) {
+                return {
+                    statusCode: 400,
+                    body: "Missing response_type",
+                };
+            }
+            if (!client_id) {
+                return {
+                    statusCode: 400,
+                    body: "Missing client_id",
+                };
+            }
+            if (!redirect_uri) {
+                return {
+                    statusCode: 400,
+                    body: "Missing redirect_uri",
+                };
+            }
+            useResponse().cookies({
+                provider: provider,
+                response_type: response_type,
+                client_id: client_id,
+                redirect_uri: redirect_uri,
+                state: state || "",
+            }, {
+                maxAge: 60 * 15,
+                secure: true,
+                sameSite: "None",
+                httpOnly: true,
+            });
+        }
+        if (!provider || !input.providers[provider]) {
+            return {
+                statusCode: 400,
+                body: `Was not able to find provider "${String(provider)}"`,
+                headers: {
+                    "Content-Type": "text/html",
+                },
+            };
+        }
+        const adapter = input.providers[provider];
+        const result = await adapter(evt);
+        if (result.type === "step") {
+            return result.properties;
+        }
+        if (result.type === "success") {
+            const { type, properties, ...rest } = await input.onSuccess({
+                provider,
+                ...result.properties,
+            });
+            // @ts-expect-error
+            const priv = Config[process.env.AUTH_ID + "PrivateKey"];
+            const signer = createSigner({
+                ...rest,
+                key: priv,
+                algorithm: "RS512",
+            });
+            const token = signer({
+                type,
+                properties,
+            });
+            const { client_id, response_type, redirect_uri, state } = {
+                ...useCookies(),
+                ...useQueryParams(),
+            };
+            if (response_type === "token") {
+                return {
+                    statusCode: 302,
+                    headers: {
+                        Location: `${redirect_uri}#access_token=${token}&state=${state || ""}`,
+                    },
+                };
+            }
+            if (response_type === "code") {
+                // This allows the code to be reused within a 30 second window
+                // The code should be single use but we're making this tradeoff to remain stateless
+                // In the future can store this in a dynamo table to ensure single use
+                const code = createSigner({
+                    expiresIn: 1000 * 60 * 5,
+                    key: priv,
+                    algorithm: "RS512",
+                })({
+                    client_id,
+                    redirect_uri,
+                    token: token,
+                });
+                return {
+                    statusCode: 302,
+                    headers: {
+                        Location: `${redirect_uri}?code=${code}&state=${state || ""}`,
+                    },
+                };
+            }
+            return {
+                statusCode: 400,
+                body: `Unsupported response_type: ${response_type}`,
+            };
+        }
+        if (result.type === "error") {
+            return input.onError();
+        }
+    });
+}

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

@@ -0,0 +1,10 @@
+export interface AuthResources {
+}
+export declare const Auth: AuthResources;
+export * from "./adapter/oidc.js";
+export * from "./adapter/google.js";
+export * from "./adapter/link.js";
+export * from "./adapter/github.js";
+export * from "./adapter/oauth.js";
+export * from "./session.js";
+export * from "./handler.js";

package/node/future/auth/index.js ADDED Viewed

@@ -0,0 +1,10 @@
+import { createProxy, getVariables } from "../../util/index.js";
+export const Auth = createProxy("Auth");
+Object.assign(Auth, getVariables("Auth"));
+export * from "./adapter/oidc.js";
+export * from "./adapter/google.js";
+export * from "./adapter/link.js";
+export * from "./adapter/github.js";
+export * from "./adapter/oauth.js";
+export * from "./session.js";
+export * from "./handler.js";

package/node/future/auth/session.d.ts ADDED Viewed

@@ -0,0 +1,46 @@
+import { SignerOptions } from "fast-jwt";
+export interface SessionTypes {
+    public: {};
+}
+export type SessionValue = {
+    [type in keyof SessionTypes]: {
+        type: type;
+        properties: SessionTypes[type];
+    };
+}[keyof SessionTypes];
+export declare function useSession<T = SessionValue>(): T;
+/**
+ * Creates a new session token with provided information
+ *
+ * @example
+ * ```js
+ * Session.create({
+ *   type: "user",
+ *   properties: {
+ *     userID: "123"
+ *   }
+ * })
+ * ```
+ */
+declare function create<T extends keyof SessionTypes>(input: {
+    type: T;
+    properties: SessionTypes[T];
+    options?: Partial<SignerOptions>;
+}): string;
+/**
+ * Verifies a session token and returns the session data
+ *
+ * @example
+ * ```js
+ * Session.verify()
+ * ```
+ */
+declare function verify<T = SessionValue>(token: string): T | {
+    type: string;
+    properties: {};
+};
+export declare const Session: {
+    create: typeof create;
+    verify: typeof verify;
+};
+export {};

package/node/future/auth/session.js ADDED Viewed

@@ -0,0 +1,99 @@
+import { createSigner, createVerifier } from "fast-jwt";
+import { Context } from "../../../context/context.js";
+import { useCookie, useHeader } from "../../api/index.js";
+import { Auth } from "../../auth/index.js";
+import { Config } from "../../config/index.js";
+const SessionMemo = /* @__PURE__ */ Context.memo(() => {
+    let token = "";
+    const header = useHeader("authorization");
+    if (header)
+        token = header.substring(7);
+    const cookie = useCookie("sst_auth_token");
+    if (cookie)
+        token = cookie;
+    if (token) {
+        try {
+            const jwt = createVerifier({
+                algorithms: ["RS512"],
+                key: getPublicKey(),
+            })(token);
+            return jwt;
+        }
+        catch {
+            return {
+                type: "public",
+                properties: {},
+            };
+        }
+    }
+    return {
+        type: "public",
+        properties: {},
+    };
+});
+// This is a crazy TS hack to prevent the types from being evaluated too soon
+export function useSession() {
+    const ctx = SessionMemo();
+    return ctx;
+}
+function getPublicKey() {
+    const [first] = Object.values(Auth);
+    if (!first)
+        throw new Error("No auth provider found. Did you forget to add one?");
+    return first.publicKey;
+}
+/**
+ * Creates a new session token with provided information
+ *
+ * @example
+ * ```js
+ * Session.create({
+ *   type: "user",
+ *   properties: {
+ *     userID: "123"
+ *   }
+ * })
+ * ```
+ */
+function create(input) {
+    // @ts-expect-error
+    const key = Config[process.env.AUTH_ID + "PrivateKey"];
+    const signer = createSigner({
+        ...input.options,
+        key,
+        algorithm: "RS512",
+    });
+    const token = signer({
+        type: input.type,
+        properties: input.properties,
+    });
+    return token;
+}
+/**
+ * Verifies a session token and returns the session data
+ *
+ * @example
+ * ```js
+ * Session.verify()
+ * ```
+ */
+function verify(token) {
+    if (token) {
+        try {
+            const jwt = createVerifier({
+                algorithms: ["RS512"],
+                key: getPublicKey(),
+            })(token);
+            return jwt;
+        }
+        catch { }
+    }
+    return {
+        type: "public",
+        properties: {},
+    };
+}
+export const Session = {
+    create,
+    verify,
+};

package/node/util/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { GetParametersCommand, SSMClient, } from "@aws-sdk/client-ssm";
-const ssm = new SSMClient({});
+const ssm = new SSMClient({ region: process.env.SST_REGION });
 // Example:
 // {
 //   Bucket: {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -14,8 +14,10 @@
   },
   "exports": {
     "./constructs/deprecated": "./constructs/deprecated/index.js",
+    "./constructs/future": "./constructs/future/index.js",
     "./constructs": "./constructs/index.js",
     "./context": "./context/index.js",
+    "./node/future/*": "./node/future/*/index.js",
     "./node/*": "./node/*/index.js",
     ".": "./index.js",
     "./*": "./*"
@@ -113,6 +115,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "tsx": "^3.12.1",
+    "typescript": "^4.9.5",
     "vitest": "^0.28.3"
   },
   "peerDependencies": {

package/runtime/handlers/node.js CHANGED Viewed

@@ -116,7 +116,7 @@ export const useNodeHandler = Context.memo(async () => {
                     ? {
                         format: "esm",
                         target: "esnext",
-                        mainFields: isESM ? ["module", "main"] : undefined,
+                        mainFields: ["module", "main"],
                         banner: {
                             js: [
                                 `import { createRequire as topLevelCreateRequire } from 'module';`,

package/sst.mjs CHANGED Viewed

@@ -2919,7 +2919,7 @@ async function bootstrapCDK() {
           AWS_PROFILE: profile
         },
         stdio: "pipe",
-        shell: process.env.SHELL || true
+        shell: true
       }
     );
     let stderr = "";
@@ -4990,7 +4990,7 @@ var init_node = __esm({
             ...isESM ? {
               format: "esm",
               target: "esnext",
-              mainFields: isESM ? ["module", "main"] : void 0,
+              mainFields: ["module", "main"],
               banner: {
                 js: [
                   `import { createRequire as topLevelCreateRequire } from 'module';`,
@@ -6720,7 +6720,7 @@ var env = (program2) => program2.command(
           AWS_REGION: project.config.region
         },
         stdio: "inherit",
-        shell: process.env.SHELL || true
+        shell: true
       });
       process.exitCode = result.status || void 0;
       break;
@@ -7061,7 +7061,7 @@ var bind = (program2) => program2.command(
         AWS_REGION: project.config.region
       },
       stdio: "inherit",
-      shell: process.env.SHELL || true
+      shell: true
     });
     process.exitCode = result.status || void 0;
   }