Skip to content

Moved Broker strategy and controller classes to common to re purpose them for MSAL CPP broker integration #1115

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

Merged
merged 4 commits into from
Jul 31, 2020
Merged

Moved Broker strategy and controller classes to common to re purpose them for MSAL CPP broker integration #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db4160a
Moved Controller and Broker Strategy classes to common
Jul 30, 2020
bcbf33a
Submodule update
Jul 30, 2020
8967b9f
Merge branch 'dev' into kreedula/move-controllers
Jul 30, 2020
9a2dd73
Updated changelog:
Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki

Version v.Next
----------
- Moved broker controller and strategy classes to common for MSALCPP brokered auth.

Version 1.6.0
-----------
- Introduces new AadAuthorityAudience enum to support new syntax for specifying cloud + audience
Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 10 files
+4 −0 changelog.txt
+39 −0 common/src/main/java/com/microsoft/identity/common/exception/BrokerCommunicationException.java
+385 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerAccountManagerStrategy.java
+120 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerActivity.java
+340 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerAuthServiceStrategy.java
+89 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerBaseStrategy.java
+450 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerContentProviderStrategy.java
+3 −7 common/src/main/java/com/microsoft/identity/common/internal/cache/SharedPreferencesFileManager.java
+645 −0 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+472 −0 common/src/main/java/com/microsoft/identity/common/internal/controllers/LocalMSALController.java
2 changes: 1 addition & 1 deletion msal/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@

<!-- Activity to invoke an interactive request to the intent passed by ad-accounts(Broker) -->
<activity
android:name="com.microsoft.identity.client.internal.controllers.BrokerActivity" />
android:name="com.microsoft.identity.common.internal.broker.BrokerActivity" />
</application>
</manifest>
3 changes: 1 addition & 2 deletions 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 @@ -44,11 +44,10 @@
import com.microsoft.identity.client.exception.MsalClientException;
import com.microsoft.identity.client.exception.MsalDeclinedScopeException;
import com.microsoft.identity.client.exception.MsalException;
import com.microsoft.identity.client.exception.MsalServiceException;
import com.microsoft.identity.client.helper.BrokerHelperActivity;
import com.microsoft.identity.client.internal.AsyncResult;
import com.microsoft.identity.client.internal.CommandParametersAdapter;
import com.microsoft.identity.client.internal.controllers.LocalMSALController;
import com.microsoft.identity.common.internal.controllers.LocalMSALController;
import com.microsoft.identity.client.internal.controllers.MSALControllerFactory;
import com.microsoft.identity.client.internal.controllers.MsalExceptionAdapter;
import com.microsoft.identity.common.adal.internal.cache.IStorageHelper;
Expand Down
42 changes: 0 additions & 42 deletions msal/src/main/java/com/microsoft/identity/client/exception/BrokerCommunicationException.java
View file
Open in desktop

This file was deleted.

Loading