@serve.zone/interfaces 23.0.1 → 23.0.2

package/changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2026-07-30 - 23.0.2
+
+### Fixes
+
+- allow mixed-case public environment keys (appstore)
+  - Accept public env var declarations and install publicEnvironment keys using public-key casing rules.
+  - Keep OIDC environment variables and secret inputs restricted to canonical secret keys.
+  - Add contract coverage for public key casing and secret key rejection.
+
 ## 2026-07-30 - 23.0.1
 
 ### Fixes

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/interfaces',
-    version: '23.0.1',
+    version: '23.0.2',
     description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=

package/dist_ts/appstore/types.js

@@ -6,7 +6,8 @@ export const appStoreStorageFeatureIds = {
     objectStorageV2: 'storage.object-storage.v2',
     objectStorageFileV2: 'storage.object-storage.file.v2',
 };
-const appStoreEnvKeyRegex = /^[A-Z_][A-Z0-9_]*$/;
+const appStorePublicEnvKeyRegex = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const appStoreSecretKeyRegex = /^[A-Z_][A-Z0-9_]*$/;
 export const validateAppStorePlatformOidcCapability = (capabilityArg) => {
     if (capabilityArg === undefined)
         return [];
@@ -34,7 +35,7 @@ export const validateAppStorePlatformOidcCapability = (capabilityArg) => {
         const values = keys.map((keyArg) => environment[keyArg]);
         keys.forEach((keyArg, indexArg) => {
             if (typeof values[indexArg] !== 'string'
-                || !appStoreEnvKeyRegex.test(values[indexArg])) {
+                || !appStoreSecretKeyRegex.test(values[indexArg])) {
                 errors.push(`platformOidc.environmentVariables.${keyArg} must be a valid environment key`);
             }
         });
@@ -99,8 +100,13 @@ export const validateAppStoreEnvironmentDeclarations = (declarationsArg) => {
         if (Object.keys(declaration).some((keyArg) => !allowedKeys.has(keyArg))) {
             errors.push(`envVars[${indexArg}] contains fields outside its exact channel schema`);
         }
-        if (typeof declaration.key !== 'string' || !appStoreEnvKeyRegex.test(declaration.key)) {
-            errors.push(`envVars[${indexArg}].key must be canonical`);
+        const keyRegex = declaration.secret === true
+            ? appStoreSecretKeyRegex
+            : appStorePublicEnvKeyRegex;
+        if (typeof declaration.key !== 'string' || !keyRegex.test(declaration.key)) {
+            errors.push(declaration.secret === true
+                ? `envVars[${indexArg}].key must be a canonical secret key`
+                : `envVars[${indexArg}].key must be a valid public environment key`);
         }
         else {
             keys.push(declaration.key);
@@ -182,7 +188,7 @@ export const validateAppStoreInstallRequest = async (requestArg, configArg, acti
     const publicEnvironment = request.publicEnvironment;
     if (!publicEnvironment || typeof publicEnvironment !== 'object'
         || Array.isArray(publicEnvironment)
-        || Object.entries(publicEnvironment).some(([keyArg, valueArg]) => (!appStoreEnvKeyRegex.test(keyArg) || typeof valueArg !== 'string'))) {
+        || Object.entries(publicEnvironment).some(([keyArg, valueArg]) => (!appStorePublicEnvKeyRegex.test(keyArg) || typeof valueArg !== 'string'))) {
         errors.push('install publicEnvironment must be a canonical string map');
     }
     const secretInputs = Array.isArray(request.secretInputs) ? request.secretInputs : [];
@@ -209,7 +215,7 @@ export const validateAppStoreInstallRequest = async (requestArg, configArg, acti
         if (JSON.stringify(Object.keys(input).sort()) !== JSON.stringify(['key', 'valueInput'])) {
             errors.push(`install secretInputs[${indexArg}] must use its exact schema`);
         }
-        if (typeof input.key !== 'string' || !appStoreEnvKeyRegex.test(input.key)) {
+        if (typeof input.key !== 'string' || !appStoreSecretKeyRegex.test(input.key)) {
             errors.push(`install secretInputs[${indexArg}].key must be canonical`);
             continue;
         }
@@ -276,4 +282,4 @@ export const validateAppStoreInstallRequest = async (requestArg, configArg, acti
     }
     return errors;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types.js","sourceRoot":"","sources":["../../ts/appstore/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0CAA0C,EAC1C,sBAAsB,EACtB,wBAAwB,EACxB,oCAAoC,GAKrC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,gCAAgC,GAEjC,MAAM,sBAAsB,CAAC;AAiC9B,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,UAAU,EAAE,qBAAqB;IACjC,YAAY,EAAE,uBAAuB;IACrC,eAAe,EAAE,2BAA2B;IAC5C,mBAAmB,EAAE,gCAAgC;CAC7C,CAAC;AA8KX,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,aAAsB,EACZ,EAAE;IACZ,IAAI,aAAa,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC3C,IAAI,CAAC,aAAa,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACxF,OAAO,CAAC,gCAAgC,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,UAAU,GAAG,aAAwC,CAAC;IAC5D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,OAAO,UAAU,CAAC,YAAY,KAAK,QAAQ;WAC1C,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;WACxC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;WACxC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;WACxC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;WACpC,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC,YAAY,EAAE,CAAC;QAClG,MAAM,CAAC,IAAI,CAAC,0FAA0F,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,gCAAgC,CAAC,UAAU,CAAC,KAAK,CAAC;SAC9D,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC,CAAC;IAElD,MAAM,WAAW,GAAG,UAAU,CAAC,oBAAoB,CAAC;IACpD,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAClF,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;IACrE,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,CAAU,CAAC;QAC3F,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAE,WAAuC,CAAC,MAAM,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAChC,IAAI,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,QAAQ;mBACnC,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAW,CAAC,EAAE,CAAC;gBAC3D,MAAM,CAAC,IAAI,CAAC,qCAAqC,MAAM,kCAAkC,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,IAAI,UAAU,CAAC,0BAA0B,KAAK,qBAAqB;WAC9D,UAAU,CAAC,0BAA0B,KAAK,oBAAoB,EAAE,CAAC;QACpE,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAG,CACjD,SAAkB,EACR,EAAE;IACZ,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5E,OAAO,CAAC,mCAAmC,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,MAAM,GAAG,SAAoC,CAAC;IACpD,MAAM,MAAM,GAAG;QACb,GAAG,sCAAsC,CAAC,MAAM,CAAC,YAAY,CAAC;QAC9D,GAAG,uCAAuC,CAAC,MAAM,CAAC,OAAO,CAAC;KAC3D,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ;WAC9D,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;QAAE,OAAO,MAAM,CAAC;IACvD,MAAM,UAAU,GAAG,MAAM,CAAC,YAAuC,CAAC;IAClE,IAAI,CAAC,UAAU,CAAC,oBAAoB,IAAI,OAAO,UAAU,CAAC,oBAAoB,KAAK,QAAQ;WACtF,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC;QAAE,OAAO,MAAM,CAAC;IACnE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACpE,MAAM,CAAC,CAAC,QAAQ,EAAsB,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC;IAC3E,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QACnD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAC7B,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAE,MAAkC,CAAC,GAAG;YACzC,CAAC,CAAC,SAAS,CACd,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAsB,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC;QAC3E,CAAC,CAAC,EAAE,CAAC;IACP,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,iCAAiC,GAAG,mCAAmC,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA4IF,MAAM,uBAAuB,GAAG,qCAAqC,CAAC;AAEtE,MAAM,CAAC,MAAM,uCAAuC,GAAG,CACrD,eAAwB,EACd,EAAE;IACZ,IAAI,eAAe,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QACpE,OAAO,CAAC,iCAAiC,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,QAAQ,EAAE,EAAE;QACnD,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3F,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,qBAAqB,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,MAAM,WAAW,GAAG,cAAyC,CAAC;QAC9D,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,KAAK,IAAI;YAC7C,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAC/E,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QACnE,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,oDAAoD,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,OAAO,WAAW,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACtF,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,yBAAyB,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,OAAO,WAAW,CAAC,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACzF,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,+BAA+B,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACpF,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,4BAA4B,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,WAAW,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAChC,IAAI,OAAO,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,oCAAoC,CAAC,CAAC;YACjG,IAAI,CAAC,CAAC,UAAU,IAAI,WAAW,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,wCAAwC,CAAC,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,WAAW,CAAC,QAAQ,CAAC;qBACxD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,QAAQ,KAAK,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,WAAW,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC;oBACtC,IAAI,EAAE,WAAW;oBACjB,GAAI,WAAW,CAAC,QAAoC;iBACrD,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,QAAQ,cAAc,QAAQ,EAAE,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,WAAW,CAAC,MAAM,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBACrE,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,gCAAgC,CAAC,CAAC;YACnE,CAAC;YACD,IAAI,UAAU,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,uCAAuC,CAAC,CAAC;YACvG,IAAI,UAAU,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,uCAAuC,CAAC,CAAC;YACvG,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,WAAW,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7E,MAAM,CAAC,IAAI,CAAC,WAAW,QAAQ,yCAAyC,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IACH,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM;QAAE,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACnF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,UAAmB,EACnB,SAAiC,EACjC,yBAAkD,EAC/B,EAAE;IACrB,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/E,OAAO,CAAC,mCAAmC,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,OAAO,GAAG,UAAqC,CAAC;IACtD,MAAM,eAAe,GAAG,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ;QAChE,CAAC,CAAC,SAAS,CAAC,OAAO;QACnB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,MAAM,GAAG,uCAAuC,CAAC,eAAe,CAAC,CAAC;IACxE,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;QACjC,YAAY;QACZ,OAAO;QACP,SAAS;QACT,WAAW;QACX,aAAa;QACb,QAAQ;QACR,MAAM;QACN,gBAAgB;QAChB,oBAAoB;QACpB,mBAAmB;QACnB,cAAc;KACf,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ;WACrC,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,CAAU,EAAE,CAAC;QAC9E,IAAI,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,QAAQ,IAAI,CAAE,OAAO,CAAC,KAAK,CAAY,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7E,MAAM,CAAC,IAAI,CAAC,WAAW,KAAK,oBAAoB,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IACD,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACpD,IAAI,CAAC,iBAAiB,IAAI,OAAO,iBAAiB,KAAK,QAAQ;WAC1D,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC;WAChC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAChE,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,QAAQ,KAAK,QAAQ,CAClE,CAAC,EAAE,CAAC;QACL,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACrF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAmC,CAAC;IAC/D,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC,MAAM,IAAI,GAAG;QAClF,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAA+C,EAAE,CAAC,CAChF,uCAAuC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CACjE,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,YAAY;SAC5C,MAAM,CAAC,CAAC,QAAQ,EAAqD,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC;SACjG,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,YAAY;SAC5C,MAAM,CAAC,CAAC,QAAQ,EAAqD,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC;SACjG,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChD,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;QAC1D,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzE,MAAM,CAAC,IAAI,CAAC,wBAAwB,QAAQ,qBAAqB,CAAC,CAAC;YACnE,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,QAAmC,CAAC;QAClD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;YACxF,MAAM,CAAC,IAAI,CAAC,wBAAwB,QAAQ,6BAA6B,CAAC,CAAC;QAC7E,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,wBAAwB,QAAQ,yBAAyB,CAAC,CAAC;YACvE,SAAS;QACX,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,eAAe,GAAG,WAAW;eAC9B,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ;eACtC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;eAChD,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ;eACjC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;eAC7B,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;eACnC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;eAC/B,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;eACrC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,eAAe,GAAG,eAAe;YACrC,CAAC,CAAC,0CAA0C,CAAC;gBACzC,UAAU,EAAE,OAAO,CAAC,UAAoB;gBACxC,KAAK,EAAE,OAAO,CAAC,KAAe;gBAC9B,UAAU,EAAE,OAAO,CAAC,OAAiB;gBACrC,SAAS,EAAE,OAAO,CAAC,SAAmB;gBACtC,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,UAAU,EAAE,WAAW,CAAC,QAAQ;aACjC,CAAC;YACJ,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,oCAAoC,CACxD,KAAK,CAAC,UAAU,EAChB,yBAAyB,EACzB,eAAe,CAChB,CAAC;aACC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,wBAAwB,QAAQ,KAAK,QAAQ,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;IAC1D,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAA4B,CAAC,EAAE,CAAC;QACpF,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,0BAA0B,CAAC,CAAC;QACpG,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,4BAA4B,CAAC,CAAC;IACzF,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,0BAA0B,CAAC,CAAC;YAClE,SAAS;QACX,CAAC;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,UAA+B,CAAC;QACzD,IAAI,UAAU,EAAE,IAAI,KAAK,WAAW;eAC/B,CAAC,CAAC,WAAW,CAAC,QAAQ;mBACpB,WAAW,CAAC,QAAQ,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ;mBACrD,WAAW,CAAC,QAAQ,CAAC,KAAK,KAAK,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,6CAA6C,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,KAAK,MAAM,WAAW,IAAI,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,QAAQ;eACnB,WAAW,CAAC,KAAK,KAAK,SAAS;eAC/B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAW,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,gCAAgC,WAAW,CAAC,GAAG,cAAc,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IACD,KAAK,MAAM,WAAW,IAAI,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACvF,MAAM,CAAC,IAAI,CAAC,gCAAgC,WAAW,CAAC,GAAG,cAAc,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types.js","sourceRoot":"","sources":["../../ts/appstore/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/interfaces",
-  "version": "23.0.1",
+  "version": "23.0.2",
   "private": false,
   "description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
   "exports": {

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/interfaces',
-  version: '23.0.1',
+  version: '23.0.2',
   description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
 }

package/ts/appstore/types.ts

@@ -223,7 +223,8 @@ export interface IAppStorePlatformOidcCapability {
   clientAuthenticationMethod: 'client_secret_basic' | 'client_secret_post';
 }
 
-const appStoreEnvKeyRegex = /^[A-Z_][A-Z0-9_]*$/;
+const appStorePublicEnvKeyRegex = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const appStoreSecretKeyRegex = /^[A-Z_][A-Z0-9_]*$/;
 
 export const validateAppStorePlatformOidcCapability = (
   capabilityArg: unknown,
@@ -253,7 +254,7 @@ export const validateAppStorePlatformOidcCapability = (
     const values = keys.map((keyArg) => (environment as Record<string, unknown>)[keyArg]);
     keys.forEach((keyArg, indexArg) => {
       if (typeof values[indexArg] !== 'string'
-        || !appStoreEnvKeyRegex.test(values[indexArg] as string)) {
+        || !appStoreSecretKeyRegex.test(values[indexArg] as string)) {
         errors.push(`platformOidc.environmentVariables.${keyArg} must be a valid environment key`);
       }
     });
@@ -462,8 +463,13 @@ export const validateAppStoreEnvironmentDeclarations = (
     if (Object.keys(declaration).some((keyArg) => !allowedKeys.has(keyArg))) {
       errors.push(`envVars[${indexArg}] contains fields outside its exact channel schema`);
     }
-    if (typeof declaration.key !== 'string' || !appStoreEnvKeyRegex.test(declaration.key)) {
-      errors.push(`envVars[${indexArg}].key must be canonical`);
+    const keyRegex = declaration.secret === true
+      ? appStoreSecretKeyRegex
+      : appStorePublicEnvKeyRegex;
+    if (typeof declaration.key !== 'string' || !keyRegex.test(declaration.key)) {
+      errors.push(declaration.secret === true
+        ? `envVars[${indexArg}].key must be a canonical secret key`
+        : `envVars[${indexArg}].key must be a valid public environment key`);
     } else {
       keys.push(declaration.key);
     }
@@ -544,7 +550,7 @@ export const validateAppStoreInstallRequest = async (
   if (!publicEnvironment || typeof publicEnvironment !== 'object'
     || Array.isArray(publicEnvironment)
     || Object.entries(publicEnvironment).some(([keyArg, valueArg]) => (
-      !appStoreEnvKeyRegex.test(keyArg) || typeof valueArg !== 'string'
+      !appStorePublicEnvKeyRegex.test(keyArg) || typeof valueArg !== 'string'
     ))) {
     errors.push('install publicEnvironment must be a canonical string map');
   }
@@ -574,7 +580,7 @@ export const validateAppStoreInstallRequest = async (
     if (JSON.stringify(Object.keys(input).sort()) !== JSON.stringify(['key', 'valueInput'])) {
       errors.push(`install secretInputs[${indexArg}] must use its exact schema`);
     }
-    if (typeof input.key !== 'string' || !appStoreEnvKeyRegex.test(input.key)) {
+    if (typeof input.key !== 'string' || !appStoreSecretKeyRegex.test(input.key)) {
       errors.push(`install secretInputs[${indexArg}].key must be canonical`);
       continue;
     }