sst 3.0.12 → 3.0.14

package/dist/auth/adapter/oauth.js

@@ -8,7 +8,7 @@ export const OauthAdapter =
 (config) => {
     return async function (routes, ctx) {
         function getClient(c) {
-            const callback = c.req.url.replace(/authorize$/, "callback");
+            const callback = c.req.url.replace(/authorize\/.*$/, "callback");
             return [
                 callback,
                 new config.issuer.Client({

package/dist/auth/adapter/oidc.js

@@ -3,7 +3,7 @@ import { getCookie } from "hono/cookie";
 export const OidcAdapter = /* @__PURE__ */ (config) => {
     return async function (routes, ctx) {
         routes.get("/authorize", async (c) => {
-            const callback = c.req.url.replace(/authorize$/, "callback");
+            const callback = c.req.url.replace(/authorize\/.*$/, "callback");
             const client = new config.issuer.Client({
                 client_id: config.clientID,
                 redirect_uris: [callback],
@@ -23,7 +23,7 @@ export const OidcAdapter = /* @__PURE__ */ (config) => {
             return c.redirect(url);
         });
         routes.post("/callback", async (c) => {
-            const callback = c.req.url.replace(/authorize$/, "callback");
+            const callback = c.req.url.replace(/authorize\/.*$/, "callback");
             const client = new config.issuer.Client({
                 client_id: config.clientID,
                 redirect_uris: [callback],

package/dist/auth/handler.d.ts

@@ -31,6 +31,7 @@ export declare class InvalidSessionError extends Error {
 export type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
+export declare const aws: <E extends import("hono").Env = import("hono").Env, S extends import("hono").Schema = {}, BasePath extends string = "/">(app: import("hono").Hono<E, S, BasePath>) => (event: import("hono/aws-lambda").LambdaEvent, lambdaContext?: import("hono/aws-lambda").LambdaContext | undefined) => Promise<import("hono/aws-lambda").APIGatewayProxyResult>;
 export declare function AuthHandler<Providers extends Record<string, Adapter<any>>, Sessions extends SessionBuilder = SessionBuilder, Result = {
     [key in keyof Providers]: Prettify<{
         provider: key;

package/dist/auth/handler.js

@@ -1,5 +1,6 @@
 import { SignJWT, importPKCS8, importSPKI, jwtVerify } from "jose";
 import { Hono } from "hono/tiny";
+import { handle as awsHandle } from "hono/aws-lambda";
 import { deleteCookie, getCookie, setCookie } from "hono/cookie";
 export class UnknownProviderError extends Error {
     provider;
@@ -36,6 +37,7 @@ export class InvalidSessionError extends Error {
 }
 import process from "node:process";
 import { Resource } from "../resource.js";
+export const aws = awsHandle;
 export function AuthHandler(input) {
     const app = new Hono();
     if (!input.callbacks.auth.error) {
@@ -50,12 +52,20 @@ export function AuthHandler(input) {
     }
     const options = {
         signing: {
-            privateKey: () => importPKCS8(process.env.AUTH_PRIVATE_KEY || Resource.AUTH_PRIVATE_KEY, "RS512"),
-            publicKey: () => importSPKI(process.env.AUTH_PUBLIC_KEY || Resource.AUTH_PUBLIC_KEY, "RS512"),
+            privateKey: () => importPKCS8(
+            // @ts-expect-error
+            process.env.AUTH_PRIVATE_KEY || Resource.AUTH_PRIVATE_KEY, "RS512"),
+            publicKey: () => importSPKI(
+            // @ts-expect-error
+            process.env.AUTH_PUBLIC_KEY || Resource.AUTH_PUBLIC_KEY, "RS512"),
         },
         encryption: {
-            privateKey: () => importPKCS8(process.env.AUTH_PRIVATE_KEY || Resource.AUTH_PRIVATE_KEY, "RSA-OAEP-512"),
-            publicKey: () => importSPKI(process.env.AUTH_PUBLIC_KEY || Resource.AUTH_PUBLIC_KEY, "RSA-OAEP-512"),
+            privateKey: () => importPKCS8(
+            // @ts-expect-error
+            process.env.AUTH_PRIVATE_KEY || Resource.AUTH_PRIVATE_KEY, "RSA-OAEP-512"),
+            publicKey: () => importSPKI(
+            // @ts-expect-error
+            process.env.AUTH_PUBLIC_KEY || Resource.AUTH_PUBLIC_KEY, "RSA-OAEP-512"),
         },
         algorithm: "RS512",
         async success(ctx, properties) {
@@ -119,7 +129,7 @@ export function AuthHandler(input) {
             });
         },
     };
-    app.get("/token", async (c) => {
+    app.post("/token", async (c) => {
         console.log("token request");
         const form = await c.req.formData();
         if (form.get("grant_type") !== "authorization_code") {
@@ -150,6 +160,7 @@ export function AuthHandler(input) {
         const response_type = c.req.query("response_type") || getCookie(c, "response_type");
         const redirect_uri = c.req.query("redirect_uri") || getCookie(c, "redirect_uri");
         const state = c.req.query("state") || getCookie(c, "state");
+        const client_id = c.req.query("client_id") || getCookie(c, "client_id");
         if (!provider) {
             c.status(400);
             return c.text("Missing provider");
@@ -162,10 +173,15 @@ export function AuthHandler(input) {
             c.status(400);
             return c.text("Missing response_type");
         }
+        if (!client_id) {
+            c.status(400);
+            return c.text("Missing client_id");
+        }
         options.cookie(c, "provider", provider, 60 * 10);
         options.cookie(c, "response_type", response_type, 60 * 10);
         options.cookie(c, "redirect_uri", redirect_uri, 60 * 10);
         options.cookie(c, "state", state || "", 60 * 10);
+        options.cookie(c, "client_id", client_id || "", 60 * 10);
         if (input.callbacks.auth.start) {
             await input.callbacks.auth.start(c.req.raw);
         }

package/dist/auth/session.js

@@ -13,7 +13,9 @@ export function createSessionBuilder() {
             return result.payload;
         },
         async create(session) {
-            const privateKey = await importPKCS8(process.env.AUTH_PRIVATE_KEY || Resource.AUTH_PRIVATE_KEY, "RS512");
+            const privateKey = await importPKCS8(
+            // @ts-expect-error
+            process.env.AUTH_PRIVATE_KEY || Resource.AUTH_PRIVATE_KEY, "RS512");
             const token = await new SignJWT(session)
                 .setProtectedHeader({ alg: "RS512" })
                 .setExpirationTime("1yr")

package/dist/resource.d.ts

@@ -1,5 +1,8 @@
 export interface Resource {
-    [key: string]: any;
+    App: {
+        name: string;
+        stage: string;
+    };
 }
 export declare function fromCloudflareEnv(input: any): void;
 export declare function wrapCloudflareHandler(handler: any): any;

package/dist/resource.js

@@ -20,6 +20,14 @@ export function fromCloudflareEnv(input) {
     }
 }
 export function wrapCloudflareHandler(handler) {
+    if (typeof handler === "function" && handler.hasOwnProperty("prototype")) {
+        return class extends handler {
+            constructor(ctx, env) {
+                fromCloudflareEnv(env);
+                super(ctx, env);
+            }
+        };
+    }
     function wrap(fn) {
         return function (req, env, ...rest) {
             fromCloudflareEnv(env);

package/dist/vector-client.js

@@ -5,6 +5,7 @@ export function VectorClient(name) {
     return {
         ingest: async (event) => {
             const ret = await lambda.send(new InvokeCommand({
+                // @ts-expect-error
                 FunctionName: Resource[name].ingestor,
                 Payload: JSON.stringify(event),
             }));
@@ -12,6 +13,7 @@ export function VectorClient(name) {
         },
         retrieve: async (event) => {
             const ret = await lambda.send(new InvokeCommand({
+                // @ts-expect-error
                 FunctionName: Resource[name].retriever,
                 Payload: JSON.stringify(event),
             }));
@@ -19,6 +21,7 @@ export function VectorClient(name) {
         },
         remove: async (event) => {
             const ret = await lambda.send(new InvokeCommand({
+                // @ts-expect-error
                 FunctionName: Resource[name].remover,
                 Payload: JSON.stringify(event),
             }));

package/package.json

@@ -3,7 +3,7 @@
   "name": "sst",
   "type": "module",
   "sideEffects": false,
-  "version": "3.0.12",
+  "version": "3.0.14",
   "main": "./dist/index.js",
   "exports": {
     ".": "./dist/index.js",