From a5c2142adf85ba91b9abd2bb340ff2fbef3a7964 Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Fri, 6 Dec 2024 16:23:59 +0800
Subject: [PATCH 1/7] 1.add new service

---
 .../cloud-service-integraion/azure-service.ts | 177 ++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts

diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
new file mode 100644
index 00000000000..f7822c8243d
--- /dev/null
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
@@ -0,0 +1,177 @@
+import { type AuthenticationResult, CryptoProvider, PublicClientApplication } from '@azure/msal-node';
+import crypto from 'crypto';
+import { net, shell } from 'electron';
+
+import { INSOMNIA_AZURE_CLIENT_ID, INSOMNIA_AZURE_REDIRECT_URI, INSOMNIA_FETCH_TIME_OUT } from '../../../common/constants';
+import { insomniaFetch } from '../../../ui/insomniaFetch';
+import type { CloudServiceResult, ICloudService } from './types';
+
+export type AzureVaultType = 'key' | 'secret';
+export interface AzureGetSecretConfig {
+  type: AzureVaultType;
+}
+interface AzureSecretAttributes {
+  enabled: boolean;
+  created: number;
+  updated: number;
+  exportable: boolean;
+}
+export interface AzureKeyObjectResponse extends AzureSecretAttributes {
+  key: JsonWebKey;
+}
+export interface AzureSecretObjectResponse extends AzureSecretAttributes {
+  value: string;
+  contentType: string;
+  id: string;
+}
+export type AzureSecretResponse = AzureKeyObjectResponse | AzureSecretObjectResponse;
+
+// singeleton azure client instance
+let azureClient: PublicClientApplication;
+let redirect_uri: string;
+let verifier: string;
+let challenge: string;
+export const scopes = ['https://vault.azure.net/user_impersonation'];
+export const azureEndpointHost = 'https://login.microsoftonline.com';
+export const authority = `${azureEndpointHost}/common`;
+
+const getAzureConfig = async () => {
+  // Validate and use the environment variables if provided
+  if (
+    (INSOMNIA_AZURE_REDIRECT_URI && !INSOMNIA_AZURE_CLIENT_ID) ||
+    (!INSOMNIA_AZURE_REDIRECT_URI && INSOMNIA_AZURE_CLIENT_ID)
+  ) {
+    throw new Error('Azure Client ID and Redirect URI must both be set.');
+  }
+
+  if (INSOMNIA_AZURE_CLIENT_ID && INSOMNIA_AZURE_REDIRECT_URI) {
+    return {
+      clientId: INSOMNIA_AZURE_CLIENT_ID,
+      redirectUri: INSOMNIA_AZURE_REDIRECT_URI,
+    };
+  }
+
+  // TODO Get Azure config from server
+  return insomniaFetch<{ applicationId: string; redirectUri: string; error?: string }>({
+    path: '/v1/oauth/azure/config',
+    method: 'GET',
+    sessionId: '',
+  }).then(data => {
+    return {
+      clientId: data.applicationId,
+      redirectUri: data.redirectUri,
+    };
+  });
+};
+
+const getAzureClient = async () => {
+  if (!azureClient) {
+    const azureConfig = await getAzureConfig();
+    const { clientId, redirectUri } = azureConfig;
+    azureClient = new PublicClientApplication({
+      auth: {
+        clientId,
+        authority,
+      },
+    });
+    redirect_uri = redirectUri;
+  }
+  return azureClient;
+};
+
+const generatePkceCodes = async () => {
+  const crypoProvider = new CryptoProvider();
+  ({ verifier, challenge } = await crypoProvider.generatePkceCodes());
+};
+// generate Pkce Code on initialize
+generatePkceCodes();
+
+export class AzureService implements ICloudService {
+  _credential: AuthenticationResult;
+
+  constructor(credential: AuthenticationResult) {
+    this._credential = credential;
+  }
+
+  static async openAuthUrl() {
+    const azureClient = await getAzureClient();
+    const authUrl = await azureClient.getAuthCodeUrl({
+      redirectUri: redirect_uri,
+      scopes,
+      codeChallenge: challenge,
+      codeChallengeMethod: 'S256',
+    });
+    // eslint-disable-next-line no-restricted-properties
+    shell.openExternal(authUrl);
+  }
+
+  async authorize(code: string): Promise<CloudServiceResult<AuthenticationResult>> {
+    const azureClient = await getAzureClient();
+    try {
+      const authResult = await azureClient.acquireTokenByCode({
+        scopes,
+        redirectUri: redirect_uri,
+        code,
+        codeVerifier: verifier,
+      });
+      // generate new Pkce codes after a sucess auth
+      await generatePkceCodes();
+      return {
+        success: true,
+        result: authResult,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        result: null,
+        error: error.toString(),
+      };
+    }
+  };
+
+  async getSecret(identifier: string): Promise<CloudServiceResult<AzureSecretResponse>> {
+    const { accessToken } = this._credential;
+    const apiVersion = '7.4';
+    // Using Azure rest api to get key/secret. Refer:
+    // https://learn.microsoft.com/en-us/rest/api/keyvault/keys/get-key/get-key?view=rest-keyvault-keys-7.4&tabs=HTTP
+    // https://learn.microsoft.com/en-us/rest/api/keyvault/secrets/get-secret/get-secret?view=rest-keyvault-secrets-7.4&tabs=HTTP
+    try {
+      const params = new URLSearchParams({
+        'api-version': apiVersion,
+      });
+      const secretUrl = `${identifier}?${params.toString()}`;
+      const requestConfig: RequestInit = {
+        method: 'GET',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+        signal: AbortSignal.timeout(INSOMNIA_FETCH_TIME_OUT),
+      };
+      const secretResponse = await net.fetch(secretUrl, requestConfig);
+      if (secretResponse.ok) {
+        const secretBody = await secretResponse.json() as AzureSecretResponse;
+        return {
+          success: true,
+          result: secretBody,
+        };
+      } else {
+        return {
+          success: false,
+          result: null,
+        };
+      }
+    } catch (error) {
+      return {
+        success: false,
+        result: null,
+        error: error.toString(),
+      };
+    }
+  }
+
+  getUniqueCacheKey(identifier: string) {
+    const uniqueKey = identifier;
+    const uniqueKeyHash = crypto.createHash('md5').update(uniqueKey).digest('hex');
+    return uniqueKeyHash;
+  }
+}

From 530b5fb653597d0c7474da409894b266246eeb62 Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Fri, 6 Dec 2024 16:24:27 +0800
Subject: [PATCH 2/7] 1.do some modification

---
 .../cloud-service-integraion/azure-service.ts | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
index f7822c8243d..9c4728d1e98 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
@@ -4,7 +4,7 @@ import { net, shell } from 'electron';
 
 import { INSOMNIA_AZURE_CLIENT_ID, INSOMNIA_AZURE_REDIRECT_URI, INSOMNIA_FETCH_TIME_OUT } from '../../../common/constants';
 import { insomniaFetch } from '../../../ui/insomniaFetch';
