@scalar/workspace-store 0.46.1 → 0.46.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scalar/workspace-store
 
+## 0.46.2
+
+### Patch Changes
+
+- [#8927](https://github.com/scalar/scalar/pull/8927): Resolve environment variables in raw request paths when building request URLs, so address bar placeholders like `{{path}}` are substituted during send.
+
 ## 0.46.1
 
 ### Patch Changes

package/dist/request-example/builder/resolve-request-factory-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-request-factory-url.d.ts","sourceRoot":"","sources":["../../../src/request-example/builder/resolve-request-factory-url.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAA;AAE/E;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,cAAc,EACvB,SAAS;IACP,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC,CAAA;IACzE,mBAAmB,EAAE,eAAe,CAAA;CACrC,KACA,MAiCF,CAAA"}
+{"version":3,"file":"resolve-request-factory-url.d.ts","sourceRoot":"","sources":["../../../src/request-example/builder/resolve-request-factory-url.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAA;AAE/E;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,cAAc,EACvB,SAAS;IACP,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC,CAAA;IACzE,mBAAmB,EAAE,eAAe,CAAA;CACrC,KACA,MAkCF,CAAA"}

package/dist/request-example/builder/resolve-request-factory-url.js

@@ -12,7 +12,8 @@ export const resolveRequestFactoryUrl = (request, options) => {
         encodeURIComponent(replaceEnvVariables(value, variables)),
     ]));
     const baseUrl = replaceEnvVariables(request.baseUrl, variables);
-    const path = replacePathVariables(request.path.raw, pathVariables);
+    const rawPath = replaceEnvVariables(request.path.raw, variables);
+    const path = replacePathVariables(rawPath, pathVariables);
     const mergedUrl = mergeUrls(baseUrl, path);
     // When rendered inside an iframe with srcdoc, the browser reports
     // window.location.origin as the string "null" instead of a real origin.

package/dist/request-example/context/security/extract-security-scheme-secrets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-security-scheme-secrets.d.ts","sourceRoot":"","sources":["../../../../src/request-example/context/security/extract-security-scheme-secrets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,SAAS,EAA2C,MAAM,uCAAuC,CAAA;AAC/G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAQlF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAA;AAExG,OAAO,KAAK,EAUV,0BAA0B,EAC3B,MAAM,iDAAiD,CAAA;AAExD,wGAAwG;AACxG,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,CAAA;AAyKjF,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,GAEvC,QAAQ,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,EAC1D,WAAW,SAAS,EACpB,MAAM,MAAM,EACZ,cAAc,MAAM,KACnB,0BA2DF,CAAA"}
+{"version":3,"file":"extract-security-scheme-secrets.d.ts","sourceRoot":"","sources":["../../../../src/request-example/context/security/extract-security-scheme-secrets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,SAAS,EAA2C,MAAM,uCAAuC,CAAA;AAC/G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAQlF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAA;AAExG,OAAO,KAAK,EAUV,0BAA0B,EAC3B,MAAM,iDAAiD,CAAA;AAExD,wGAAwG;AACxG,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,CAAA;AAiLjF,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,GAEvC,QAAQ,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,EAC1D,WAAW,SAAS,EACpB,MAAM,MAAM,EACZ,cAAc,MAAM,KACnB,0BA2DF,CAAA"}

package/dist/request-example/context/security/extract-security-scheme-secrets.js

@@ -15,11 +15,17 @@ const SECRET_TO_INPUT_FIELD_MAP = {
     'x-scalar-secret-token-url': 'tokenUrl',
 };
 const mergeFlowSecrets = (properties, configSecrets, authStoreSecrets = {}) => Object.fromEntries(properties.map((property) => {
-    // Super merge in order of priority: auth store > config > config input field > empty string
-    const value = authStoreSecrets[property] ||
-        configSecrets[property] ||
-        configSecrets[SECRET_TO_INPUT_FIELD_MAP[property]] ||
-        '';
+    // Redirect URI is the only OAuth secret where an explicit empty value from
+    // store must be preserved. Other secrets use falsy fallback behavior for backwards-compatibility
+    // with config defaults when the casted auth store value is an empty string.
+    const authStoreValue = typeof authStoreSecrets[property] === 'string' ? authStoreSecrets[property] : undefined;
+    const configValue = typeof configSecrets[property] === 'string' ? configSecrets[property] : undefined;
+    const configInputValue = typeof configSecrets[SECRET_TO_INPUT_FIELD_MAP[property]] === 'string'
+        ? configSecrets[SECRET_TO_INPUT_FIELD_MAP[property]]
+        : undefined;
+    const value = property === 'x-scalar-secret-redirect-uri'
+        ? (authStoreValue ?? configValue ?? configInputValue ?? '')
+        : authStoreValue || configValue || configInputValue || '';
     return [property, value];
 }));
 const extractRefreshTokenSecret = (authStoreSecrets = {}) => {

package/package.json

@@ -16,7 +16,7 @@
     "openapi",
     "scalar"
   ],
-  "version": "0.46.1",
+  "version": "0.46.2",
   "engines": {
     "node": ">=22"
   },
@@ -145,11 +145,11 @@
     "vue": "^3.5.30",
     "yaml": "^2.8.0",
     "@scalar/helpers": "0.5.1",
-    "@scalar/openapi-upgrader": "0.2.5",
     "@scalar/json-magic": "0.12.7",
+    "@scalar/openapi-upgrader": "0.2.6",
+    "@scalar/snippetz": "0.9.1",
     "@scalar/types": "0.9.1",
-    "@scalar/validation": "0.3.0",
-    "@scalar/snippetz": "0.9.1"
+    "@scalar/validation": "0.3.0"
   },
   "devDependencies": {
     "@google-cloud/storage": "7.16.0",