Merge pull request #4684 from continuedev/nate/org-secret-resolution

use org scope to resolve org secrets

Author: sestinj

core/package-lock.json

@@ -46,7 +46,7 @@
     "@aws-sdk/client-sagemaker-runtime": "^3.758.0",
     "@aws-sdk/credential-providers": "^3.758.0",
     "@continuedev/config-types": "^1.0.13",
-    "@continuedev/config-yaml": "^1.0.61",
+    "@continuedev/config-yaml": "^1.0.63",
     "@continuedev/fetch": "^1.0.4",
     "@continuedev/llm-info": "^1.0.2",
     "@continuedev/openai-adapters": "^1.0.10",

core/package.json

@@ -15,7 +15,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@continuedev/config-yaml": "^1.0.61",
+    "@continuedev/config-yaml": "^1.0.63",
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
     "@reduxjs/toolkit": "^2.3.0",

gui/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuedev/config-yaml",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

gui/package.json

@@ -32,6 +32,7 @@ export function getLocationsToLook(
   blockSlug: PackageSlug | undefined,
   currentUserSlug: string,
   secretName: string,
+  orgScopeSlug: string | null,
 ): SecretLocation[] {
   const locationsToLook: SecretLocation[] = [
     ...(blockSlug
@@ -57,11 +58,15 @@ export function getLocationsToLook(
       secretName,
     },
     // Organization that owns assistant (org secrets can only be used in assistants owned by that org)
-    {
-      secretType: SecretType.Organization as const,
-      orgSlug: assistantSlug.ownerSlug,
-      secretName,
-    },
+    ...(orgScopeSlug
+      ? [
+          {
+            secretType: SecretType.Organization as const,
+            orgSlug: orgScopeSlug,
+            secretName,
+          },
+        ]
+      : []),
     // User
     {
       secretType: SecretType.User as const,
@@ -90,6 +95,7 @@ export function listAvailableSecrets(
   assistantSlug: PackageSlug,
   blockSlug: PackageSlug | undefined,
   currentUserSlug: string,
+  orgScopeSlug: string | null,
 ): SecretLocation[] {
   // Create a set of all secret names
   const allSecretNames = new Set([
@@ -108,6 +114,7 @@ export function listAvailableSecrets(
       blockSlug,
       currentUserSlug,
       secretName,
+      orgScopeSlug,
     );
 
     // Go through the locations one by one
@@ -155,6 +162,7 @@ export async function resolveFQSN(
   currentUserSlug: string,
   fqsn: FQSN,
   platformSecretStore: PlatformSecretStore,
+  orgScopeSlug: string | null,
 ): Promise<SecretResult> {
   // First create the list of secret locations to try in order
   const assistantSlug = fqsn.packageSlugs[0];
@@ -164,6 +172,7 @@ export async function resolveFQSN(
     blockSlug,
     currentUserSlug,
     fqsn.secretName,
+    orgScopeSlug,
   );
 
   // Then try to get the secret from each location

packages/config-yaml/package.json

@@ -44,7 +44,7 @@ describe("E2E Scenarios", () => {
     ): Promise<(SecretResult | undefined)[]> {
       return await Promise.all(
         fqsns.map((fqsn) =>
-          resolveFQSN("test-user", fqsn, platformSecretStore),
+          resolveFQSN("test-user", fqsn, platformSecretStore, "test-org"),
         ),
       );
     },