sst 2.10.4 → 2.11.0

package/cli/commands/secrets/list.d.ts

@@ -14,4 +14,6 @@ export declare const list: (program: Program) => import("yargs").Argv<{
     future: boolean | undefined;
 } & {
     format: string | undefined;
+} & {
+    fallback: boolean | undefined;
 }>;

package/cli/commands/secrets/list.js

@@ -1,11 +1,19 @@
-export const list = (program) => program.command("list [format]", "Fetch all the secrets", (yargs) => yargs.positional("format", {
+export const list = (program) => program.command("list [format]", "Fetch all the secrets", (yargs) => yargs
+    .positional("format", {
     type: "string",
     choices: ["table", "env", "json"],
-}), async (args) => {
+})
+    .boolean("fallback"), async (args) => {
     const { Config } = await import("../../../config.js");
     const { gray } = await import("colorette");
     const { Colors } = await import("../../colors.js");
-    const secrets = await Config.secrets();
+    const configSecrets = await Config.secrets();
+    const secrets = !args.fallback
+        ? configSecrets
+        : Object.entries(configSecrets).reduce((carry, [key, value]) => ({
+            ...carry,
+            ...(!value.value && !!value.fallback ? { [key]: value } : {}),
+        }), {});
     if (Object.entries(secrets).length === 0) {
         Colors.line("No secrets set");
         return;
@@ -20,7 +28,7 @@ export const list = (program) => program.command("list [format]", "Fetch all the
             break;
         case "env":
             for (const [key, value] of Object.entries(secrets)) {
-                console.log(`${key}=${value.value || value.fallback}`);
+                console.log(`${key}=${value.value || `${value.fallback} #fallback`}`);
             }
             break;
         case "table":
@@ -42,7 +50,8 @@ export const list = (program) => program.command("list [format]", "Fetch all the
                 const value = secrets[key].value
                     ? secrets[key].value
                     : `${secrets[key].fallback} ${gray("(fallback)")}`;
-                console.log(`│ ${key.padEnd(keyLen)} │ ${value.padEnd(valueLen)} │`);
+                const colourPadding = secrets[key].value ? 0 : gray("").length;
+                console.log(`│ ${key.padEnd(keyLen)} │ ${value.padEnd(valueLen + colourPadding)} │`);
             });
             console.log("└".padEnd(keyLen + 3, "─") +
                 "┴" +

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

@@ -1,7 +1,15 @@
 import { OidcBasicConfig } from "./oidc.js";
-type GoogleConfig = OidcBasicConfig & {
+import { OauthBasicConfig } from "./oauth.js";
+type GooglePrompt = "none" | "consent" | "select_account";
+type GoogleAccessType = "offline" | "online";
+type GoogleConfig = (OauthBasicConfig & {
+    mode: "oauth";
+    prompt?: GooglePrompt;
+    accessType?: GoogleAccessType;
+}) | (OidcBasicConfig & {
     mode: "oidc";
-};
+    prompt?: GooglePrompt;
+});
 export declare function GoogleAdapter(config: GoogleConfig): () => Promise<{
     type: "success";
     properties: {

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

@@ -1,7 +1,19 @@
 import { Issuer } from "openid-client";
 import { OidcAdapter } from "./oidc.js";
+import { OauthAdapter } from "./oauth.js";
 const issuer = await Issuer.discover("https://accounts.google.com");
 export function GoogleAdapter(config) {
+    /* @__PURE__ */
+    if (config.mode === "oauth") {
+        return OauthAdapter({
+            issuer,
+            ...config,
+            params: {
+                ...(config.accessType && { access_type: config.accessType }),
+                ...config.params,
+            },
+        });
+    }
     return OidcAdapter({
         issuer,
         scope: "openid email profile",

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

@@ -1,6 +1,7 @@
 import { OidcBasicConfig } from "./oidc.js";
 type MicrosoftConfig = OidcBasicConfig & {
     mode: "oidc";
+    prompt?: "login" | "none" | "consent" | "select_account";
 };
 export declare function MicrosoftAdapter(config: MicrosoftConfig): () => Promise<{
     type: "success";

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

@@ -12,7 +12,14 @@ export interface OauthBasicConfig {
      * Various scopes requested for the access token
      */
     scope: string;
+    /**
+     * Determines whether users will be prompted for reauthentication and consent
+     */
     prompt?: string;
+    /**
+     * Additional parameters to be passed to the authorization endpoint
+     */
+    params?: Record<string, string>;
 }
 export interface OauthConfig extends OauthBasicConfig {
     issuer: Issuer;

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

@@ -22,6 +22,7 @@ export const OauthAdapter =
                 code_challenge_method: "S256",
                 state,
                 prompt: config.prompt,
+                ...config.params,
             });
             useResponse().cookies({
                 auth_code_verifier: code_verifier,

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

@@ -4,6 +4,10 @@ export interface OidcBasicConfig {
      * The clientID provided by the third party oauth service
      */
     clientID: string;
+    /**
+     * Determines whether users will be prompted for reauthentication and consent
+     */
+    prompt?: string;
 }
 export interface OidcConfig extends OidcBasicConfig {
     issuer: Issuer;

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

@@ -17,6 +17,7 @@ export const OidcAdapter = /* @__PURE__ */ (config) => {
                 response_mode: "form_post",
                 nonce,
                 state,
+                prompt: config.prompt,
             });
             useResponse().cookies({
                 auth_nonce: nonce,

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.10.4",
+  "version": "2.11.0",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -7707,12 +7707,19 @@ var list = (program2) => program2.command(
   (yargs2) => yargs2.positional("format", {
     type: "string",
     choices: ["table", "env", "json"]
-  }),
+  }).boolean("fallback"),
   async (args) => {
     const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
     const { gray } = await import("colorette");
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
-    const secrets2 = await Config2.secrets();
+    const configSecrets = await Config2.secrets();
+    const secrets2 = !args.fallback ? configSecrets : Object.entries(configSecrets).reduce(
+      (carry, [key, value]) => ({
+        ...carry,
+        ...!value.value && !!value.fallback ? { [key]: value } : {}
+      }),
+      {}
+    );
     if (Object.entries(secrets2).length === 0) {
       Colors2.line("No secrets set");
       return;
@@ -7729,7 +7736,9 @@ var list = (program2) => program2.command(
         break;
       case "env":
         for (const [key, value] of Object.entries(secrets2)) {
-          console.log(`${key}=${value.value || value.fallback}`);
+          console.log(
+            `${key}=${value.value || `${value.fallback} #fallback`}`
+          );
         }
         break;
       case "table":
@@ -7755,8 +7764,11 @@ var list = (program2) => program2.command(
         );
         keys.sort().forEach((key) => {
           const value = secrets2[key].value ? secrets2[key].value : `${secrets2[key].fallback} ${gray("(fallback)")}`;
+          const colourPadding = secrets2[key].value ? 0 : gray("").length;
           console.log(
-            `\u2502 ${key.padEnd(keyLen)} \u2502 ${value.padEnd(valueLen)} \u2502`
+            `\u2502 ${key.padEnd(keyLen)} \u2502 ${value.padEnd(
+              valueLen + colourPadding
+            )} \u2502`
           );
         });
         console.log(