-import type { CloudServiceResult, ICloudService } from './types';
+import { type CloudServiceResult, type ICloudService, OAuthCloudService } from './types';
 
 export type AzureVaultType = 'key' | 'secret';
 export interface AzureGetSecretConfig {
@@ -86,10 +86,11 @@ const generatePkceCodes = async () => {
 // generate Pkce Code on initialize
 generatePkceCodes();
 
-export class AzureService implements ICloudService {
+export class AzureService extends OAuthCloudService implements ICloudService {
   _credential: AuthenticationResult;
 
   constructor(credential: AuthenticationResult) {
+    super();
     this._credential = credential;
   }
 
@@ -105,7 +106,31 @@ export class AzureService implements ICloudService {
     shell.openExternal(authUrl);
   }
 
-  async authorize(code: string): Promise<CloudServiceResult<AuthenticationResult>> {
+  static async exchangeCode(code: string): Promise<CloudServiceResult<AuthenticationResult>> {
+    const azureClient = await getAzureClient();
+    try {
+      const authResult = await azureClient.acquireTokenByCode({
+        scopes,
+        redirectUri: redirect_uri,
+        code,
+        codeVerifier: verifier,
+      });
+      // generate new Pkce codes after a sucess auth
+      await generatePkceCodes();
+      return {
+        success: true,
+        result: authResult,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        result: null,
+        error: error.toString(),
+      };
+    }
+  };
+
+  async authenticate(code: string): Promise<CloudServiceResult<AuthenticationResult>> {
     const azureClient = await getAzureClient();
     try {
       const authResult = await azureClient.acquireTokenByCode({

From 0ff93c0e85e0162bea29f8d23217c8c20b41bfa2 Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Mon, 9 Dec 2024 14:00:10 +0800
Subject: [PATCH 3/7] 1.save work for azure vault integration

---
 package-lock.json                             | 45 +++++++++---
 packages/insomnia/package.json                |  1 +
 packages/insomnia/src/common/constants.ts     |  2 +
 .../cloud-service-integraion/aws-service.ts   |  2 +-
 .../cloud-service-integraion/azure-service.ts | 61 ++++++----------
 .../cloud-service-integraion/cloud-service.ts | 32 +++++++-
 .../ipc/cloud-service-integraion/types.ts     | 20 ++++-
 packages/insomnia/src/main/ipc/electron.ts    |  6 +-
 .../insomnia/src/models/cloud-credential.ts   |  8 +-
 packages/insomnia/src/preload.ts              |  2 +
 .../aws-credential-form.tsx                   |  4 +-
 .../cloud-credential-modal.tsx                | 70 +++++++++++++++++-
 .../ui/components/modals/settings-modal.tsx   |  1 +
 .../settings/cloud-service-credentials.tsx    | 32 ++++----
 .../components/templating/external-vault.ts   | 73 +++++++++++++++++++
 .../external-vault/azure-key-vault-form.tsx   | 64 ++++++++++++++++
 .../external-vault/external-vault-form.tsx    | 28 +++++--
 .../templating/local-template-tags.ts         | 43 +----------
 packages/insomnia/src/ui/routes/actions.tsx   | 31 +++++---
 packages/insomnia/src/ui/routes/root.tsx      | 33 +++++++++
 20 files changed, 424 insertions(+), 134 deletions(-)
 create mode 100644 packages/insomnia/src/ui/components/templating/external-vault.ts
 create mode 100644 packages/insomnia/src/ui/components/templating/external-vault/azure-key-vault-form.tsx

diff --git a/package-lock.json b/package-lock.json
index 92593fd66d7..e278c677150 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -976,6 +976,38 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
+    "node_modules/@azure/msal-common": {
+      "version": "14.16.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.0.tgz",
+      "integrity": "sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@azure/msal-node": {
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.16.2.tgz",
+      "integrity": "sha512-An7l1hEr0w1HMMh1LU+rtDtqL7/jw74ORlc9Wnh06v7TU/xpG39/Zdr1ZJu3QpjUfKJ+E0/OXMW8DRSWTlh7qQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/msal-common": "14.16.0",
+        "jsonwebtoken": "^9.0.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@azure/msal-node/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
@@ -10250,7 +10282,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
       "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
-      "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/buffer-fill": {
@@ -12249,7 +12280,6 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
       "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
@@ -16704,7 +16734,6 @@
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
       "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "jws": "^3.2.2",
@@ -16796,7 +16825,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
       "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "buffer-equal-constant-time": "1.0.1",
@@ -16808,7 +16836,6 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
       "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "jwa": "^1.4.1",
@@ -17259,14 +17286,12 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
       "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.isboolean": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
       "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.isequal": {
@@ -17279,28 +17304,24 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
       "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.isnumber": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
       "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
       "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.isstring": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
       "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.kebabcase": {
@@ -17321,7 +17342,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
       "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.snakecase": {
@@ -24534,6 +24554,7 @@
         "@apidevtools/swagger-parser": "10.1.0",
         "@aws-sdk/client-secrets-manager": "^3.686.0",
         "@aws-sdk/client-sts": "^3.686.0",
+        "@azure/msal-node": "^2.16.2",
         "@bufbuild/protobuf": "^1.8.0",
         "@connectrpc/connect": "^1.4.0",
         "@connectrpc/connect-node": "^1.4.0",
diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
index 091788f37a9..fbb1f9520f1 100644
--- a/packages/insomnia/package.json
+++ b/packages/insomnia/package.json
@@ -44,6 +44,7 @@
     "@getinsomnia/node-libcurl": "^2.31.4",
     "@grpc/grpc-js": "^1.12.0",
     "@grpc/proto-loader": "^0.7.13",
+    "@azure/msal-node": "^2.16.2",
     "@seald-io/nedb": "^4.0.4",
     "@segment/analytics-node": "2.1.0",
     "apiconnect-wsdl": "2.0.36",
diff --git a/packages/insomnia/src/common/constants.ts b/packages/insomnia/src/common/constants.ts
index 4fe6e8d523c..7560faafa4c 100644
--- a/packages/insomnia/src/common/constants.ts
+++ b/packages/insomnia/src/common/constants.ts
@@ -11,6 +11,8 @@ const env = process[ENV];
 export const INSOMNIA_GITLAB_REDIRECT_URI = env.INSOMNIA_GITLAB_REDIRECT_URI;
 export const INSOMNIA_GITLAB_CLIENT_ID = env.INSOMNIA_GITLAB_CLIENT_ID;
 export const INSOMNIA_GITLAB_API_URL = env.INSOMNIA_GITLAB_API_URL;
+export const INSOMNIA_AZURE_CLIENT_ID = env.INSOMNIA_AZURE_CLIENT_ID;
+export const INSOMNIA_AZURE_REDIRECT_URI = env.INSOMNIA_AZURE_REDIRECT_URI;
 export const PLAYWRIGHT = env.PLAYWRIGHT;
 // App Stuff
 export const getSkipOnboarding = () => env.INSOMNIA_SKIP_ONBOARDING;
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts
index 431a7e26b90..6ee5874456b 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts
@@ -14,7 +14,7 @@ export class AWSService implements ICloudService {
     this._credential = credential;
   }
 
-  async authorize(): Promise<CloudServiceResult<GetCallerIdentityCommandOutput>> {
+  async authenticate(): Promise<CloudServiceResult<GetCallerIdentityCommandOutput>> {
     const { region, accessKeyId, secretAccessKey, sessionToken } = this._credential;
     const stsClient = new STSClient({
       region,
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
index 9c4728d1e98..97d32f8d650 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
@@ -1,4 +1,4 @@
-import { type AuthenticationResult, CryptoProvider, PublicClientApplication } from '@azure/msal-node';
+import { type AuthenticationResult, AuthError, CryptoProvider, PublicClientApplication } from '@azure/msal-node';
 import crypto from 'crypto';
 import { net, shell } from 'electron';
 
@@ -106,7 +106,7 @@ export class AzureService extends OAuthCloudService implements ICloudService {
     shell.openExternal(authUrl);
   }
 
-  static async exchangeCode(code: string): Promise<CloudServiceResult<AuthenticationResult>> {
+  static async exchangeCode({ code }: { code: string }): Promise<CloudServiceResult<AuthenticationResult>> {
     const azureClient = await getAzureClient();
     try {
       const authResult = await azureClient.acquireTokenByCode({
@@ -115,50 +115,43 @@ export class AzureService extends OAuthCloudService implements ICloudService {
         code,
         codeVerifier: verifier,
       });
-      // generate new Pkce codes after a sucess auth
+      // generate new Pkce codes after a success auth
       await generatePkceCodes();
       return {
         success: true,
         result: authResult,
       };
     } catch (error) {
+      if (error instanceof AuthError) {
+        const { errorMessage, errorCode } = error;
+        return {
+          success: false,
+          result: null,
+          error: { errorMessage, errorCode },
+        };
+      }
       return {
         success: false,
         result: null,
-        error: error.toString(),
+        error: { errorMessage: error.toString(), errorCode: '' },
       };
     }
-  };
+  }
 
-  async authenticate(code: string): Promise<CloudServiceResult<AuthenticationResult>> {
-    const azureClient = await getAzureClient();
-    try {
-      const authResult = await azureClient.acquireTokenByCode({
-        scopes,
-        redirectUri: redirect_uri,
-        code,
-        codeVerifier: verifier,
-      });
-      // generate new Pkce codes after a sucess auth
-      await generatePkceCodes();
-      return {
-        success: true,
-        result: authResult,
-      };
-    } catch (error) {
-      return {
-        success: false,
-        result: null,
-        error: error.toString(),
-      };
-    }
-  };
+  async authenticate() {
+    // Azure uses OAuth authenticaion flow.
+  }
+
+  getUniqueCacheKey(identifier: string) {
+    const uniqueKey = identifier;
+    const uniqueKeyHash = crypto.createHash('md5').update(uniqueKey).digest('hex');
+    return uniqueKeyHash;
+  }
 
   async getSecret(identifier: string): Promise<CloudServiceResult<AzureSecretResponse>> {
     const { accessToken } = this._credential;
     const apiVersion = '7.4';
-    // Using Azure rest api to get key/secret. Refer:
-    // https://learn.microsoft.com/en-us/rest/api/keyvault/keys/get-key/get-key?view=rest-keyvault-keys-7.4&tabs=HTTP
+    // Using Azure rest api to get secret. Refer:
     // https://learn.microsoft.com/en-us/rest/api/keyvault/secrets/get-secret/get-secret?view=rest-keyvault-secrets-7.4&tabs=HTTP
     try {
       const params = new URLSearchParams({
@@ -189,14 +182,8 @@ export class AzureService extends OAuthCloudService implements ICloudService {
       return {
         success: false,
         result: null,
-        error: error.toString(),
+        error: { errorMessage: error.toString(), errorCode: '' },
       };
     }
   }
-
-  getUniqueCacheKey(identifier: string) {
-    const uniqueKey = identifier;
-    const uniqueKeyHash = crypto.createHash('md5').update(uniqueKey).digest('hex');
-    return uniqueKeyHash;
-  }
 }
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts
index 6feb79e6aac..e43272d2e81 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts
@@ -1,7 +1,10 @@
+import type { AuthenticationResult as AzureOAuthCredential } from '@azure/msal-node';
+
 import * as models from '../../../models';
 import type { AWSTemporaryCredential, CloudeProviderCredentialType, CloudProviderName } from '../../../models/cloud-credential';
 import { ipcMainHandle, ipcMainOn } from '../electron';
 import { type AWSGetSecretConfig, AWSService } from './aws-service';
+import { AzureService } from './azure-service';
 import { type MaxAgeUnit, VaultCache } from './vault-cache';
 
 // in-memory cache for fetched vault secrets
@@ -12,6 +15,8 @@ export interface cloudServiceBridgeAPI {
   getSecret: typeof getSecret;
   clearCache: typeof clearVaultCache;
   setCacheMaxAge: typeof setCacheMaxAge;
+  openAuthUrl: typeof openAuthUrl;
+  exchangeCode: typeof exchangeCode;
 }
 export interface CloudServiceAuthOption {
   provider: CloudProviderName;
@@ -26,17 +31,20 @@ export type CloudServiceGetSecretConfig = AWSGetSecretConfig;
 export function registerCloudServiceHandlers() {
   ipcMainHandle('cloudService.authenticate', (_event, options) => cspAuthentication(options));
   ipcMainHandle('cloudService.getSecret', (_event, options) => getSecret(options));
+  ipcMainHandle('cloudService.exchangeCode', (_event, type, data) => exchangeCode(type, data));
+  ipcMainOn('cloudService.openAuthUrl', (_event, type) => openAuthUrl(type));
   ipcMainOn('cloudService.clearCache', () => clearVaultCache());
   ipcMainOn('cloudService.setCacheMaxAge', (_event, { maxAge, unit }) => setCacheMaxAge(maxAge, unit));
 }
 
-type CredentialType = AWSTemporaryCredential;
 // factory pattern to create cloud service class based on its provider name
 class ServiceFactory {
-  static createCloudService(name: CloudProviderName, credential: CredentialType) {
+  static createCloudService(name: CloudProviderName, credential: CloudeProviderCredentialType) {
     switch (name) {
       case 'aws':
         return new AWSService(credential as AWSTemporaryCredential);
+      case 'azure':
+        return new AzureService(credential as AzureOAuthCredential);
       default:
         throw new Error('Invalid cloud service provider name');
     }
@@ -51,11 +59,29 @@ const setCacheMaxAge = (newAge: number, unit: MaxAgeUnit = 'min') => {
   return vaultCache.setMaxAge(newAge, unit);
 };
 
+const openAuthUrl = (type: 'azure') => {
+  switch (type) {
+    case 'azure':
+      AzureService.openAuthUrl();
+      break;
+    default:
+      return;
+  }
+};
+
+const exchangeCode = async (type: 'azure', data: any) => {
+  // eslint-disable-next-line default-case
+  switch (type) {
+    case 'azure':
+      return AzureService.exchangeCode(data);
+  }
+};
+
 // authenticate with cloud service provider
 const cspAuthentication = (options: CloudServiceAuthOption) => {
   const { provider, credentials } = options;
   const cloudService = ServiceFactory.createCloudService(provider, credentials);
-  return cloudService.authorize();
+  return cloudService.authenticate();
 };
 
 const getSecret = async (options: CloudServiceSecretOption<CloudServiceGetSecretConfig>) => {
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts
index ae2b6164b6e..a19cb843a9a 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts
@@ -7,9 +7,8 @@ export interface CloudServiceResult<T> {
   result: T | null;
   error?: CloudServiceError;
 }
-
 export interface ICloudService {
-  authorize(): Promise<any>;
+  authenticate(...args: any[]): Promise<any>;
   getSecret<T extends {}>(secretName: string, config?: T): Promise<any>;
   getSecret(secretName: string): Promise<any>;
   getUniqueCacheKey<T extends {} = {}>(secretName: string, config?: T): string;
@@ -23,3 +22,20 @@ export interface AWSSecretConfig {
   SecretType: AWSSecretType;
   SecretKey?: string;
 };
+
+export type AzureSecretType = 'secret' | 'key';
+export interface AzureSecretConfig {
+  secretIdentifier: string;
+  secretType: AzureSecretType;
+}
+export type ExternalVaultConfig = AWSSecretConfig | AzureSecretConfig;
+
+export abstract class OAuthCloudService {
+  static async openAuthUrl() {
+    throw new Error('Subclasses must implement the static method openAuthUrl');
+  };
+
+  static async exchangeCode(data: any): Promise<any> {
+    throw new Error(`Subclasses must implement the static method exchangeCode with ${data}`);
+  };
+};
diff --git a/packages/insomnia/src/main/ipc/electron.ts b/packages/insomnia/src/main/ipc/electron.ts
index 9162aa4c15c..f4dced77da5 100644
--- a/packages/insomnia/src/main/ipc/electron.ts
+++ b/packages/insomnia/src/main/ipc/electron.ts
@@ -30,7 +30,8 @@ export type HandleChannels =
   | 'writeFile'
   | 'extractJsonFileFromPostmanDataDumpArchive'
   | 'cloudService.authenticate'
-  | 'cloudService.getSecret';
+  | 'cloudService.getSecret'
+  | 'cloudService.exchangeCode';
 
 export const ipcMainHandle = (
   channel: HandleChannels,
@@ -73,7 +74,8 @@ export type MainOnChannels =
   | 'updateLatestStepName'
   | 'startExecution'
   | 'cloudService.setCacheMaxAge'
-  | 'cloudService.clearCache';
+  | 'cloudService.clearCache'
+  | 'cloudService.openAuthUrl';
 export type RendererOnChannels =
   'clear-all-models'
   | 'clear-model'
diff --git a/packages/insomnia/src/models/cloud-credential.ts b/packages/insomnia/src/models/cloud-credential.ts
index cba9d1dd8b3..6c1fb6e1fd0 100644
--- a/packages/insomnia/src/models/cloud-credential.ts
+++ b/packages/insomnia/src/models/cloud-credential.ts
@@ -1,3 +1,5 @@
+import type { AuthenticationResult as AzureOAuthCredential } from '@azure/msal-node';
+
 import { database as db } from '../common/database';
 import type { BaseModel } from './index';
 
@@ -12,7 +14,7 @@ export interface AWSTemporaryCredential {
   sessionToken: string;
   region: string;
 }
-export type CloudeProviderCredentialType = AWSTemporaryCredential;
+export type CloudeProviderCredentialType = AWSTemporaryCredential | AzureOAuthCredential;
 
 export interface BaseCloudCredential {
   name: string;
@@ -72,6 +74,10 @@ export function remove(credential: CloudProviderCredential) {
   return db.remove(credential);
 }
 
+export function getByName(name: string, provider: CloudProviderName) {
+  return db.find<CloudProviderCredential>(type, { name, provider });
+}
+
 export function all() {
   return db.all<CloudProviderCredential>(type);
 }
diff --git a/packages/insomnia/src/preload.ts b/packages/insomnia/src/preload.ts
index 25816a87e15..2019e48b71f 100644
--- a/packages/insomnia/src/preload.ts
+++ b/packages/insomnia/src/preload.ts
@@ -45,8 +45,10 @@ const grpc: gRPCBridgeAPI = {
 const cloudService: cloudServiceBridgeAPI = {
   authenticate: options => ipcRenderer.invoke('cloudService.authenticate', options),
   getSecret: options => ipcRenderer.invoke('cloudService.getSecret', options),
+  exchangeCode: (type, data) => ipcRenderer.invoke('cloudService.exchangeCode', type, data),
   setCacheMaxAge: options => ipcRenderer.send('cloudService.setCacheMaxAge', options),
   clearCache: () => ipcRenderer.send('cloudService.clearCache'),
+  openAuthUrl: type => ipcRenderer.send('cloudService.openAuthUrl', type),
 };
 
 const main: Window['main'] = {
diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx
index 4de752780ca..a10c3e195ba 100644
--- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Button, Input, Label, TextField } from 'react-aria-components';
 
-import { AWSCredentialType, type BaseCloudCredential, type CloudProviderCredential, type CloudProviderName } from '../../../../models/cloud-credential';
+import { AWSCredentialType, type AWSTemporaryCredential, type BaseCloudCredential, type CloudProviderCredential, type CloudProviderName } from '../../../../models/cloud-credential';
 import { Icon } from '../../icon';
 
 export interface AWSCredentialFormProps {
@@ -37,7 +37,7 @@ export const AWSCredentialForm = (props: AWSCredentialFormProps) => {
   const { data, onSubmit, isLoading, errorMessage } = props;
   const isEdit = !!data;
   const { name, credentials } = data || initialFormValue;
-  const { accessKeyId, secretAccessKey, sessionToken, region } = credentials!;
+  const { accessKeyId, secretAccessKey, sessionToken, region } = credentials! as AWSTemporaryCredential;
   const [hideValueItemNames, setHideValueItemNames] = useState(['accessKeyId', 'secretAccessKey', 'sessionToken']);
 
   const showOrHideItemValue = (name: string) => {
diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
index 5a3fb71f8ea..44a339c5a6f 100644
--- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components';
 import { useFetcher } from 'react-router-dom';
 
@@ -14,6 +14,9 @@ export interface CloudCredentialModalProps {
 
 export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
   const { provider, providerCredential, onClose } = props;
+  const [isAuthenticating, setIsAuthenticating] = useState(false);
+  const [error, setError] = useState('');
+  const [manulInputUrl, setManualInputUrl] = useState('');
   const providerDisplayName = getProviderDisplayName(provider);
   const cloudCredentialFetcher = useFetcher();
   const isEditing = !!providerCredential;
@@ -26,11 +29,11 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
     return undefined;
   }, [cloudCredentialFetcher.data, cloudCredentialFetcher.state, provider]);
 
-  const handleFormSubmit = (data: BaseCloudCredential) => {
-    const { name, credentials } = data;
+  const handleFormSubmit = (data: BaseCloudCredential & { isAuthenticated?: boolean }) => {
+    const { name, credentials, isAuthenticated = false } = data;
     const formAction = isEditing ? `/cloud-credential/${providerCredential._id}/update` : '/cloud-credential/new';
     cloudCredentialFetcher.submit(
-      JSON.stringify({ name, credentials, provider }),
+      JSON.stringify({ name, credentials, provider, isAuthenticated }),
       {
         action: formAction,
         method: 'post',
@@ -39,6 +42,31 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
     );
   };
 
+  const exchangeAzureCode = async () => {
+    try {
+      setError('');
+      const parsedURL = new URL(manulInputUrl);
+      const code = parsedURL.searchParams.get('code');
+      if (typeof code === 'string') {
+        const authResult = await window.main.cloudService.exchangeCode('azure', { code });
+        const { success, result, error } = authResult;
+        if (success) {
+          const { account, uniqueId } = result!;
+          handleFormSubmit({
+            name: account?.username || uniqueId,
+            provider: 'azure',
+            credentials: result!,
+            isAuthenticated: true,
+          });
+        } else {
+          setError(error!.errorMessage);
+        }
+      }
+    } catch (error) {
+      setError(error.toString());
+    }
+  };
+
   useEffect(() => {
     // close modal if submit success
     if (cloudCredentialFetcher.data && !cloudCredentialFetcher.data.error && cloudCredentialFetcher.state === 'idle') {
@@ -83,6 +111,40 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
                   errorMessage={fetchErrorMessage}
                 />
               }
+              {provider === 'azure' &&
+                <div className='flex flex-col place-content-center place-items-center p-[--padding-sm] border border-solid border-[--hl-sm] rounded-[--radius-md]'>
+                  <a
+                    className='cursor-pointer'
+                    onClick={() => {
+                      setIsAuthenticating(true);
+                      window.main.cloudService.openAuthUrl('azure');
+                    }}
+                  >
+                    {isAuthenticating ? 'Authenticating' : 'Click to authenticate'} with Azure
+                  </a>
+                  {isAuthenticating &&
+                    <label className="form-control form-control--outlined">
+                      <div className="form-row">
+                        <input
+                          placeholder='Manually paste the authentication url if you are not redirected'
+                          onChange={e => setManualInputUrl(e.target.value)}
+                        />
+                        <Button
+                          className='px-[--padding-md] h-[--line-height-xs] border border-solid border-[--hl-sm]'
+                          onPress={() => exchangeAzureCode()}
+                        >
+                          Authenticate
+                        </Button>
+                      </div>
+                    </label>
+                  }
+                  {error && (
+                    <p className="notice error margin-bottom-sm w-full">
+                      {error}
+                    </p>
+                  )}
+                </div>
+              }
             </div>
           )}
         </Dialog>
diff --git a/packages/insomnia/src/ui/components/modals/settings-modal.tsx b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
index a4d7728d8f1..2d232d784a7 100644
--- a/packages/insomnia/src/ui/components/modals/settings-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
@@ -28,6 +28,7 @@ export const TAB_INDEX_SHORTCUTS = 'keyboard';
 export const TAB_INDEX_THEMES = 'themes';
 export const TAB_INDEX_PLUGINS = 'plugins';
 export const TAB_INDEX_AI = 'ai';
+export const TAB_CLOUD_CREDENTIAL = 'cloudCred';
 
 export const SettingsModal = forwardRef<SettingsModalHandle, ModalProps>((props, ref) => {
   const [defaultTabKey, setDefaultTabKey] = useState('general');
diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
index e08b137bd26..4068a41ebfd 100644
--- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
+++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
@@ -21,11 +21,11 @@ const createCredentialItemList: createCredentialItemType[] = [
     id: 'aws',
     name: getProviderDisplayName('aws'),
   },
-  // TODO only support aws for now
-  // {
-  //   id: 'azure',
-  //   name: getProviderDisplayName('azure'),
-  // },
+  {
+    id: 'azure',
+    name: getProviderDisplayName('azure'),
+  },
+  // TODO support gcp
   // {
   //   id: 'gcp',
   //   name: getProviderDisplayName('gcp'),
@@ -65,6 +65,10 @@ export const CloudServiceCredentialList = () => {
     });
   };
 
+  const handleCreateCloudServiceCredential = (key: CloudProviderName) => {
+    setModalState({ show: true, provider: key as CloudProviderName });
+  };
+
   if (!isEnterprisePlan) {
     return (
       <UpgradeNotice
@@ -91,9 +95,9 @@ export const CloudServiceCredentialList = () => {
             placement='bottom right'
           >
             <Menu
-              aria-label="Create in project actions"
+              aria-label="Create cloud service credential actions"
               selectionMode="single"
-              onAction={key => setModalState({ show: true, provider: key as CloudProviderName })}
+              onAction={key => handleCreateCloudServiceCredential(key as CloudProviderName)}
               items={createCredentialItemList}
               className="border select-none text-sm min-w-max border-solid border-[--hl-sm] shadow-lg bg-[--color-bg] py-2 rounded-md overflow-y-auto max-h-[85vh] focus:outline-none"
             >
@@ -134,12 +138,14 @@ export const CloudServiceCredentialList = () => {
                   </td>
                   <td className='w-52 whitespace-nowrap'>
                     <div className='flex gap-2'>
-                      <Button
-                        className={`${buttonClassName} w-16`}
-                        onPress={() => setModalState({ show: true, provider: provider!, credential: cloudCred })}
-                      >
-                        <Icon icon="edit" />&nbsp;&nbsp;Edit
-                      </Button>
+                      {provider === 'aws' &&
+                        <Button
+                          className={`${buttonClassName} w-16`}
+                          onPress={() => setModalState({ show: true, provider: provider!, credential: cloudCred })}
+                        >
+                          <Icon icon="edit" />&nbsp;&nbsp;Edit
+                        </Button>
+                      }
                       <Button
                         className={`${buttonClassName} w-20`}
                         onPress={() => handleDeleteItem(_id, name)}
diff --git a/packages/insomnia/src/ui/components/templating/external-vault.ts b/packages/insomnia/src/ui/components/templating/external-vault.ts
new file mode 100644
index 00000000000..4f0cfb0c846
--- /dev/null
+++ b/packages/insomnia/src/ui/components/templating/external-vault.ts
@@ -0,0 +1,73 @@
+import type { AWSGetSecretConfig } from '../../../main/ipc/cloud-service-integraion/aws-service';
+import type { CloudServiceSecretOption } from '../../../main/ipc/cloud-service-integraion/cloud-service';
+import type { AWSSecretConfig, AzureSecretConfig, ExternalVaultConfig } from '../../../main/ipc/cloud-service-integraion/types';
+import type { CloudProviderCredential, CloudProviderName } from '../../../models/cloud-credential';
+
+export const getExternalVault = async (provider: CloudProviderName, providerCredential: CloudProviderCredential, secretConfig: ExternalVaultConfig) => {
+  switch (provider) {
+    case 'aws':
+      return getAWSSecret(secretConfig as AWSSecretConfig, providerCredential);
+    case 'azure':
+      return getAzureSecret(secretConfig as AzureSecretConfig, providerCredential);
+    default:
+      return '';
+  }
+};
+
+export const getAWSSecret = async (secretConfig: AWSSecretConfig, providerCredential: CloudProviderCredential) => {
+  const {
+    SecretId, VersionId, VersionStage, SecretKey,
+    SecretType = 'plaintext',
+  } = secretConfig;
+  if (!SecretId) {
+    throw new Error('Secret Name or ARN is required');
+  }
+  const getSecretOption: CloudServiceSecretOption<AWSGetSecretConfig> = {
+    provider: 'aws',
+    secretId: SecretId,
+    config: {
+      VersionId, VersionStage,
+    },
+    credentials: providerCredential.credentials,
+  };
+  const secretResult = await window.main.cloudService.getSecret(getSecretOption);
+  const { success, error, result } = secretResult;
+  if (success && result) {
+    const { SecretString } = result!;
+    let parsedJSON;
+    if (SecretType === 'plaintext' || !SecretKey) {
+      return SecretString;
+    } else {
+      try {
+        parsedJSON = JSON.parse(SecretString || '{}');
+      } catch (error) {
+        throw new Error(`Secret value ${SecretString} can not parsed to key/value pair, please change Secret Type to plaintext`);
+      }
+      if (SecretKey in parsedJSON) {
+        return parsedJSON[SecretKey];
+      }
+      throw new Error(`Secret key ${SecretKey} does not exist in key/value secret ${SecretString}`);
+    }
+  } else {
+    throw new Error(error?.errorMessage);
+  }
+};
+
+export const getAzureSecret = async (secretConfig: AzureSecretConfig, providerCredential: CloudProviderCredential) => {
+  const { secretIdentifier } = secretConfig;
+  if (!secretIdentifier) {
+    throw new Error('Secret Identifieror is required');
+  }
+  const getSecretOption: CloudServiceSecretOption<{}> = {
+    provider: 'azure',
+    secretId: secretIdentifier,
+    credentials: providerCredential.credentials,
+  };
+  const secretResult = await window.main.cloudService.getSecret(getSecretOption);
+  const { success, error, result } = secretResult;
+  if (success && result) {
+    return result.value;
+  } else {
+    throw new Error(error?.errorMessage);
+  }
+};
diff --git a/packages/insomnia/src/ui/components/templating/external-vault/azure-key-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/azure-key-vault-form.tsx
new file mode 100644
index 00000000000..494f93f3b0c
--- /dev/null
+++ b/packages/insomnia/src/ui/components/templating/external-vault/azure-key-vault-form.tsx
@@ -0,0 +1,64 @@
+import React, { useState } from 'react';
+
+import type { AzureSecretConfig } from '../../../../main/ipc/cloud-service-integraion/types';
+import type { NunjucksParsedTag } from '../../../../templating/utils';
+import { HelpTooltip } from '../../help-tooltip';
+
+export interface AzureKeyVaultFormProps {
+  formData: AzureSecretConfig;
+  onChange: (newConfig: AzureSecretConfig) => void;
+  activeTagData: NunjucksParsedTag;
+}
+
+const isValidURL = (url: string) => {
+  const regex = /^(https):\/\/[^\s/$.?#].[^\s]*$/i;
+  return regex.test(url);
+};
+
+export const AzureKeyVaultForm = (props: AzureKeyVaultFormProps) => {
+  const { formData, onChange } = props;
+  const [isValidIdentifier, setIsValidIdentifier] = useState(true);
+  const { secretIdentifier } = formData;
+  const handleOnChange = () => {
+    const formElement = document.getElementById('azure-key-vault-form') as HTMLFormElement;
+    if (formElement) {
+      const formData = new FormData(formElement);
+      const newConfig = Object.fromEntries(formData.entries());
+      // only support Azure secret for now
+      newConfig.secretType = 'secret';
+      onChange(newConfig as unknown as AzureSecretConfig);
+    }
+  };
+  return (
+    <form id='azure-key-vault-form'>
+      <div className="form-row">
+        <div className="form-control">
+          <label>
+            Secret Identifier
+            <HelpTooltip className="space-left">
+              The secret identifier is the URI of the secret in Azure Key Vault. You can get it from your Azure portal.
+            </HelpTooltip>
+            <input
+              name='secretIdentifier'
+              defaultValue={secretIdentifier}
+              onChange={e => {
+                const identifier = e.target.value;
+                if (isValidURL(identifier)) {
+                  setIsValidIdentifier(true);
+                  handleOnChange();
+                } else {
+                  setIsValidIdentifier(false);
+                }
+              }}
+            />
+            {!isValidIdentifier &&
+              <p className="notice error w-full mt-[--padding-md]" style={{ marginBottom: 0 }}>
+                Invalid Secret Identifier, please check and input again.
+              </p>
+            }
+          </label>
+        </div>
+      </div>
+    </form>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
index 3835ab16497..6d6db174563 100644
--- a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
+++ b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
@@ -2,23 +2,24 @@ import React, { useState } from 'react';
 import { Button } from 'react-aria-components';
 
 import { debounce } from '../../../../common/misc';
-import type { AWSSecretConfig } from '../../../../main/ipc/cloud-service-integraion/types';
+import type { AWSSecretConfig, AzureSecretConfig, ExternalVaultConfig } from '../../../../main/ipc/cloud-service-integraion/types';
 import { type CloudProviderCredential, type CloudProviderName, type } from '../../../../models/cloud-credential';
 import { Icon } from '../../icon';
 import { CloudCredentialModal } from '../../modals/cloud-credential-modal/cloud-credential-modal';
 import type { ArgConfigFormProps } from '../tag-editor-arg-sub-form';
 import { AWSSecretManagerForm } from './aws-secret-manager-form';
+import { AzureKeyVaultForm } from './azure-key-vault-form';
 
 export const ExternalVaultForm = (props: ArgConfigFormProps) => {
   const { onChange, configValue, activeTagData, docs } = props;
   const [showModal, setShowModal] = useState(false);
-  const formData = JSON.parse(configValue) as AWSSecretConfig;
   const provider = activeTagData.args[0].value as CloudProviderName;
+  const formData = JSON.parse(configValue) as ExternalVaultConfig;
   const selectedCredentialId = activeTagData.args[1].value;
   const cloudCredentialDocs = docs[type] as CloudProviderCredential[] || [];
   const selectedCredentialDoc = cloudCredentialDocs.find(d => d._id === selectedCredentialId);
 
-  const handleFormChange = debounce((newConfig: AWSSecretConfig) => {
+  const handleFormChange = debounce((newConfig: ExternalVaultConfig) => {
     const newFormValue = JSON.stringify(newConfig);
     onChange(newFormValue);
   }, 1000);
@@ -26,11 +27,22 @@ export const ExternalVaultForm = (props: ArgConfigFormProps) => {
 
   switch (provider) {
     case 'aws':
-      SubForm = <AWSSecretManagerForm
-        formData={formData}
-        onChange={handleFormChange}
-        activeTagData={activeTagData}
-      />;
+      SubForm = (
+        <AWSSecretManagerForm
+          formData={formData as AWSSecretConfig}
+          onChange={handleFormChange}
+          activeTagData={activeTagData}
+        />
+      );
+      break;
+    case 'azure':
+      SubForm = (
+        <AzureKeyVaultForm
+          formData={formData as AzureSecretConfig}
+          onChange={handleFormChange}
+          activeTagData={activeTagData}
+        />
+      );
       break;
     default:
       SubForm = null;
diff --git a/packages/insomnia/src/ui/components/templating/local-template-tags.ts b/packages/insomnia/src/ui/components/templating/local-template-tags.ts
index 2df6b5b5b24..f0b9cf5ae74 100644
--- a/packages/insomnia/src/ui/components/templating/local-template-tags.ts
+++ b/packages/insomnia/src/ui/components/templating/local-template-tags.ts
@@ -8,7 +8,7 @@ import { CookieJar } from 'tough-cookie';
 import * as uuid from 'uuid';
 
 import type { RenderPurpose } from '../../../common/render';
-import type { AWSSecretConfig } from '../../../main/ipc/cloud-service-integraion/types';
+import type { ExternalVaultConfig } from '../../../main/ipc/cloud-service-integraion/types';
 import * as models from '../../../models';
 import type { CloudProviderCredential, CloudProviderName } from '../../../models/cloud-credential';
 import { vaultEnvironmentMaskValue } from '../../../models/environment';
@@ -18,6 +18,7 @@ import type { TemplateTag } from '../../../plugins';
 import type { PluginTemplateTag } from '../../../templating/extensions';
 import { invariant } from '../../../utils/invariant';
 import { buildQueryStringFromParams, joinUrlAndQueryString, smartEncodeUrl } from '../../../utils/url/querystring';
+import { getExternalVault } from './external-vault';
 import { fakerFunctions } from './faker-functions';
 
 const localTemplatePlugins: { templateTag: PluginTemplateTag }[] = [
@@ -34,6 +35,7 @@ const localTemplatePlugins: { templateTag: PluginTemplateTag }[] = [
           type: 'enum',
           options: [
             { displayName: 'AWS Secrets Manager', value: 'aws' },
+            { displayName: 'Azure Key Vault', value: 'azure' },
           ],
         },
         {
@@ -72,44 +74,7 @@ const localTemplatePlugins: { templateTag: PluginTemplateTag }[] = [
           } catch (error) {
             throw new Error('Invalid vault secret config');
           }
-          if (provider === 'aws') {
-            const {
-              SecretId, VersionId, VersionStage, SecretKey,
-              SecretType = 'plaintext',
-            } = secretConfig as AWSSecretConfig;
-            if (!SecretId) {
-              throw new Error('Secret Name or ARN is required');
-            }
-            const getSecretOption = {
-              provider,
-              secretId: SecretId,
-              config: {
-                VersionId, VersionStage,
-              },
-              credentials: providerCredential.credentials,
-            };
-            const secretResult = await window.main.cloudService.getSecret(getSecretOption);
-            const { success, error, result } = secretResult;
-            if (success && result) {
-              const { SecretString } = result!;
-              let parsedJSON;
-              if (SecretType === 'plaintext' || !SecretKey) {
-                return SecretString;
-              } else {
-                try {
-                  parsedJSON = JSON.parse(SecretString || '{}');
-                } catch (error) {
-                  throw new Error(`Secret value ${SecretString} can not parsed to key/value pair, please change Secret Type to plaintext`);
-                }
-                if (SecretKey in parsedJSON) {
-                  return parsedJSON[SecretKey];
-                }
-                throw new Error(`Secret key ${SecretKey} does not exist in key/value secret ${SecretString}`);
-              }
-            } else {
-              throw new Error(error?.errorMessage);
-            }
-          }
+          return getExternalVault(provider, providerCredential, secretConfig as ExternalVaultConfig);
         }
         return vaultEnvironmentMaskValue;
       },
diff --git a/packages/insomnia/src/ui/routes/actions.tsx b/packages/insomnia/src/ui/routes/actions.tsx
index 1e0c1d75ce3..9daedfac413 100644
--- a/packages/insomnia/src/ui/routes/actions.tsx
+++ b/packages/insomnia/src/ui/routes/actions.tsx
@@ -1466,20 +1466,31 @@ export const toggleExpandAllRequestGroupsAction: ActionFunction = async ({ param
 
 export const createCloudCredentialAction: ActionFunction = async ({ request }) => {
   const patch = await request.json();
-  const { name, provider, credentials } = patch;
+  const { name, provider, credentials, isAuthenticated } = patch;
   invariant(typeof name === 'string', 'Name is required');
   invariant(provider, 'Cloud Provier name is required');
   if (name && provider && credentials) {
-    const authenciateResponse = await window.main.cloudService.authenticate({ provider, credentials });
-    const { success, error, result } = authenciateResponse;
-    if (success) {
-      await models.cloudCrendential.create(patch);
+    if (isAuthenticated) {
+      // find credential with same name for oauth authenticated cloud service
+      const existingCredential = await models.cloudCrendential.getByName(name, provider);
+      if (existingCredential.length === 0) {
+        await models.cloudCrendential.create(patch);
+      } else {
+        await models.cloudCrendential.update(existingCredential[0], patch);
+      }
+      return credentials;
     } else {
-      return {
-        error: error?.errorMessage,
-      };
+      const authenciateResponse = await window.main.cloudService.authenticate({ provider, credentials });
+      const { success, error, result } = authenciateResponse!;
+      if (success) {
+        await models.cloudCrendential.create(patch);
+      } else {
+        return {
+          error: error?.errorMessage,
+        };
+      }
+      return result;
     }
-    return result;
   }
   return { error: 'Invalid paramters for creating cloud credential' };
 };
@@ -1493,7 +1504,7 @@ export const updateCloudCredentialAction: ActionFunction = async ({ request, par
   invariant(provider, 'Cloud Provier name is required');
   if (name && provider && credentials) {
     const authenciateResponse = await window.main.cloudService.authenticate({ provider, credentials });
-    const { success, error, result } = authenciateResponse;
+    const { success, error, result } = authenciateResponse!;
     if (success) {
       const originCredential = await models.cloudCrendential.getById(cloudCredentialId);
       invariant(originCredential, 'No Cloud Credential found');
diff --git a/packages/insomnia/src/ui/routes/root.tsx b/packages/insomnia/src/ui/routes/root.tsx
index a82b7fa1f83..51276bb3247 100644
--- a/packages/insomnia/src/ui/routes/root.tsx
+++ b/packages/insomnia/src/ui/routes/root.tsx
@@ -22,6 +22,7 @@ import { AskModal } from '../components/modals/ask-modal';
 import { ImportModal } from '../components/modals/import-modal';
 import {
   SettingsModal,
+  TAB_CLOUD_CREDENTIAL,
   TAB_INDEX_PLUGINS,
   TAB_INDEX_THEMES,
 } from '../components/modals/settings-modal';
@@ -201,6 +202,38 @@ const Root = () => {
             break;
           }
 
+          case 'insomnia://oauth/azure/authenticate': {
+            const { code } = params;
+            if (typeof code === 'string') {
+              const authResult = await window.main.cloudService.exchangeCode('azure', { code });
+              const { success, result, error } = authResult;
+              if (success) {
+                const { account, uniqueId } = result!;
+                const name = account?.username || uniqueId;
+                actionFetcher.submit(
+                  JSON.stringify({
+                    name,
+                    credentials: result,
+                    provider: 'azure',
+                    isAuthenticated: true,
+                  }),
+                  {
+                    action: '/cloud-credential/new',
+                    method: 'post',
+                    encType: 'application/json',
+                  }
+                );
+                showModal(SettingsModal, { tab: TAB_CLOUD_CREDENTIAL });
+              } else {
+                showError({
+                  title: 'Error authorizing Azure',
+                  message: error?.errorMessage,
+                });
+              }
+            }
+            break;
+          }
+
           case 'insomnia://app/auth/finish': {
             actionFetcher.submit(
               {

From c2c582af797442dd9f6b4bd867fff753e093a375 Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Mon, 9 Dec 2024 15:24:11 +0800
Subject: [PATCH 4/7] 1.add icons

---
 .../modals/cloud-credential-modal/cloud-credential-modal.tsx | 3 +++
 .../src/ui/components/settings/cloud-service-credentials.tsx | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
index 44a339c5a6f..05d1b3a11ed 100644
--- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
@@ -5,6 +5,8 @@ import { useFetcher } from 'react-router-dom';
 import { type BaseCloudCredential, type CloudProviderCredential, type CloudProviderName, getProviderDisplayName } from '../../../../models/cloud-credential';
 import { Icon } from '../../icon';
 import { AWSCredentialForm } from './aws-credential-form';
+import { showModal } from '..';
+import { SettingsModal, TAB_CLOUD_CREDENTIAL } from '../settings-modal';
 
 export interface CloudCredentialModalProps {
   provider: CloudProviderName;
@@ -58,6 +60,7 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
             credentials: result!,
             isAuthenticated: true,
           });
+          showModal(SettingsModal, { tab: TAB_CLOUD_CREDENTIAL });
         } else {
           setError(error!.errorMessage);
         }
diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
index 4068a41ebfd..6b34b666047 100644
--- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
+++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
@@ -15,20 +15,24 @@ import { NumberSetting } from './number-setting';
 interface createCredentialItemType {
   name: string;
   id: CloudProviderName;
+  icon: JSX.Element;
 }
 const createCredentialItemList: createCredentialItemType[] = [
   {
     id: 'aws',
     name: getProviderDisplayName('aws'),
+    icon: <i className="fa-brands fa-amazon" />
   },
   {
     id: 'azure',
     name: getProviderDisplayName('azure'),
+    icon: <i className="fa-brands fa-microsoft" />
   },
   // TODO support gcp
   // {
   //   id: 'gcp',
   //   name: getProviderDisplayName('gcp'),
+  //   icon: <i className="fa-brands fa-google" />
   // },
 ];
 const buttonClassName = 'disabled:opacity-50 h-7 aspect-square aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] transition-all text-sm py-1 px-2';
@@ -108,6 +112,7 @@ export const CloudServiceCredentialList = () => {
                   className="flex gap-2 px-[--padding-md] aria-selected:font-bold items-center text-[--color-font] h-[--line-height-xxs] w-full text-md whitespace-nowrap bg-transparent hover:bg-[--hl-sm] disabled:cursor-not-allowed focus:bg-[--hl-xs] focus:outline-none transition-colors"
                   aria-label={item.name}
                 >
+                  {item.icon}
                   <span>{item.name}</span>
                 </MenuItem>
               )}

From fedacdeabc0f7d4123d71026abd3bef7ead34e9f Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Mon, 9 Dec 2024 16:03:19 +0800
Subject: [PATCH 5/7] 1.add solution to close the window

---
 .../modals/cloud-credential-modal/cloud-credential-modal.tsx   | 3 ++-
 packages/insomnia/src/ui/routes/root.tsx                       | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
index 05d1b3a11ed..0d2b3fc772f 100644
--- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
@@ -4,9 +4,9 @@ import { useFetcher } from 'react-router-dom';
 
 import { type BaseCloudCredential, type CloudProviderCredential, type CloudProviderName, getProviderDisplayName } from '../../../../models/cloud-credential';
 import { Icon } from '../../icon';
-import { AWSCredentialForm } from './aws-credential-form';
 import { showModal } from '..';
 import { SettingsModal, TAB_CLOUD_CREDENTIAL } from '../settings-modal';
+import { AWSCredentialForm } from './aws-credential-form';
 
 export interface CloudCredentialModalProps {
   provider: CloudProviderName;
@@ -101,6 +101,7 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
                 <Heading slot="title" className='text-2xl'>{providerCredential ? `Edit ${providerDisplayName} credential` : `Authenticate With ${providerDisplayName}`}</Heading>
                 <Button
                   className="flex flex-shrink-0 items-center justify-center aspect-square h-6 aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all text-sm"
+                  id="close-add-cloud-crendeital-modal"
                   onPress={close}
                 >
                   <Icon icon="x" />
diff --git a/packages/insomnia/src/ui/routes/root.tsx b/packages/insomnia/src/ui/routes/root.tsx
index 51276bb3247..48cb109abab 100644
--- a/packages/insomnia/src/ui/routes/root.tsx
+++ b/packages/insomnia/src/ui/routes/root.tsx
@@ -223,6 +223,8 @@ const Root = () => {
                     encType: 'application/json',
                   }
                 );
+                // close the authentication modal if necessary
+                document.getElementById('close-add-cloud-crendeital-modal')?.click();
                 showModal(SettingsModal, { tab: TAB_CLOUD_CREDENTIAL });
               } else {
                 showError({

From 930c794a462ea066b4452198eb1f93a8ef0cfc6d Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Mon, 9 Dec 2024 16:05:08 +0800
Subject: [PATCH 6/7] 1.fix lint issue

---
 .../src/ui/components/settings/cloud-service-credentials.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
index 6b34b666047..5625e48b7bc 100644
--- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
+++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
@@ -21,12 +21,12 @@ const createCredentialItemList: createCredentialItemType[] = [
   {
     id: 'aws',
     name: getProviderDisplayName('aws'),
-    icon: <i className="fa-brands fa-amazon" />
+    icon: <i className="fa-brands fa-amazon" />,
   },
   {
     id: 'azure',
     name: getProviderDisplayName('azure'),
-    icon: <i className="fa-brands fa-microsoft" />
+    icon: <i className="fa-brands fa-microsoft" />,
   },
   // TODO support gcp
   // {

From 78033a96a819b3a56157531c1ecd8fb05f0db837 Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Thu, 2 Jan 2025 14:11:47 +0800
Subject: [PATCH 7/7] Merge GCP & Azure changes  (#8271)

* Add GCP secret manager UI
* Add Azure vault key UI
* Implement authentication and get secret logic for both GCP and Azure
---
 package-lock.json                             | 286 +++++++++++++++++-
 packages/insomnia/package.json                |   2 +
 .../cloud-service-integraion/aws-service.ts   |   4 +-
 .../cloud-service-integraion/azure-service.ts |  10 +-
 .../cloud-service-integraion/cloud-service.ts |  13 +-
 .../cloud-service-integraion/gcp-servcie.ts   | 145 +++++++++
 .../ipc/cloud-service-integraion/types.ts     |  15 +-
 packages/insomnia/src/main/sentry.ts          |   3 +-
 .../insomnia/src/models/cloud-credential.ts   |  21 +-
 .../components/assets/svgr/IcnAzureLogo.tsx   |  13 +
 .../ui/components/assets/svgr/IcnGCPLogo.tsx  |   8 +
 .../cloud-credential-modal.tsx                |  18 +-
 .../gcp-credential-form.tsx                   | 111 +++++++
 .../settings/cloud-service-credentials.tsx    |  58 +++-
 .../insomnia/src/ui/components/svg-icon.tsx   |   6 +
 .../components/templating/external-vault.ts   |  38 ++-
 .../external-vault/external-vault-form.tsx    |  15 +-
 .../gcp-secret-manager-form.tsx               |  58 ++++
 .../templating/local-template-tags.ts         |   9 +-
 packages/insomnia/src/ui/routes/root.tsx      |   2 -
 packages/insomnia/src/ui/sentry.ts            |   3 +-
 21 files changed, 778 insertions(+), 60 deletions(-)
 create mode 100644 packages/insomnia/src/main/ipc/cloud-service-integraion/gcp-servcie.ts
 create mode 100644 packages/insomnia/src/ui/components/assets/svgr/IcnAzureLogo.tsx
 create mode 100644 packages/insomnia/src/ui/components/assets/svgr/IcnGCPLogo.tsx
 create mode 100644 packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx
 create mode 100644 packages/insomnia/src/ui/components/templating/external-vault/gcp-secret-manager-form.tsx

diff --git a/package-lock.json b/package-lock.json
index e278c677150..dd9ae70cc57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2569,6 +2569,18 @@
         "node": ">= 20.16.0"
       }
     },
+    "node_modules/@google-cloud/secret-manager": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/secret-manager/-/secret-manager-5.6.0.tgz",
+      "integrity": "sha512-0daW/OXQEVc6VQKPyJTQNyD+563I/TYQ7GCQJx4dq3lB666R9FUPvqHx9b/o/qQtZ5pfuoCbGZl3krpxgTSW8Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "google-gax": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@grpc/grpc-js": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.0.tgz",
@@ -7635,7 +7647,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
       "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 10"
@@ -7741,7 +7752,6 @@
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz",
       "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/chai": {
@@ -8096,6 +8106,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/long": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==",
+      "license": "MIT"
+    },
     "node_modules/@types/marked": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@types/marked/-/marked-5.0.2.tgz",
@@ -8312,7 +8328,6 @@
       "version": "2.48.12",
       "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz",
       "integrity": "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/caseless": "*",
@@ -8389,7 +8404,6 @@
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
       "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/trusted-types": {
@@ -9988,6 +10002,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/bignumber.js": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -12270,6 +12293,18 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "license": "MIT"
     },
+    "node_modules/duplexify": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
+      "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.2"
+      }
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -13793,6 +13828,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "license": "MIT"
+    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -14159,7 +14200,6 @@
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
       "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -14359,6 +14399,69 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/gaxios": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+      "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^7.0.1",
+        "is-stream": "^2.0.0",
+        "node-fetch": "^2.6.9",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/gaxios/node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/gaxios/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/gaxios/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gcp-metadata": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
+      "integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "gaxios": "^6.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -14571,6 +14674,67 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/google-auth-library": {
+      "version": "9.15.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.0.tgz",
+      "integrity": "sha512-7ccSEJFDFO7exFbO6NRyC+xH8/mZ1GZGG2xxx9iHxZWcjUjJpjWxIMw3cofAKcueZ6DATiukmmprD7yavQHOyQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "gaxios": "^6.1.1",
+        "gcp-metadata": "^6.1.0",
+        "gtoken": "^7.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/google-auth-library/node_modules/jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/google-auth-library/node_modules/jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/google-gax": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.4.1.tgz",
+      "integrity": "sha512-Phyp9fMfA00J3sZbJxbbB4jC55b7DBjE3F6poyL3wKMEBVKA79q6BGuHcTiM28yOzVql0NDbRL8MLLh8Iwk9Dg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@grpc/grpc-js": "^1.10.9",
+        "@grpc/proto-loader": "^0.7.13",
+        "@types/long": "^4.0.0",
+        "abort-controller": "^3.0.0",
+        "duplexify": "^4.0.0",
+        "google-auth-library": "^9.3.0",
+        "node-fetch": "^2.7.0",
+        "object-hash": "^3.0.0",
+        "proto3-json-serializer": "^2.0.2",
+        "protobufjs": "^7.3.2",
+        "retry-request": "^7.0.0",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/google-protobuf": {
       "version": "3.21.4",
       "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.4.tgz",
@@ -14706,6 +14870,40 @@
       "dev": true,
       "license": "Standard 'no charge' license: https://gsap.com/standard-license. Club GSAP members get more: https://gsap.com/licensing/. Why GreenSock doesn't employ an MIT license: https://gsap.com/why-license/"
     },
+    "node_modules/gtoken": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+      "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+      "license": "MIT",
+      "dependencies": {
+        "gaxios": "^6.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/gtoken/node_modules/jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/gtoken/node_modules/jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -15045,7 +15243,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
@@ -16422,6 +16619,15 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -18643,7 +18849,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -19960,6 +20165,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/proto3-json-serializer": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz",
+      "integrity": "sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "protobufjs": "^7.2.5"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/protobufjs": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
@@ -20554,7 +20771,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
@@ -20775,6 +20991,20 @@
         "node": ">= 4"
       }
     },
+    "node_modules/retry-request": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
+      "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/request": "^2.48.8",
+        "extend": "^3.0.2",
+        "teeny-request": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -21734,11 +21964,25 @@
         "duplexer": "~0.1.1"
       }
     },
+    "node_modules/stream-events": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+      "license": "MIT",
+      "dependencies": {
+        "stubs": "^3.0.0"
+      }
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+      "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+      "license": "MIT"
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
@@ -21956,6 +22200,12 @@
       "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
       "license": "MIT"
     },
+    "node_modules/stubs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
+      "license": "MIT"
+    },
     "node_modules/style-mod": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
@@ -22330,6 +22580,22 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "license": "ISC"
     },
+    "node_modules/teeny-request": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
+      "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.9",
+        "stream-events": "^1.0.5",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/temp-file": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz",
@@ -24559,6 +24825,7 @@
         "@connectrpc/connect": "^1.4.0",
         "@connectrpc/connect-node": "^1.4.0",
         "@getinsomnia/node-libcurl": "^2.31.4",
+        "@google-cloud/secret-manager": "^5.6.0",
         "@grpc/grpc-js": "^1.12.0",
         "@grpc/proto-loader": "^0.7.13",
         "@seald-io/nedb": "^4.0.4",
@@ -24574,6 +24841,7 @@
         "electron-context-menu": "^3.6.1",
         "electron-log": "^4.4.8",
         "fastq": "^1.17.1",
+        "google-auth-library": "^9.15.0",
         "graphql": "^16.8.1",
         "graphql-ws": "^5.16.0",
         "grpc-reflection-js": "jackkav/grpc-reflection-js#remove-lodash-set",
diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
index fbb1f9520f1..8cb635841d8 100644
--- a/packages/insomnia/package.json
+++ b/packages/insomnia/package.json
@@ -42,6 +42,7 @@
     "@connectrpc/connect": "^1.4.0",
     "@connectrpc/connect-node": "^1.4.0",
     "@getinsomnia/node-libcurl": "^2.31.4",
+    "@google-cloud/secret-manager": "^5.6.0",
     "@grpc/grpc-js": "^1.12.0",
     "@grpc/proto-loader": "^0.7.13",
     "@azure/msal-node": "^2.16.2",
@@ -58,6 +59,7 @@
     "electron-context-menu": "^3.6.1",
     "electron-log": "^4.4.8",
     "fastq": "^1.17.1",
+    "google-auth-library": "^9.15.0",
     "graphql": "^16.8.1",
     "graphql-ws": "^5.16.0",
     "grpc-reflection-js": "jackkav/grpc-reflection-js#remove-lodash-set",
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts
index 6ee5874456b..08be8a9bde3 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/aws-service.ts
@@ -56,9 +56,9 @@ export class AWSService implements ICloudService {
     return uniqueKeyHash;
   }
 
-  async getSecret(secretNameOrARN: string, config?: AWSGetSecretConfig): Promise<CloudServiceResult<GetSecretValueCommandOutput>> {
+  async getSecret(secretNameOrARN: string, config: AWSGetSecretConfig = {}): Promise<CloudServiceResult<GetSecretValueCommandOutput>> {
     const { region, accessKeyId, secretAccessKey, sessionToken } = this._credential;
-    const { VersionId, VersionStage } = config || {};
+    const { VersionId, VersionStage } = config;
     const secretClient = new SecretsManagerClient({
       region,
       credentials: {
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
index 97d32f8d650..be115254565 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/azure-service.ts
@@ -36,7 +36,7 @@ export const azureEndpointHost = 'https://login.microsoftonline.com';
 export const authority = `${azureEndpointHost}/common`;
 
 const getAzureConfig = async () => {
-  // Validate and use the environment variables if provided
+  // Validate and use the environment variables if provided for dev mode
   if (
     (INSOMNIA_AZURE_REDIRECT_URI && !INSOMNIA_AZURE_CLIENT_ID) ||
     (!INSOMNIA_AZURE_REDIRECT_URI && INSOMNIA_AZURE_CLIENT_ID)
@@ -139,10 +139,11 @@ export class AzureService extends OAuthCloudService implements ICloudService {
   }
 
   async authenticate() {
-    // Azure uses OAuth authenticaion flow.
+    // This method is not implemented as Azure utilizes OAuth authentication flow.
   }
 
-  getUniqueCacheKey(identifier: string) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  getUniqueCacheKey(identifier: string, _config?: any) {
     const uniqueKey = identifier;
     const uniqueKeyHash = crypto.createHash('md5').update(uniqueKey).digest('hex');
     return uniqueKeyHash;
@@ -173,9 +174,12 @@ export class AzureService extends OAuthCloudService implements ICloudService {
           result: secretBody,
         };
       } else {
+        const errorBody = await secretResponse.json() as { error?: { code: string; message: string } };
+        const errorMessage = errorBody.error?.message || secretResponse.statusText || 'Unknown error, failed to get secret';
         return {
           success: false,
           result: null,
+          error: { errorMessage, errorCode: errorBody.error?.code || secretResponse.status.toString() },
         };
       }
     } catch (error) {
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts
index e43272d2e81..579bdc54cc0 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/cloud-service.ts
@@ -1,10 +1,11 @@
 import type { AuthenticationResult as AzureOAuthCredential } from '@azure/msal-node';
 
 import * as models from '../../../models';
-import type { AWSTemporaryCredential, CloudeProviderCredentialType, CloudProviderName } from '../../../models/cloud-credential';
+import type { AWSTemporaryCredential, BaseCloudCredential, CloudProviderName } from '../../../models/cloud-credential';
 import { ipcMainHandle, ipcMainOn } from '../electron';
 import { type AWSGetSecretConfig, AWSService } from './aws-service';
 import { AzureService } from './azure-service';
+import { type GCPGetSecretConfig, GCPService } from './gcp-servcie';
 import { type MaxAgeUnit, VaultCache } from './vault-cache';
 
 // in-memory cache for fetched vault secrets
@@ -20,13 +21,13 @@ export interface cloudServiceBridgeAPI {
 }
 export interface CloudServiceAuthOption {
   provider: CloudProviderName;
-  credentials: CloudeProviderCredentialType;
+  credentials: BaseCloudCredential['credentials'];
 }
 export interface CloudServiceSecretOption<T extends {}> extends CloudServiceAuthOption {
   secretId: string;
-  config?: T;
+  config: T;
 }
-export type CloudServiceGetSecretConfig = AWSGetSecretConfig;
+export type CloudServiceGetSecretConfig = AWSGetSecretConfig | GCPGetSecretConfig;
 
 export function registerCloudServiceHandlers() {
   ipcMainHandle('cloudService.authenticate', (_event, options) => cspAuthentication(options));
@@ -39,12 +40,14 @@ export function registerCloudServiceHandlers() {
 
 // factory pattern to create cloud service class based on its provider name
 class ServiceFactory {
-  static createCloudService(name: CloudProviderName, credential: CloudeProviderCredentialType) {
+  static createCloudService(name: CloudProviderName, credential: BaseCloudCredential['credentials']) {
     switch (name) {
       case 'aws':
         return new AWSService(credential as AWSTemporaryCredential);
       case 'azure':
         return new AzureService(credential as AzureOAuthCredential);
+      case 'gcp':
+        return new GCPService(credential as string);
       default:
         throw new Error('Invalid cloud service provider name');
     }
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/gcp-servcie.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/gcp-servcie.ts
new file mode 100644
index 00000000000..065d69cef76
--- /dev/null
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/gcp-servcie.ts
@@ -0,0 +1,145 @@
+import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import crypto from 'crypto';
+import { readFileSync } from 'fs';
+import { GoogleAuth, type JWTInput } from 'google-auth-library';
+
+import type { CloudProviderName } from '../../../models/cloud-credential';
+import type { CloudServiceResult, GCPSecretConfig, ICloudService } from './types';
+
+export const providerName: CloudProviderName = 'gcp';
+export type GCPGetSecretConfig = Omit<GCPSecretConfig, 'secretName'>;
+export class GCPService implements ICloudService {
+  _keyPath: string;
+
+  constructor(keyPath: string) {
+    this._keyPath = keyPath;
+  }
+
+  _validateKeyPath(): { isValid: true; credentials: JWTInput } | { isValid: false; errorMessage: string } {
+    const requiredFields = ['project_id', 'private_key_id', 'private_key', 'client_email'];
+    const keyPath = this._keyPath;
+    let isValid = true;
+    let errorMessage = '';
+    const isValidJSONStr = (strInput: string) => {
+      try {
+        JSON.parse(strInput);
+        return true;
+      } catch (error) {
+        return false;
+      }
+    };
+
+    try {
+      const fileContent = readFileSync(keyPath, 'utf-8');
+      if (isValidJSONStr(fileContent)) {
+        const serviceAccountKey = JSON.parse(fileContent.toString()) as JWTInput;
+        requiredFields.every(field => {
+          isValid = field in serviceAccountKey;
+          if (!isValid) {
+            errorMessage = `Required field: ${field} is missing`;
+          }
+          return isValid;
+        });
+        if (isValid) {
+          return {
+            isValid: true,
+            credentials: serviceAccountKey,
+          };
+        }
+      } else {
+        isValid = false;
+        errorMessage = `Invalid JSON in file ${keyPath}`;
+      };
+    } catch (error) {
+      isValid = false;
+      errorMessage = error.message || error.toString();
+    };
+    return { isValid: false, errorMessage };
+  }
+
+  async authenticate(): Promise<CloudServiceResult<{}>> {
+    const validateResult = this._validateKeyPath();
+    if (validateResult.isValid) {
+      const auth = new GoogleAuth({
+        credentials: validateResult.credentials,
+        // General scope for GCP
+        scopes: ['https://www.googleapis.com/auth/cloud-platform'],
+      });
+      try {
+        const client = await auth.getClient();
+        // use get access token to validate credential
+        await client.getAccessToken();
+        return {
+          success: true,
+          result: {},
+        };
+      } catch (error) {
+        return {
+          success: false,
+          result: null,
+          error: { errorMessage: error?.message, errorCode: error?.code },
+        };
+      }
+    } else {
+      return {
+        success: false,
+        result: null,
+        error: { errorMessage: validateResult.errorMessage, errorCode: '' },
+      };
+    }
+  }
+
+  getUniqueCacheKey(secretName: string, config?: GCPGetSecretConfig) {
+    const keyPath = this._keyPath;
+    const { version = 'latest' } = config || {};
+    const uniqueKey = `${providerName}:${keyPath}:${secretName}:${version}`;
+    const uniqueKeyHash = crypto.createHash('md5').update(uniqueKey).digest('hex');
+    return uniqueKeyHash;
+  }
+
+  async getSecret(secretName: string, config: GCPGetSecretConfig): Promise<CloudServiceResult<{ value: string }>> {
+    const { version } = config;
+    const secretVersion = version || 'latest';
+    const validateResult = this._validateKeyPath();
+    if (validateResult.isValid) {
+      const { credentials } = validateResult;
+      const { project_id } = credentials;
+      const secretClient = new SecretManagerServiceClient({
+        credentials,
+      });
+      const fullPathSecretNamePattern = /^projects\/[a-z0-9-]+\/secrets\/[a-zA-Z0-9_-]+$/;
+      const fullPathSecretNameWithVersionPattern = /^projects\/[a-z0-9-]+\/secrets\/[a-zA-Z0-9_-]+\/versions\/[a-zA-Z0-9_-]+$/;
+      let finalSecretName: string;
+      if (fullPathSecretNamePattern.test(secretName)) {
+        // if secret name in pattern /projects/<project_id>/secrets/<secret_name> which is copied from gcp
+        finalSecretName = `${secretName}/versions/${secretVersion}`;
+      } else if (fullPathSecretNameWithVersionPattern.test(secretName)) {
+        // if secret name with version in pattern /projects/<project_id>/secrets/<secret_name>/versions/<version> which is copied from gcp
+        finalSecretName = secretName;
+      } else {
+        finalSecretName = `projects/${project_id}/secrets/${secretName}/versions/${secretVersion}`;
+      }
+      try {
+        const [versionResponse] = await secretClient.accessSecretVersion({ name: finalSecretName });
+        const secretResult = versionResponse.payload?.data?.toString() || '';
+        return {
+          success: true,
+          result: { value: secretResult },
+        };
+      } catch (error) {
+        console.error(error);
+        return {
+          success: false,
+          result: null,
+          error: { errorMessage: error.toString(), errorCode: error?.code },
+        };
+      }
+    } else {
+      return {
+        success: false,
+        result: null,
+        error: { errorMessage: validateResult.errorMessage, errorCode: '' },
+      };
+    }
+  }
+};
diff --git a/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts b/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts
index a19cb843a9a..e5b55712cff 100644
--- a/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts
+++ b/packages/insomnia/src/main/ipc/cloud-service-integraion/types.ts
@@ -2,15 +2,14 @@ export interface CloudServiceError {
   errorCode: string;
   errorMessage: string;
 }
-export interface CloudServiceResult<T> {
+export interface CloudServiceResult<T extends Record<string, any>> {
   success: boolean;
-  result: T | null;
+  result?: T | null;
   error?: CloudServiceError;
 }
 export interface ICloudService {
   authenticate(...args: any[]): Promise<any>;
-  getSecret<T extends {}>(secretName: string, config?: T): Promise<any>;
-  getSecret(secretName: string): Promise<any>;
+  getSecret(secretName: string, config: any): Promise<any>;
   getUniqueCacheKey<T extends {} = {}>(secretName: string, config?: T): string;
 }
 
@@ -28,7 +27,13 @@ export interface AzureSecretConfig {
   secretIdentifier: string;
   secretType: AzureSecretType;
 }
-export type ExternalVaultConfig = AWSSecretConfig | AzureSecretConfig;
+
+export interface GCPSecretConfig {
+  secretName: string;
+  version?: string;
+}
+
+export type ExternalVaultConfig = AWSSecretConfig | AzureSecretConfig | GCPSecretConfig;
 
 export abstract class OAuthCloudService {
   static async openAuthUrl() {
diff --git a/packages/insomnia/src/main/sentry.ts b/packages/insomnia/src/main/sentry.ts
index 776eb082d1f..8875c7d6411 100644
--- a/packages/insomnia/src/main/sentry.ts
+++ b/packages/insomnia/src/main/sentry.ts
@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/electron/main';
 
 import * as session from '../account/session';
+import { isDevelopment } from '../common/constants';
 import { type ChangeBufferEvent, database as db } from '../common/database';
 import { SENTRY_OPTIONS } from '../common/sentry';
 import * as models from '../models/index';
@@ -54,7 +55,7 @@ export function initializeSentry() {
        */
       shouldSend: () => enabled,
     },
-    integrations: [
+    integrations: isDevelopment() ? [] : [
       Sentry.anrIntegration({ captureStackTrace: true }),
     ],
   });
diff --git a/packages/insomnia/src/models/cloud-credential.ts b/packages/insomnia/src/models/cloud-credential.ts
index 6c1fb6e1fd0..7b2fc717f85 100644
--- a/packages/insomnia/src/models/cloud-credential.ts
+++ b/packages/insomnia/src/models/cloud-credential.ts
@@ -14,13 +14,26 @@ export interface AWSTemporaryCredential {
   sessionToken: string;
   region: string;
 }
-export type CloudeProviderCredentialType = AWSTemporaryCredential | AzureOAuthCredential;
-
-export interface BaseCloudCredential {
+interface IBaseCloudCredential {
   name: string;
   provider: CloudProviderName;
-  credentials: CloudeProviderCredentialType;
 }
+export interface AWSCloudCredential extends IBaseCloudCredential {
+  name: string;
+  provider: 'aws';
+  credentials: AWSTemporaryCredential;
+}
+export interface AzureCloudCredential extends IBaseCloudCredential {
+  name: string;
+  provider: 'azure';
+  credentials: AzureOAuthCredential;
+}
+export interface GCPCloudCredential extends IBaseCloudCredential {
+  name: string;
+  provider: 'gcp';
+  credentials: string;
+}
+export type BaseCloudCredential = AWSCloudCredential | AzureCloudCredential | GCPCloudCredential;
 export type CloudProviderCredential = BaseModel & BaseCloudCredential;
 
 export const name = 'Cloud Credential';
diff --git a/packages/insomnia/src/ui/components/assets/svgr/IcnAzureLogo.tsx b/packages/insomnia/src/ui/components/assets/svgr/IcnAzureLogo.tsx
new file mode 100644
index 00000000000..17ed3111f2b
--- /dev/null
+++ b/packages/insomnia/src/ui/components/assets/svgr/IcnAzureLogo.tsx
@@ -0,0 +1,13 @@
+/* eslint-disable react/no-unknown-property */
+import React, { memo, type SVGProps } from 'react';
+export const SvgIcnAzureLogo = memo<SVGProps<SVGSVGElement>>(props => (
+  <svg viewBox="-0.4500000000000005 0.38 800.8891043012813 754.2299999999999" width="1em" height="1em" role="img" {...props}>
+    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="353.1" x2="107.1" y1="56.3" y2="783"><stop offset="0" stop-color="#114a8b" /><stop offset="1" stop-color="#0669bc" /></linearGradient>
+    <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="429.8" x2="372.9" y1="394.9" y2="414.2"><stop offset="0" stop-opacity=".3" /><stop offset=".1" stop-opacity=".2" /><stop offset=".3" stop-opacity=".1" /><stop offset=".6" stop-opacity=".1" /><stop offset="1" stop-opacity="0" /></linearGradient>
+    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="398.4" x2="668.4" y1="35.1" y2="754.4"><stop offset="0" stop-color="#3ccbf4" /><stop offset="1" stop-color="#2892df" /></linearGradient>
+    <path d="M266.71.4h236.71L257.69 728.9a37.8 37.8 0 0 1-5.42 10.38c-2.33 3.16-5.14 5.93-8.33 8.22s-6.71 4.07-10.45 5.27-7.64 1.82-11.56 1.82H37.71c-5.98 0-11.88-1.42-17.2-4.16A37.636 37.636 0 0 1 7.1 738.87a37.762 37.762 0 0 1-6.66-16.41c-.89-5.92-.35-11.97 1.56-17.64L230.94 26.07c1.25-3.72 3.08-7.22 5.42-10.38 2.33-3.16 5.15-5.93 8.33-8.22 3.19-2.29 6.71-4.07 10.45-5.27S262.78.38 266.7.38v.01z" fill="url(#a)" />
+    <path d="M703.07 754.59H490.52c-2.37 0-4.74-.22-7.08-.67-2.33-.44-4.62-1.1-6.83-1.97s-4.33-1.95-6.34-3.21a38.188 38.188 0 0 1-5.63-4.34l-241.2-225.26a17.423 17.423 0 0 1-5.1-8.88 17.383 17.383 0 0 1 7.17-18.21c2.89-1.96 6.3-3.01 9.79-3.01h375.36l92.39 265.56z" fill="#0078d4" />
+    <path d="M504.27.4l-165.7 488.69 270.74-.06 92.87 265.56H490.43c-2.19-.02-4.38-.22-6.54-.61s-4.28-.96-6.34-1.72a38.484 38.484 0 0 1-11.36-6.51L303.37 593.79l-45.58 134.42c-1.18 3.36-2.8 6.55-4.82 9.48a40.479 40.479 0 0 1-16.05 13.67 40.03 40.03 0 0 1-10.13 3.23H37.82c-6.04.02-12-1.42-17.37-4.2A37.664 37.664 0 0 1 .43 722a37.77 37.77 0 0 1 1.87-17.79L230.87 26.58c1.19-3.79 2.98-7.36 5.3-10.58 2.31-3.22 5.13-6.06 8.33-8.4s6.76-4.16 10.53-5.38S262.75.38 266.72.4h237.56z" fill="url(#b)" />
+    <path d="M797.99 704.82a37.847 37.847 0 0 1 1.57 17.64 37.867 37.867 0 0 1-6.65 16.41 37.691 37.691 0 0 1-30.61 15.72H498.48c5.98 0 11.88-1.43 17.21-4.16 5.32-2.73 9.92-6.7 13.41-11.56s5.77-10.49 6.66-16.41.35-11.97-1.56-17.64L305.25 26.05a37.713 37.713 0 0 0-13.73-18.58c-3.18-2.29-6.7-4.06-10.43-5.26S273.46.4 269.55.4h263.81c3.92 0 7.81.61 11.55 1.81 3.73 1.2 7.25 2.98 10.44 5.26 3.18 2.29 5.99 5.06 8.32 8.21s4.15 6.65 5.41 10.37l228.95 678.77z" fill="url(#c)" />
+  </svg>
+));
diff --git a/packages/insomnia/src/ui/components/assets/svgr/IcnGCPLogo.tsx b/packages/insomnia/src/ui/components/assets/svgr/IcnGCPLogo.tsx
new file mode 100644
index 00000000000..9408f5c90c5
--- /dev/null
+++ b/packages/insomnia/src/ui/components/assets/svgr/IcnGCPLogo.tsx
@@ -0,0 +1,8 @@
+import React, { memo, type SVGProps } from 'react';
+export const SvgIcnGCPLogo = memo<SVGProps<SVGSVGElement>>(props => (
+  <svg viewBox="0 0 256 206" width="1em" height="1em" role="img" {...props}>
+    <path d="m170.2517 56.8186 22.253-22.253 1.483-9.37c-40.551-36.873-105.012-32.692-141.567 8.724-10.154 11.503-17.687 25.844-21.704 40.653l7.97-1.123 44.505-7.339 3.436-3.514c19.797-21.742 53.27-24.667 76.128-6.168z" fill="#ea4335" />
+    <path d="m224.2048 73.9182c-5.115-18.836-15.616-35.769-30.217-48.722l-31.232 31.232c13.188 10.776 20.701 27.01 20.379 44.037v5.544c15.351 0 27.797 12.445 27.797 27.796 0 15.352-12.446 27.485-27.797 27.485h-55.671l-5.466 5.934v33.34l5.466 5.231h55.671c39.93.311 72.552-31.494 72.863-71.424.188-24.203-11.745-46.893-31.793-60.453" fill="#4285f4" />
+    <path d="m71.8704 205.7957h55.593v-44.506h-55.593c-3.961-.001-7.797-.852-11.399-2.498l-7.887 2.42-22.409 22.253-1.952 7.574c12.567 9.489 27.9 14.825 43.647 14.757" fill="#34a853" /><path d="m71.8704 61.4255c-39.931.238-72.107 32.802-71.869 72.732.133 22.298 10.547 43.288 28.222 56.881l32.248-32.247c-13.991-6.321-20.208-22.786-13.887-36.776 6.32-13.99 22.786-20.207 36.775-13.887 6.165 2.785 11.102 7.723 13.887 13.887l32.248-32.247c-13.721-17.937-35.041-28.424-57.624-28.343" fill="#fbbc05" />
+  </svg>
+));
diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
index 0d2b3fc772f..6be98339e16 100644
--- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx
@@ -7,15 +7,17 @@ import { Icon } from '../../icon';
 import { showModal } from '..';
 import { SettingsModal, TAB_CLOUD_CREDENTIAL } from '../settings-modal';
 import { AWSCredentialForm } from './aws-credential-form';
+import { GCPCredentialForm } from './gcp-credential-form';
 
 export interface CloudCredentialModalProps {
   provider: CloudProviderName;
   providerCredential?: CloudProviderCredential;
   onClose: (data?: any) => void;
+  onComplete?: (data?: any) => void;
 };
 
 export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
-  const { provider, providerCredential, onClose } = props;
+  const { provider, providerCredential, onClose, onComplete } = props;
   const [isAuthenticating, setIsAuthenticating] = useState(false);
   const [error, setError] = useState('');
   const [manulInputUrl, setManualInputUrl] = useState('');
@@ -73,9 +75,11 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
   useEffect(() => {
     // close modal if submit success
     if (cloudCredentialFetcher.data && !cloudCredentialFetcher.data.error && cloudCredentialFetcher.state === 'idle') {
-      onClose(cloudCredentialFetcher.data);
+      const newCredentialData = cloudCredentialFetcher.data;
+      onClose(newCredentialData);
+      onComplete && onComplete(newCredentialData);
     };
-  }, [cloudCredentialFetcher.data, cloudCredentialFetcher.state, onClose]);
+  }, [cloudCredentialFetcher.data, cloudCredentialFetcher.state, onClose, onComplete]);
 
   return (
     <ModalOverlay
@@ -149,6 +153,14 @@ export const CloudCredentialModal = (props: CloudCredentialModalProps) => {
                   )}
                 </div>
               }
+              {provider === 'gcp' &&
+                <GCPCredentialForm
+                  data={providerCredential}
+                  isLoading={cloudCredentialFetcher.state !== 'idle'}
+                  onSubmit={handleFormSubmit}
+                  errorMessage={fetchErrorMessage}
+                />
+              }
             </div>
           )}
         </Dialog>
diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx
new file mode 100644
index 00000000000..d924ed02a07
--- /dev/null
+++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx
@@ -0,0 +1,111 @@
+import React, { useState } from 'react';
+import { Button, Input, Label, TextField } from 'react-aria-components';
+
+import { type BaseCloudCredential, type CloudProviderCredential, type CloudProviderName } from '../../../../models/cloud-credential';
+import { HelpTooltip } from '../../help-tooltip';
+import { Icon } from '../../icon';
+
+export interface GCPCredentialFormProps {
+  data?: CloudProviderCredential;
+  onSubmit: (newData: BaseCloudCredential) => void;
+  isLoading: boolean;
+  errorMessage?: string;
+}
+const initialFormValue = {
+  name: '',
+};
+export const providerType: CloudProviderName = 'gcp';
+
+export const GCPCredentialForm = (props: GCPCredentialFormProps) => {
+  const { data, onSubmit, isLoading, errorMessage } = props;
+  const [inputKeyPath, setInputKeyPath] = useState(data?.credentials as string);
+  const isEdit = !!data;
+  const { name } = data || initialFormValue;
+
+  const handleSelectFile = async () => {
+    const { canceled, filePaths } = await window.dialog.showOpenDialog({
+      title: 'Select Service Accont Key File',
+      buttonLabel: 'Select',
+      properties: ['openFile'],
+      filters: [
+        { name: 'JSON File', extensions: ['json'] },
+      ],
+    });
+    if (canceled) {
+      return;
+    }
+    const selectedFile = filePaths[0];
+    setInputKeyPath(selectedFile);
+  };
+
+  return (
+    <form
+      className='flex flex-col gap-2 flex-shrink-0'
+      onSubmit={e => {
+        e.preventDefault();
+        e.stopPropagation();
+        const formData = new FormData(e.currentTarget);
+        const { name } = Object.fromEntries(formData.entries()) as Record<string, string>;
+        const newData = {
+          name,
+          provider: providerType,
+          credentials: inputKeyPath!,
+        };
+        onSubmit(newData);
+      }}
+    >
+      <div className='flex flex-col gap-2'>
+        <TextField
+          className="flex flex-col gap-2"
+          defaultValue={name}
+        >
+          <Label className='col-span-4'>
+            Credential Name:
+          </Label>
+          <Input
+            required
+            className='py-1 h-8 w-full pl-2 pr-7 rounded-sm border border-solid border-[--hl-sm] bg-[--color-bg] text-[--color-font] focus:outline-none focus:ring-1 focus:ring-[--hl-md] transition-colors flex-1 placeholder:italic placeholder:opacity-60 col-span-3'
+            type="text"
+            name="name"
+            placeholder="Credential name"
+          />
+        </TextField>
+        <div>
+          <label>
+            Service Account Key File Path:
+            <HelpTooltip className='ml-2 sapce-left'>Enter the path of your service account key file which is generated in GCP console</HelpTooltip>
+          </label>
+        </div>
+        <div className='mt-2 flex gap-3'>
+          <Input
+            className='py-1 w-4/5 pl-2 pr-7 rounded-sm border border-solid border-[--hl-sm] bg-[--color-bg] text-[--color-font] focus:outline-none focus:ring-1 focus:ring-[--hl-md] transition-colors flex-1 placeholder:italic placeholder:opacity-60 col-span-3'
+            placeholder="Service account key path"
+            aria-label='Input Serice Account Key Path'
+            value={inputKeyPath}
+            onChange={e => setInputKeyPath(e.target.value)}
+          />
+          <Button
+            className="flex-shrink-0 border-solid border border-[--hl-`sm] py-1 items-center justify-center px-4 aria-pressed:bg-[--hl-sm] aria-selected:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent transition-all text-base"
+            onPress={handleSelectFile}
+          >
+            <Icon icon="file" className='mr-2' />
+            <span>Select File</span>
+          </Button>
+        </div>
+        {(errorMessage) &&
+          <p className="notice error margin-top-sm no-margin-bottom">{errorMessage}</p>
+        }
+        <div className='w-full flex flex-row items-center justify-end gap-[--padding-md] pt-[--padding-md]'>
+          <Button
+            className="hover:no-underline text-right bg-[--color-surprise] hover:bg-opacity-90 border border-solid border-[--hl-md] py-2 px-3 text-[--color-font-surprise] transition-colors rounded-sm"
+            type='submit'
+            isDisabled={isLoading || !inputKeyPath}
+          >
+            {isLoading && <Icon icon="spinner" className="text-[--color-font] animate-spin m-auto inline-block mr-2" />}
+            {isEdit ? 'Update' : 'Create'}
+          </Button>
+        </div>
+      </div>
+    </form >
+  );
+};
diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
index 5625e48b7bc..0a57652c9e6 100644
--- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
+++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx
@@ -1,7 +1,9 @@
+import type { AuthenticationResult } from '@azure/msal-node';
 import React, { useState } from 'react';
 import { Button, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components';
 import { useFetcher } from 'react-router-dom';
 
+import { isDevelopment } from '../../../common/constants';
 import { type CloudProviderCredential, type CloudProviderName, getProviderDisplayName } from '../../../models/cloud-credential';
 import { usePlanData } from '../../hooks/use-plan';
 import { useRootLoaderData } from '../../routes/root';
@@ -9,6 +11,8 @@ import { Icon } from '../icon';
 import { showModal } from '../modals';
 import { AskModal } from '../modals/ask-modal';
 import { CloudCredentialModal } from '../modals/cloud-credential-modal/cloud-credential-modal';
+import { SvgIcon } from '../svg-icon';
+import { Tooltip } from '../tooltip';
 import { UpgradeNotice } from '../upgrade-notice';
 import { NumberSetting } from './number-setting';
 
@@ -21,19 +25,18 @@ const createCredentialItemList: createCredentialItemType[] = [
   {
     id: 'aws',
     name: getProviderDisplayName('aws'),
-    icon: <i className="fa-brands fa-amazon" />,
+    icon: <i className="ml-1 fa-brands fa-aws" />,
   },
   {
     id: 'azure',
     name: getProviderDisplayName('azure'),
-    icon: <i className="fa-brands fa-microsoft" />,
+    icon: <SvgIcon icon='azure-logo' className='ml-1' />,
+  },
+  {
+    id: 'gcp',
+    name: getProviderDisplayName('gcp'),
+    icon: <SvgIcon icon='gcp-logo' className='ml-1' />,
   },
-  // TODO support gcp
-  // {
-  //   id: 'gcp',
-  //   name: getProviderDisplayName('gcp'),
-  //   icon: <i className="fa-brands fa-google" />
-  // },
 ];
 const buttonClassName = 'disabled:opacity-50 h-7 aspect-square aria-pressed:bg-[--hl-sm] rounded-sm text-[--color-font] hover:bg-[--hl-xs] transition-all text-sm py-1 px-2';
 
@@ -70,7 +73,12 @@ export const CloudServiceCredentialList = () => {
   };
 
   const handleCreateCloudServiceCredential = (key: CloudProviderName) => {
-    setModalState({ show: true, provider: key as CloudProviderName });
+    if (key === 'azure' && !isDevelopment()) {
+      // open Azure oauth page directly in production build
+      window.main.cloudService.openAuthUrl('azure');
+    } else {
+      setModalState({ show: true, provider: key as CloudProviderName });
+    }
   };
 
   if (!isEnterprisePlan) {
@@ -132,18 +140,36 @@ export const CloudServiceCredentialList = () => {
           </thead>
           <tbody>
             {cloudCredentials.map(cloudCred => {
-              const { _id, name, provider } = cloudCred;
+              const { _id, name, provider, credentials } = cloudCred;
+              let isAzureTokenExpired = false;
+              if (provider === 'azure') {
+                const tokenExpiresOn = (credentials as AuthenticationResult).expiresOn;
+                if (tokenExpiresOn && new Date() >= new Date(tokenExpiresOn)) {
+                  isAzureTokenExpired = true;
+                }
+              };
+              const credentialItem = createCredentialItemList.find(item => item.id === provider);
               return (
                 <tr key={_id}>
                   <td >
                     {name}
+                    {provider === 'azure' && isAzureTokenExpired &&
+                      <Tooltip message='Token is expired' position='top'>
+                        <i className="ml-1 fa fa-exclamation-circle text-[--color-warning]" />
+                      </Tooltip>
+                    }
                   </td>
                   <td className='w-36'>
-                    {getProviderDisplayName(provider!)}
+                    {credentialItem && (
+                      <div className='flex items-center gap-2'>
+                        {credentialItem.icon}
+                        <span>{credentialItem.name}</span>
+                      </div>
+                    )}
                   </td>
                   <td className='w-52 whitespace-nowrap'>
                     <div className='flex gap-2'>
-                      {provider === 'aws' &&
+                      {provider !== 'azure' &&
                         <Button
                           className={`${buttonClassName} w-16`}
                           onPress={() => setModalState({ show: true, provider: provider!, credential: cloudCred })}
@@ -151,6 +177,14 @@ export const CloudServiceCredentialList = () => {
                           <Icon icon="edit" />&nbsp;&nbsp;Edit
                         </Button>
                       }
+                      {provider === 'azure' && isAzureTokenExpired &&
+                        <Button
+                          className={`${buttonClassName} w-20`}
+                          onPress={() => handleCreateCloudServiceCredential('azure')}
+                        >
+                          <Icon icon="rotate" /> Renew
+                        </Button>
+                      }
                       <Button
                         className={`${buttonClassName} w-20`}
                         onPress={() => handleDeleteItem(_id, name)}
diff --git a/packages/insomnia/src/ui/components/svg-icon.tsx b/packages/insomnia/src/ui/components/svg-icon.tsx
index 6307b347cda..ddf83a3f579 100644
--- a/packages/insomnia/src/ui/components/svg-icon.tsx
+++ b/packages/insomnia/src/ui/components/svg-icon.tsx
@@ -2,6 +2,7 @@ import React, { type NamedExoticComponent, type SVGProps } from 'react';
 import type { ValueOf } from 'type-fest';
 
 import { SvgIcnArrowRight } from './assets/svgr/IcnArrowRight';
+import { SvgIcnAzureLogo } from './assets/svgr/IcnAzureLogo';
 import { SvgIcnBitbucketLogo } from './assets/svgr/IcnBitbucketLogo';
 import { SvgIcnBrackets } from './assets/svgr/IcnBrackets';
 import { SvgIcnBug } from './assets/svgr/IcnBug';
@@ -23,6 +24,7 @@ import { SvgIcnErrors } from './assets/svgr/IcnErrors';
 import { SvgIcnFile } from './assets/svgr/IcnFile';
 import { SvgIcnFolder } from './assets/svgr/IcnFolder';
 import { SvgIcnFolderOpen } from './assets/svgr/IcnFolderOpen';
+import { SvgIcnGCPLogo } from './assets/svgr/IcnGCPLogo';
 import { SvgIcnGear } from './assets/svgr/IcnGear';
 import { SvgIcnGitBranch } from './assets/svgr/IcnGitBranch';
 import { SvgIcnGithubLogo } from './assets/svgr/IcnGithubLogo';
@@ -131,6 +133,8 @@ export const IconEnum = {
   receive: 'receive',
   sent: 'sent',
   systemEvent: 'system-event',
+  gcpLogo: 'gcp-logo',
+  azureLogo: 'azure-logo',
   /** Blank icon */
   empty: 'empty',
 } as const;
@@ -193,6 +197,8 @@ const icons: Record<IconId, [ThemeKeys, NamedExoticComponent<SVGProps<SVGSVGElem
   [IconEnum.sent]: [ThemeEnum.default, SvgIcnSent],
   [IconEnum.checkmarkCircle]: [ThemeEnum.default, SvgIcnCheckmarkCircle],
   [IconEnum.systemEvent]: [ThemeEnum.default, SvgIcnSystemEvent],
+  [IconEnum.gcpLogo]: [ThemeEnum.default, SvgIcnGCPLogo],
+  [IconEnum.azureLogo]: [ThemeEnum.default, SvgIcnAzureLogo],
 };
 
 export type IconId = ValueOf<typeof IconEnum>;
diff --git a/packages/insomnia/src/ui/components/templating/external-vault.ts b/packages/insomnia/src/ui/components/templating/external-vault.ts
index 4f0cfb0c846..5b297f9d278 100644
--- a/packages/insomnia/src/ui/components/templating/external-vault.ts
+++ b/packages/insomnia/src/ui/components/templating/external-vault.ts
@@ -1,6 +1,7 @@
 import type { AWSGetSecretConfig } from '../../../main/ipc/cloud-service-integraion/aws-service';
 import type { CloudServiceSecretOption } from '../../../main/ipc/cloud-service-integraion/cloud-service';
-import type { AWSSecretConfig, AzureSecretConfig, ExternalVaultConfig } from '../../../main/ipc/cloud-service-integraion/types';
+import type { GCPGetSecretConfig } from '../../../main/ipc/cloud-service-integraion/gcp-servcie';
+import type { AWSSecretConfig, AzureSecretConfig, ExternalVaultConfig, GCPSecretConfig } from '../../../main/ipc/cloud-service-integraion/types';
 import type { CloudProviderCredential, CloudProviderName } from '../../../models/cloud-credential';
 
 export const getExternalVault = async (provider: CloudProviderName, providerCredential: CloudProviderCredential, secretConfig: ExternalVaultConfig) => {
@@ -9,6 +10,8 @@ export const getExternalVault = async (provider: CloudProviderName, providerCred
       return getAWSSecret(secretConfig as AWSSecretConfig, providerCredential);
     case 'azure':
       return getAzureSecret(secretConfig as AzureSecretConfig, providerCredential);
+    case 'gcp':
+      return getGCPSecret(secretConfig as GCPSecretConfig, providerCredential);
     default:
       return '';
   }
@@ -20,7 +23,7 @@ export const getAWSSecret = async (secretConfig: AWSSecretConfig, providerCreden
     SecretType = 'plaintext',
   } = secretConfig;
   if (!SecretId) {
-    throw new Error('Secret Name or ARN is required');
+    throw new Error('Get secret from AWS failed: Secret Name or ARN is required');
   }
   const getSecretOption: CloudServiceSecretOption<AWSGetSecretConfig> = {
     provider: 'aws',
@@ -41,33 +44,54 @@ export const getAWSSecret = async (secretConfig: AWSSecretConfig, providerCreden
       try {
         parsedJSON = JSON.parse(SecretString || '{}');
       } catch (error) {
-        throw new Error(`Secret value ${SecretString} can not parsed to key/value pair, please change Secret Type to plaintext`);
+        throw new Error(`Get secret from AWS failed: Secret value ${SecretString} can not parsed to key/value pair, please change Secret Type to plaintext`);
       }
       if (SecretKey in parsedJSON) {
         return parsedJSON[SecretKey];
       }
-      throw new Error(`Secret key ${SecretKey} does not exist in key/value secret ${SecretString}`);
+      throw new Error(`Get secret from AWS failed: Secret key ${SecretKey} does not exist in key/value secret ${SecretString}`);
     }
   } else {
-    throw new Error(error?.errorMessage);
+    throw new Error(`Get secret from AWS failed: ${error?.errorMessage}`);
   }
 };
 
 export const getAzureSecret = async (secretConfig: AzureSecretConfig, providerCredential: CloudProviderCredential) => {
   const { secretIdentifier } = secretConfig;
   if (!secretIdentifier) {
-    throw new Error('Secret Identifieror is required');
+    throw new Error('Get secret from Azure failed: Secret Identifieror is required');
   }
   const getSecretOption: CloudServiceSecretOption<{}> = {
     provider: 'azure',
     secretId: secretIdentifier,
     credentials: providerCredential.credentials,
+    config: {},
   };
   const secretResult = await window.main.cloudService.getSecret(getSecretOption);
   const { success, error, result } = secretResult;
   if (success && result) {
     return result.value;
   } else {
-    throw new Error(error?.errorMessage);
+    throw new Error(`Get secret from Azure failed: ${error?.errorMessage}`);
+  }
+};
+
+export const getGCPSecret = async (secretConfig: GCPSecretConfig, providerCredential: CloudProviderCredential) => {
+  const { secretName, version } = secretConfig;
+  if (!secretName) {
+    throw new Error('Get secret from GCP failed: Secret Name is required');
+  }
+  const getSecretOption: CloudServiceSecretOption<GCPGetSecretConfig> = {
+    provider: 'gcp',
+    secretId: secretName,
+    credentials: providerCredential.credentials,
+    config: { version },
+  };
+  const secretResult = await window.main.cloudService.getSecret(getSecretOption);
+  const { success, error, result } = secretResult;
+  if (success && result) {
+    return result.value;
+  } else {
+    throw new Error(`Get secret from GCP failed: ${error?.errorMessage}`);
   }
 };
diff --git a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
index 6d6db174563..25a5f962a96 100644
--- a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
+++ b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
@@ -2,13 +2,14 @@ import React, { useState } from 'react';
 import { Button } from 'react-aria-components';
 
 import { debounce } from '../../../../common/misc';
-import type { AWSSecretConfig, AzureSecretConfig, ExternalVaultConfig } from '../../../../main/ipc/cloud-service-integraion/types';
+import type { AWSSecretConfig, AzureSecretConfig, ExternalVaultConfig, GCPSecretConfig } from '../../../../main/ipc/cloud-service-integraion/types';
 import { type CloudProviderCredential, type CloudProviderName, type } from '../../../../models/cloud-credential';
 import { Icon } from '../../icon';
 import { CloudCredentialModal } from '../../modals/cloud-credential-modal/cloud-credential-modal';
 import type { ArgConfigFormProps } from '../tag-editor-arg-sub-form';
 import { AWSSecretManagerForm } from './aws-secret-manager-form';
 import { AzureKeyVaultForm } from './azure-key-vault-form';
+import { GCPSecretManagerForm } from './gcp-secret-manager-form';
 
 export const ExternalVaultForm = (props: ArgConfigFormProps) => {
   const { onChange, configValue, activeTagData, docs } = props;
@@ -44,13 +45,22 @@ export const ExternalVaultForm = (props: ArgConfigFormProps) => {
         />
       );
       break;
+    case 'gcp':
+      SubForm = (
+        <GCPSecretManagerForm
+          formData={formData as GCPSecretConfig}
+          onChange={handleFormChange}
+          activeTagData={activeTagData}
+        />
+      );
+      break;
     default:
       SubForm = null;
   };
 
   return (
     <>
-      {selectedCredentialDoc &&
+      {selectedCredentialDoc && provider !== 'azure' &&
         <Button
           className="px-2 py-1 mb-[--padding-sm] h-full flex items-center justify-center gap-2 aria-pressed:bg-[--hl-sm] text-[--color-info] text-xs hover:bg-[--hl-xs] focus:ring-inset ring-1 ring-transparent focus:ring-[--hl-md] transition-all"
           style={{ marginTop: 'calc(var(--padding-sm) * -1)' }}
@@ -65,6 +75,7 @@ export const ExternalVaultForm = (props: ArgConfigFormProps) => {
           provider={provider}
           providerCredential={selectedCredentialDoc}
           onClose={() => setShowModal(false)}
+          onComplete={() => onChange(configValue)}
         />
       }
     </>
diff --git a/packages/insomnia/src/ui/components/templating/external-vault/gcp-secret-manager-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/gcp-secret-manager-form.tsx
new file mode 100644
index 00000000000..07178521dfe
--- /dev/null
+++ b/packages/insomnia/src/ui/components/templating/external-vault/gcp-secret-manager-form.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+
+import type { GCPSecretConfig } from '../../../../main/ipc/cloud-service-integraion/types';
+import type { NunjucksParsedTag } from '../../../../templating/utils';
+import { HelpTooltip } from '../../help-tooltip';
+
+export interface GCPSecretManagerFormProps {
+  formData: GCPSecretConfig;
+  onChange: (newConfig: GCPSecretConfig) => void;
+  activeTagData: NunjucksParsedTag;
+}
+
+export const GCPSecretManagerForm = (props: GCPSecretManagerFormProps) => {
+  const { formData, onChange } = props;
+  const {
+    secretName,
+    version = 'latest',
+  } = formData;
+  const handleOnChange = () => {
+    const formElement = document.getElementById('gcp-secret-manager-form') as HTMLFormElement;
+    if (formElement) {
+      const formData = new FormData(formElement);
+      const newConfig = Object.fromEntries(formData.entries());
+      onChange(newConfig as unknown as GCPSecretConfig);
+    }
+  };
+  return (
+    <form id='gcp-secret-manager-form'>
+      <div className="form-row">
+        <div className="form-control">
+          <label>
+            Secret Name
+            <input
+              name='secretName'
+              defaultValue={secretName}
+              onChange={() => handleOnChange()}
+            />
+          </label>
+        </div>
+      </div>
+      <div className="form-row">
+        <div className="form-control">
+          <label>
+            Version
+            <HelpTooltip className="space-left">
+              Optional version of the secret to retrieve, by default as latest.
+            </HelpTooltip>
+            <input
+              name='version'
+              defaultValue={version}
+              onChange={() => handleOnChange()}
+            />
+          </label>
+        </div>
+      </div>
+    </form>
+  );
+};
diff --git a/packages/insomnia/src/ui/components/templating/local-template-tags.ts b/packages/insomnia/src/ui/components/templating/local-template-tags.ts
index f0b9cf5ae74..6f4b3bb1024 100644
--- a/packages/insomnia/src/ui/components/templating/local-template-tags.ts
+++ b/packages/insomnia/src/ui/components/templating/local-template-tags.ts
@@ -36,6 +36,7 @@ const localTemplatePlugins: { templateTag: PluginTemplateTag }[] = [
           options: [
             { displayName: 'AWS Secrets Manager', value: 'aws' },
             { displayName: 'Azure Key Vault', value: 'azure' },
+            { displayName: 'GCP Secret Manager', value: 'gcp' },
           ],
         },
         {
@@ -56,14 +57,14 @@ const localTemplatePlugins: { templateTag: PluginTemplateTag }[] = [
       ],
       async run(context, provider: CloudProviderName, credentialId: string, configStr: string) {
         if (!provider) {
-          throw new Error('Vault service provider is required');
+          throw new Error('Get secret from external vault failed: Vault service provider is required');
         }
         if (!credentialId) {
-          throw new Error('Credential is required');
+          throw new Error('Get secret from external vault failed: Credential is required');
         };
         const providerCredential = await models.cloudCrendential.getById(credentialId);
         if (!providerCredential) {
-          throw new Error('No Cloud Credential found');
+          throw new Error('Get secret from external vault failed: No Cloud Credential found');
         }
         const renderContext = context.renderPurpose as RenderPurpose;
         // Get secret from external vaults when send request or in tag-preview, otherwise return defautl mask value
@@ -72,7 +73,7 @@ const localTemplatePlugins: { templateTag: PluginTemplateTag }[] = [
           try {
             secretConfig = JSON.parse(configStr);
           } catch (error) {
-            throw new Error('Invalid vault secret config');
+            throw new Error('Get secret from external vault failed: Invalid vault secret config');
           }
           return getExternalVault(provider, providerCredential, secretConfig as ExternalVaultConfig);
         }
diff --git a/packages/insomnia/src/ui/routes/root.tsx b/packages/insomnia/src/ui/routes/root.tsx
index 48cb109abab..51276bb3247 100644
--- a/packages/insomnia/src/ui/routes/root.tsx
+++ b/packages/insomnia/src/ui/routes/root.tsx
@@ -223,8 +223,6 @@ const Root = () => {
                     encType: 'application/json',
                   }
                 );
-                // close the authentication modal if necessary
-                document.getElementById('close-add-cloud-crendeital-modal')?.click();
                 showModal(SettingsModal, { tab: TAB_CLOUD_CREDENTIAL });
               } else {
                 showError({
diff --git a/packages/insomnia/src/ui/sentry.ts b/packages/insomnia/src/ui/sentry.ts
index f1223a277c3..ab5f0b8c4b5 100644
--- a/packages/insomnia/src/ui/sentry.ts
+++ b/packages/insomnia/src/ui/sentry.ts
@@ -1,5 +1,6 @@
 import * as Sentry from '@sentry/electron/renderer';
 
+import { isDevelopment } from '../common/constants';
 import { SENTRY_OPTIONS } from '../common/sentry';
 
 export function initializeSentry() {
@@ -10,7 +11,7 @@ export function initializeSentry() {
     // set 0.1 sample rate for traces, only send 10% of traces, and check whether the limit is exceeded
     // https://konghq.sentry.io/settings/billing/overview/?category=transactions
     tracesSampleRate: 0.1,
-    anrDetection: {
+    anrDetection: isDevelopment() ? false : {
       captureStackTrace: true,
     },
   });