diff --git a/changelog.txt b/changelog.txt index 207824765b..36e175b66f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,6 @@ V.Next ---------- +- [MAJOR] Rename LobalBroadcasterAliases to LocalBroadcasterAliases (#1584) - [PATCH] Make it clear if adding a query param should overwrite or leave as is (#1581) - [PATCH] Handle the scenario where broker activity is killed wrongly. (#1568) - [MINOR] Add GetOsForMats to IDeviceMetadata (#1552) diff --git a/common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerActivity.java b/common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerActivity.java index 834ca17ec9..58d7eb5fd6 100644 --- a/common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerActivity.java +++ b/common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerActivity.java @@ -36,7 +36,7 @@ import com.microsoft.identity.common.java.util.ported.LocalBroadcaster; import com.microsoft.identity.common.logging.Logger; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.RETURN_BROKER_INTERACTIVE_ACQUIRE_TOKEN_RESULT; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.RETURN_BROKER_INTERACTIVE_ACQUIRE_TOKEN_RESULT; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.REQUEST_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.RESULT_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.UIRequest.BROKER_FLOW; diff --git a/common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java b/common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java index 63ec4d05ab..b51e2c364b 100644 --- a/common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java +++ b/common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java @@ -36,7 +36,7 @@ import static com.microsoft.identity.common.internal.broker.ipc.BrokerOperationBundle.Operation.MSAL_SIGN_OUT_FROM_SHARED_DEVICE; import static com.microsoft.identity.common.internal.broker.ipc.BrokerOperationBundle.Operation.MSAL_SSO_TOKEN; import static com.microsoft.identity.common.internal.controllers.BrokerOperationExecutor.BrokerOperation; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.RETURN_BROKER_INTERACTIVE_ACQUIRE_TOKEN_RESULT; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.RETURN_BROKER_INTERACTIVE_ACQUIRE_TOKEN_RESULT; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.REQUEST_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.RESULT_CODE; diff --git a/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationFragment.java b/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationFragment.java index 5532b666d4..15c5feb8f8 100644 --- a/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationFragment.java +++ b/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationFragment.java @@ -40,8 +40,8 @@ import com.microsoft.identity.common.logging.DiagnosticContext; import com.microsoft.identity.common.logging.Logger; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.CANCEL_AUTHORIZATION_REQUEST; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.RETURN_AUTHORIZATION_REQUEST_RESULT; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.CANCEL_AUTHORIZATION_REQUEST; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.RETURN_AUTHORIZATION_REQUEST_RESULT; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.REQUEST_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.UIRequest.BROWSER_FLOW; diff --git a/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationFragment.java b/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationFragment.java index 0be31dfa59..f8af154a9b 100644 --- a/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationFragment.java +++ b/common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationFragment.java @@ -41,8 +41,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.CANCEL_AUTHORIZATION_REQUEST; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.RETURN_AUTHORIZATION_REQUEST_RESULT; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.CANCEL_AUTHORIZATION_REQUEST; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.RETURN_AUTHORIZATION_REQUEST_RESULT; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.REQUEST_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.UIRequest.BROWSER_FLOW; diff --git a/common4j/src/main/com/microsoft/identity/common/java/AuthenticationConstants.java b/common4j/src/main/com/microsoft/identity/common/java/AuthenticationConstants.java index f6e2e60bc3..9b230d7ec4 100644 --- a/common4j/src/main/com/microsoft/identity/common/java/AuthenticationConstants.java +++ b/common4j/src/main/com/microsoft/identity/common/java/AuthenticationConstants.java @@ -622,7 +622,7 @@ public static final class SdkPlatformFields { * Aliases for broadcasting events * to be used with {@link LocalBroadcaster} */ - public static final class LobalBroadcasterAliases { + public static final class LocalBroadcasterAliases { /** * an alias specifying that the current authorization action should be cancelled. @@ -630,7 +630,7 @@ public static final class LobalBroadcasterAliases { public static final String CANCEL_AUTHORIZATION_REQUEST = "cancel_authorization_request"; /** - * an alias that the intent contains authorization results. + * An alias that the intent contains authorization results, was formerly RETURN_INTERACTIVE_REQUEST_RESULT. */ public static final String RETURN_AUTHORIZATION_REQUEST_RESULT = "return_authorization_request_result"; diff --git a/common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java b/common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java index e2d45c99d7..3ff0a776dd 100644 --- a/common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java +++ b/common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java @@ -22,8 +22,8 @@ // THE SOFTWARE. package com.microsoft.identity.common.java.controllers; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.CANCEL_AUTHORIZATION_REQUEST; -import static com.microsoft.identity.common.java.AuthenticationConstants.LobalBroadcasterAliases.RETURN_AUTHORIZATION_REQUEST_RESULT; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.CANCEL_AUTHORIZATION_REQUEST; +import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterAliases.RETURN_AUTHORIZATION_REQUEST_RESULT; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.REQUEST_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.LocalBroadcasterFields.RESULT_CODE; import static com.microsoft.identity.common.java.AuthenticationConstants.SdkPlatformFields.PRODUCT;