From 7b443e3c5e6ffe94954f5413a63e5a07068e0c00 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <50385537+ct3685@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:02:04 -0400
Subject: [PATCH 1/2] hotfix: Google OAuth Button Not Appearing (#502)

hotfix: Google OAuth Button Not Appearing
---
 packages/ui/src/views/credentials/AddEditCredentialDialog.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/ui/src/views/credentials/AddEditCredentialDialog.jsx b/packages/ui/src/views/credentials/AddEditCredentialDialog.jsx
index f983fb3d61f..7f91bf74683 100644
--- a/packages/ui/src/views/credentials/AddEditCredentialDialog.jsx
+++ b/packages/ui/src/views/credentials/AddEditCredentialDialog.jsx
@@ -567,6 +567,7 @@ const AddEditCredentialDialog = ({ show, dialogProps, onCancel, onConfirm, setEr
                 )}
                 {componentCredential && (
                     <GoogleAuthButton
+                        key='google-auth-button'
                         componentCredential={componentCredential}
                         name={name}
                         handleGoogleOAuth={handleGoogleOAuth}
@@ -575,6 +576,7 @@ const AddEditCredentialDialog = ({ show, dialogProps, onCancel, onConfirm, setEr
                 )}
                 {componentCredential && (
                     <SalesforceAuthButton
+                        key='salesforce-auth-button'
                         componentCredential={componentCredential}
                         credentialData={credentialData}
                         handleSalesforceOAuth={handleSalesforceOAuth}
@@ -583,6 +585,7 @@ const AddEditCredentialDialog = ({ show, dialogProps, onCancel, onConfirm, setEr
                 )}
                 {componentCredential && (
                     <AtlassianAuthButton
+                        key='atlassian-auth-button'
                         componentCredential={componentCredential}
                         credentialData={credentialData}
                         handleAtlassianOAuth={handleAtlassianOAuth}

From c1d4c4ce5f49cf8c4edd3691f2d771ac52fc26ad Mon Sep 17 00:00:00 2001
From: Cameron Taylor <50385537+ct3685@users.noreply.github.com>
Date: Thu, 21 Aug 2025 18:49:56 -0400
Subject: [PATCH 2/2] fix: Improve the reliability of the cache file (#504)

## Summary
This commit modifies the path for the cache file in the
`readConfigFileWithFallback` function to utilize `dirname` instead of
`process.cwd()`, ensuring that the cache file is correctly located
relative to the current module's directory.

## Changes
- Updated the cache file path from `path.join(process.cwd(),
'.bwsconfig.cache')` to `path.join(dirname, '.bwsconfig.cache')`.

This change improves the reliability of the cache file's location,
particularly in environments where the working directory may differ from
the module's directory.
---
 scripts/bws-secure/secureRun.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bws-secure/secureRun.js b/scripts/bws-secure/secureRun.js
index 699afbefdb2..ece4ebe14ea 100755
--- a/scripts/bws-secure/secureRun.js
+++ b/scripts/bws-secure/secureRun.js
@@ -97,7 +97,7 @@ function getMachineAccountsUrl() {
 async function readConfigFileWithFallback() {
   const hasToken = process.env.BWS_ACCESS_TOKEN;
   const noOverride = process.env.BWS_NO_OVERRIDE === 'true';
-  const cacheFile = path.join(process.cwd(), '.bwsconfig.cache');
+  const cacheFile = path.join(dirname, '.bwsconfig.cache');
   const cacheTimeout = 5 * 60 * 1000; // 5 minutes cache
 
   // Skip BWS override if BWS_NO_OVERRIDE is set