sst 2.24.14 → 2.24.15

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

@@ -1,27 +1,18 @@
 import { APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2 } from "aws-lambda";
 import { Adapter } from "./adapter/adapter.js";
 import { SignerOptions } from "fast-jwt";
-import { SessionValue } from "./session.js";
-declare const onSuccessResponse: {
-    session(input: SessionCreateInput): {
+import { SessionBuilder, SessionValue } from "./session.js";
+interface OnSuccessResponder<T> {
+    session(input: T & Partial<SignerOptions>): {
         type: "session";
-        properties: SessionCreateInput;
+        properties: T;
     };
     http(input: APIGatewayProxyStructuredResultV2): {
         type: "http";
-        properties: APIGatewayProxyStructuredResultV2;
+        properties: typeof input;
     };
-    provider(provider: string): {
-        type: "http";
-        properties: {
-            statusCode: number;
-            headers: {
-                Location: string;
-            };
-        };
-    };
-};
-export declare function AuthHandler<Providers extends Record<string, Adapter<any>>, Result = {
+}
+export declare function AuthHandler<Providers extends Record<string, Adapter<any>>, Sessions extends SessionBuilder, Result = {
     [key in keyof Providers]: {
         provider: key;
     } & Extract<Awaited<ReturnType<Providers[key]>>, {
@@ -29,11 +20,11 @@ export declare function AuthHandler<Providers extends Record<string, Adapter<any
     }>["properties"];
 }[keyof Providers]>(input: {
     providers: Providers;
+    sessions?: Sessions;
     clients: () => Promise<Record<string, string>>;
     onAuthorize?: (event: APIGatewayProxyEventV2) => Promise<void | keyof Providers>;
-    onSuccess: (input: Result, response: typeof onSuccessResponse) => Promise<ReturnType<(typeof onSuccessResponse)[keyof typeof onSuccessResponse]>>;
+    onSuccess: (input: Result, response: OnSuccessResponder<SessionValue | Sessions["$type"]>) => Promise<ReturnType<OnSuccessResponder<SessionValue | Sessions["$type"]>[keyof OnSuccessResponder<any>]>>;
     onIndex?: (event: APIGatewayProxyEventV2) => Promise<APIGatewayProxyStructuredResultV2>;
     onError?: () => Promise<APIGatewayProxyStructuredResultV2>;
 }): (event: APIGatewayProxyEventV2, context: import("aws-lambda").Context) => Promise<APIGatewayProxyStructuredResultV2>;
-export type SessionCreateInput = SessionValue & Partial<SignerOptions>;
 export {};

package/node/future/auth/handler.js

@@ -1,34 +1,6 @@
 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";
-const onSuccessResponse = {
-    session(input) {
-        return {
-            type: "session",
-            properties: input,
-        };
-    },
-    http(input) {
-        return {
-            type: "http",
-            properties: input,
-        };
-    },
-    provider(provider) {
-        return {
-            type: "http",
-            properties: {
-                statusCode: 302,
-                headers: {
-                    Location: "/authorize?" +
-                        new URLSearchParams({
-                            provider,
-                        }).toString(),
-                },
-            },
-        };
-    },
-};
 export function AuthHandler(input) {
     return ApiHandler(async (evt) => {
         const step = usePathParam("step");
@@ -184,7 +156,20 @@ export function AuthHandler(input) {
             const onSuccess = await input.onSuccess({
                 provider,
                 ...result.properties,
-            }, onSuccessResponse);
+            }, {
+                http(input) {
+                    return {
+                        type: "http",
+                        properties: input,
+                    };
+                },
+                session(input) {
+                    return {
+                        type: "session",
+                        properties: input,
+                    };
+                },
+            });
             console.log("onSuccess", onSuccess);
             if (onSuccess.type === "session") {
                 const { type, properties, ...rest } = onSuccess.properties;

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

@@ -43,4 +43,35 @@ export declare const Session: {
     create: typeof create;
     verify: typeof verify;
 };
+export type SessionBuilder = ReturnType<typeof createSessionBuilder>;
+export declare function createSessionBuilder<SessionTypes extends Record<string, any> = {}>(): {
+    create<T extends ({ [type in keyof SessionTypes]: {
+        type: type;
+        properties: SessionTypes[type];
+    }; }[keyof SessionTypes] | {
+        type: "public";
+        properties: {};
+    })["type"]>(type: T, properties: SessionTypes[T], options?: Partial<SignerOptions>): string;
+    verify(token: string): { [type in keyof SessionTypes]: {
+        type: type;
+        properties: SessionTypes[type];
+    }; }[keyof SessionTypes] | {
+        type: "public";
+        properties: {};
+    };
+    use(): { [type in keyof SessionTypes]: {
+        type: type;
+        properties: SessionTypes[type];
+    }; }[keyof SessionTypes] | {
+        type: "public";
+        properties: {};
+    };
+    $type: { [type in keyof SessionTypes]: {
+        type: type;
+        properties: SessionTypes[type];
+    }; }[keyof SessionTypes] | {
+        type: "public";
+        properties: {};
+    };
+};
 export {};

package/node/future/auth/session.js

@@ -106,3 +106,42 @@ export const Session = {
     create,
     verify,
 };
+export function createSessionBuilder() {
+    return {
+        create(type, properties, options) {
+            // @ts-expect-error
+            const key = Config[process.env.AUTH_ID + "PrivateKey"];
+            const signer = createSigner({
+                ...options,
+                key,
+                algorithm: "RS512",
+            });
+            const token = signer({
+                type: type,
+                properties: properties,
+            });
+            return token;
+        },
+        verify(token) {
+            if (token) {
+                try {
+                    const jwt = createVerifier({
+                        algorithms: ["RS512"],
+                        key: getPublicKey(),
+                    })(token);
+                    return jwt;
+                }
+                catch (e) { }
+            }
+            return {
+                type: "public",
+                properties: {},
+            };
+        },
+        use() {
+            const ctx = SessionMemo();
+            return ctx;
+        },
+        $type: {},
+    };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.24.14",
+  "version": "2.24.15",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -71,7 +71,7 @@
     "dotenv": "^16.0.3",
     "esbuild": "0.18.13",
     "express": "^4.18.2",
-    "fast-jwt": "^1.6.1",
+    "fast-jwt": "^3.1.1",
     "get-port": "^6.1.2",
     "glob": "^8.0.3",
     "graphql": "*",

package/support/signing-function/index.mjs

@@ -40,7 +40,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tslib@2.6.0/node_modules/tslib/tslib.es6.mjs
+// ../../node_modules/.pnpm/tslib@2.6.1/node_modules/tslib/tslib.es6.mjs
 var tslib_es6_exports = {};
 __export(tslib_es6_exports, {
   __addDisposableResource: () => __addDisposableResource,
@@ -460,7 +460,7 @@ function __classPrivateFieldIn(state, receiver) {
 }
 function __addDisposableResource(env, value, async) {
   if (value !== null && value !== void 0) {
-    if (typeof value !== "object")
+    if (typeof value !== "object" && typeof value !== "function")
       throw new TypeError("Object expected.");
     var dispose;
     if (async) {
@@ -507,7 +507,7 @@ function __disposeResources(env) {
 }
 var extendStatics, __assign, __createBinding, __setModuleDefault, _SuppressedError, tslib_es6_default;
 var init_tslib_es6 = __esm({
-  "../../node_modules/.pnpm/tslib@2.6.0/node_modules/tslib/tslib.es6.mjs"() {
+  "../../node_modules/.pnpm/tslib@2.6.1/node_modules/tslib/tslib.es6.mjs"() {
     extendStatics = function(d, b) {
       extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
         d2.__proto__ = b2;