From 2a2fdfbee9bfe15878b82ac62dc02cf9eec86388 Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Tue, 4 Jan 2022 10:54:49 -0800 Subject: [PATCH 1/3] update oneauth version and use x64 packages --- Composer/packages/electron-server/scripts/installOneAuth.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Composer/packages/electron-server/scripts/installOneAuth.js b/Composer/packages/electron-server/scripts/installOneAuth.js index 7c18253d38..3e419b4bd5 100644 --- a/Composer/packages/electron-server/scripts/installOneAuth.js +++ b/Composer/packages/electron-server/scripts/installOneAuth.js @@ -21,15 +21,15 @@ const { log } = require('./common'); */ let packageName = null; -const packageVersion = process.env.ONEAUTH_VERSION || '1.36.0'; +const packageVersion = process.env.ONEAUTH_VERSION || '1.43.0'; switch (process.platform) { case 'darwin': - packageName = 'oneauth-mac'; + packageName = process.env.ONEAUTH_PACKAGE_MAC || 'oneauth-mac-x64'; log.info('Mac detected. Using %s package.', packageName); break; case 'win32': - packageName = 'oneauth-win64'; + packageName = process.env.ONEAUTH_PACKAGE_WIN || 'oneauth-win64-x64'; log.info('Windows detected. Using %s package.', packageName); break; default: From d6b6baae1dda63e2d4e994bb260a493d12424ae5 Mon Sep 17 00:00:00 2001 From: Tony Anziano Date: Tue, 4 Jan 2022 14:30:06 -0800 Subject: [PATCH 2/3] Fixed Windows package name --- Composer/packages/electron-server/scripts/installOneAuth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/electron-server/scripts/installOneAuth.js b/Composer/packages/electron-server/scripts/installOneAuth.js index 3e419b4bd5..5272f71ee3 100644 --- a/Composer/packages/electron-server/scripts/installOneAuth.js +++ b/Composer/packages/electron-server/scripts/installOneAuth.js @@ -29,7 +29,7 @@ switch (process.platform) { log.info('Mac detected. Using %s package.', packageName); break; case 'win32': - packageName = process.env.ONEAUTH_PACKAGE_WIN || 'oneauth-win64-x64'; + packageName = process.env.ONEAUTH_PACKAGE_WIN || 'oneauth-win-x64'; log.info('Windows detected. Using %s package.', packageName); break; default: From a11cb86718042aa766e208c8002266dc41dc1bc4 Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 1 Apr 2022 10:16:11 -0700 Subject: [PATCH 3/3] Added missing OneAuth keychain entitlements. --- .../electron-server/resources/entitlements-keychain.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Composer/packages/electron-server/resources/entitlements-keychain.plist b/Composer/packages/electron-server/resources/entitlements-keychain.plist index f5ec040689..4a23a1df1c 100644 --- a/Composer/packages/electron-server/resources/entitlements-keychain.plist +++ b/Composer/packages/electron-server/resources/entitlements-keychain.plist @@ -13,6 +13,8 @@ keychain-access-groups UBF8T346G9.com.microsoft.identity.universalstorage + UBF8T346G9.com.microsoft.oneauth + UBF8T346G9.com.microsoft.adalcache com.apple.application-identifier UBF8T346G9.com.microsoft.botframework.composer