Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make changes to accommodate common#2016 #1805

Merged
merged 5 commits into from
Apr 25, 2023
Merged

Make changes to accommodate common#2016 #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7034b89
wip
rpdome Apr 18, 2023
1a17b56
update common
rpdome Apr 20, 2023
3d356d9
update common
rpdome Apr 21, 2023
623a07f
update common
rpdome Apr 25, 2023
edb5d04
Merge branch 'dev' into rapong/wireDualStack
rpdome Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 32 files
+2 −0 changelog.txt
+8 −9 common/src/androidTest/java/com/microsoft/identity/common/SharedPreferencesFileManagerTests.java
+9 −9 common/src/androidTest/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoaderTest.java
+0 −354 common/src/main/java/com/microsoft/identity/common/AndroidPlatformComponents.java
+1 −1 common/src/main/java/com/microsoft/identity/common/components/AndroidPlatformComponentsFactory.java
+18 −9 common/src/main/java/com/microsoft/identity/common/crypto/AndroidAuthSdkStorageEncryptionManager.java
+0 −175 common/src/main/java/com/microsoft/identity/common/crypto/AndroidBrokerStorageEncryptionManager.java
+27 −117 common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java
+1 −5 common/src/main/java/com/microsoft/identity/common/internal/controllers/LocalMSALController.java
+2 −0 ...osoft/identity/common/internal/ui/webview/certbasedauth/AbstractSmartcardCertBasedAuthChallengeHandler.java
+1 −0 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/certbasedauth/CertBasedAuthFactory.java
+33 −2 .../com/microsoft/identity/common/internal/ui/webview/certbasedauth/OnDeviceCertBasedAuthChallengeHandler.java
+7 −7 common/src/test/java/com/microsoft/identity/common/crypto/AndroidAuthSdkStorageEncryptionManagerTest.java
+0 −173 common/src/test/java/com/microsoft/identity/common/crypto/AndroidBrokerStorageEncryptionManagerTest.java
+0 −35 common/src/test/java/com/microsoft/identity/common/crypto/AndroidBrokerStorageEncryptionManager_OnAuthApp.java
+0 −34 common/src/test/java/com/microsoft/identity/common/crypto/AndroidBrokerStorageEncryptionManager_OnCP.java
+16 −1 ...t/identity/common/internal/ui/webview/certbasedauth/AbstractSmartcardCertBasedAuthChallengeHandlerTest.java
+3 −0 .../java/com/microsoft/identity/common/internal/ui/webview/certbasedauth/TestCertBasedAuthTelemetryHelper.java
+11 −37 common4j/src/main/com/microsoft/identity/common/java/crypto/StorageEncryptionManager.java
+5 −0 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+10 −0 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/CertBasedAuthTelemetryHelper.java
+6 −0 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/ICertBasedAuthTelemetryHelper.java
+5 −5 common4j/src/test/com/microsoft/identity/common/java/crypto/StorageEncryptionManagerTest.java
+1 −0 uiautomationutilities/build.gradle
+191 −0 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/AbstractBrokerHost.java
+2 −2 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/AbstractTestBroker.java
+97 −0 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/BrokerApiFragment.java
+78 −0 ...mationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/BrokerFlightsFragment.java
+63 −393 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/BrokerHost.java
+3 −2 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/ITestBroker.java
+216 −0 ...omationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/SingleWpjApiFragment.java
+12 −0 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/UiAutomatorUtils.java
2 changes: 1 addition & 1 deletion msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2202,7 +2202,7 @@ void performMigration(@NonNull final TokenMigrationCallback callback) {
mPublicClientConfiguration.getAppContext(),
"com.microsoft.aad.adal.cache",
new AndroidAuthSdkStorageEncryptionManager(
mPublicClientConfiguration.getAppContext(), null)
mPublicClientConfiguration.getAppContext())
);

// Load the old TokenCacheItems as key/value JSON
Expand Down
2 changes: 1 addition & 1 deletion msal/src/main/java/com/microsoft/identity/client/SingleAccountPublicClientApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private void initializeSharedPreferenceFileManager(@NonNull final Context contex
sharedPreferencesFileManager = new SharedPreferencesFileManager(
context,
SINGLE_ACCOUNT_CREDENTIAL_SHARED_PREFERENCES,
new AndroidAuthSdkStorageEncryptionManager(context, null)
new AndroidAuthSdkStorageEncryptionManager(context)
);
}

Expand Down