Patch integrations Secret querying by workspaceId

Infisical · Jan 9, 2023 · d2c77d9 · d2c77d9
1 parent bd5dad7
commit d2c77d9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/backend/src/controllers/v2/apiKeyDataController.ts b/backend/src/controllers/v2/apiKeyDataController.ts
@@ -65,7 +65,6 @@ export const createAPIKeyData = async (req: Request, res: Response) => {
         apiKey = `ak.${apiKeyData._id.toString()}.${secret}`;
 
     } catch (err) {
-        console.error(err);
         Sentry.setUser({ email: req.user.email });
         Sentry.captureException(err);
         return res.status(400).send({

diff --git a/backend/src/helpers/bot.ts b/backend/src/helpers/bot.ts
@@ -72,7 +72,7 @@ const getSecretsHelper = async ({
     try {
         const key = await getKey({ workspaceId });
         const secrets = await Secret.find({
-            workspaceId,
+            workspace: workspaceId,
             environment,
             type: SECRET_SHARED
         });
@@ -84,7 +84,7 @@ const getSecretsHelper = async ({
                 tag: secret.secretKeyTag,
                 key
             });
-            
+
             const secretValue = decryptSymmetric({
                 ciphertext: secret.secretValueCiphertext,
                 iv: secret.secretValueIV,

diff --git a/backend/src/helpers/secret.ts b/backend/src/helpers/secret.ts
@@ -55,7 +55,6 @@ const validateSecrets = async ({
 		});
 
 	} catch (err) {
-		console.error(err);
 		throw new Error('Failed to validate secrets');
 	}
 

diff --git a/backend/src/variables/integration.ts b/backend/src/variables/integration.ts
@@ -48,7 +48,7 @@ const INTEGRATION_OPTIONS = [
         name: 'Vercel',
         slug: 'vercel',
         image: 'Vercel', 
-        isAvailable: false,
+        isAvailable: true,
         type: 'vercel',
         clientId: '',
         clientSlug: CLIENT_SLUG_VERCEL,
@@ -58,7 +58,7 @@ const INTEGRATION_OPTIONS = [
         name: 'Netlify',
         slug: 'netlify',
         image: 'Netlify', 
-        isAvailable: false,
+        isAvailable: true,
         type: 'oauth2',
         clientId: CLIENT_ID_NETLIFY,
         docsLink: ''
@@ -67,7 +67,7 @@ const INTEGRATION_OPTIONS = [
         name: 'GitHub',
         slug: 'github',
         image: 'GitHub', 
-        isAvailable: false,
+        isAvailable: true,
         type: 'oauth2',
         clientId: CLIENT_ID_GITHUB,
         docsLink: ''

diff --git a/frontend/components/integrations/Integration.tsx b/frontend/components/integrations/Integration.tsx
@@ -23,6 +23,7 @@ import {
 interface Integration {
     _id: string;
     app?: string;
+    target?: string;
     environment: string;
     integration: string;
     integrationAuth: string;
@@ -69,7 +70,11 @@ const Integration = ({
 
         switch (integration.integration) {
           case "vercel":
-            setIntegrationTarget("Development");
+            setIntegrationTarget(
+              integration?.target 
+              ? integration.target.charAt(0).toUpperCase() + integration.target.substring(1) 
+              : "Development"
+            );
             break;
           case "netlify":
             setIntegrationContext(integration?.context ? contextNetlifyMapping[integration.context] : "Local development");
@@ -93,11 +98,11 @@ const Integration = ({
                 </div>
                 <ListBox
                   data={!integration.isActive ? [
-                    "Production",
+                    "Development",
                     "Preview",
-                    "Development"
+                    "Production"
                   ] : null}
-                  selected={"Production"}
+                  selected={integrationTarget}
                   onChange={setIntegrationTarget}
                 />
             </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ const validateSecrets = async ({ @@
     		});
     	} catch (err) {
-    		console.error(err);
     		throw new Error('Failed to validate secrets');
     	}
@@ Expand Down @@