Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ interface IIpcStrategy {
enum class Type(val value: String) {
BOUND_SERVICE("bound_service"),
ACCOUNT_MANAGER_ADD_ACCOUNT("account_manager_add_account"),
CONTENT_PROVIDER("content_provider"),
LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API("legacy_account_authenticator_for_wpj_api");
CONTENT_PROVIDER("content_provider");

override fun toString(): String {
return value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static com.microsoft.identity.common.internal.broker.ipc.BrokerOperationBundle.Operation.DEVICE_REGISTRATION_OPERATIONS;
import static com.microsoft.identity.common.internal.broker.ipc.IIpcStrategy.Type.BOUND_SERVICE;
import static com.microsoft.identity.common.internal.broker.ipc.IIpcStrategy.Type.CONTENT_PROVIDER;
import static com.microsoft.identity.common.internal.broker.ipc.IIpcStrategy.Type.LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API;
import static com.microsoft.identity.common.java.exception.ClientException.INVALID_BROKER_BUNDLE;

import android.content.Context;
Expand Down Expand Up @@ -234,8 +233,6 @@ private void setIpcStrategyTelemetryAttributes(
attributeName = AttributeName.content_provider_status.name();
} else if (BOUND_SERVICE.equals(strategyType)) {
attributeName = AttributeName.bound_service_status.name();
} else if (LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API.equals(strategyType)) {
attributeName = AttributeName.legacy_account_manager_status.name();
} else {
attributeName = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import com.microsoft.identity.common.logging.Logger
* Provides IPC strategies for device registration communication.
*
* Default implementation supplies ContentProvider + BoundService strategies.
* Broker subclass overrides [getStrategies] to add WpjLegacyAccountAuthenticatorStrategy.
* Broker subclass overrides [getStrategies] to add additional strategies.
*
* @param supportsBoundService whether to include the BoundService IPC strategy.
*/
Expand All @@ -50,8 +50,6 @@ open class DeviceRegistrationIpcStrategiesProvider @JvmOverloads constructor(
* Returns the list of IPC strategies to use for device registration.
* Default: ContentProvider + BoundService (if supported).
*
* Broker overrides this to append legacy strategy after calling super.
*
* @param context application context.
* @param components platform components for the active broker.
* @param activeBrokerPackageName package name of the active broker.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ class IpcStrategyWithBackupTests {
shouldThrowException = true),
MockIpc(type = IIpcStrategy.Type.BOUND_SERVICE,
shouldThrowException = true),
MockIpc(type = IIpcStrategy.Type.LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API,
shouldThrowException = true),
)
)

Expand All @@ -93,7 +91,7 @@ class IpcStrategyWithBackupTests {
backup = listOf(
MockIpc(type = IIpcStrategy.Type.ACCOUNT_MANAGER_ADD_ACCOUNT,
shouldThrowException = true),
MockIpc(type = IIpcStrategy.Type.LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API,
MockIpc(type = IIpcStrategy.Type.BOUND_SERVICE,
shouldThrowException = true),
)
)
Expand All @@ -111,7 +109,6 @@ class IpcStrategyWithBackupTests {
MockIpc(type = IIpcStrategy.Type.ACCOUNT_MANAGER_ADD_ACCOUNT,
shouldThrowException = true),
MockIpc(type = IIpcStrategy.Type.BOUND_SERVICE),
MockIpc(type = IIpcStrategy.Type.LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API),
)
)

Expand Down Expand Up @@ -144,8 +141,6 @@ class IpcStrategyWithBackupTests {
shouldThrowException = true),
MockIpc(type = IIpcStrategy.Type.BOUND_SERVICE,
shouldThrowException = true),
MockIpc(type = IIpcStrategy.Type.LEGACY_ACCOUNT_AUTHENTICATOR_FOR_WPJ_API,
shouldThrowException = true),
)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -645,11 +645,6 @@ public enum AttributeName {
*/
bound_service_status,

/**
* Indicates the status of Legacy Account Manager IPC strategy for device registration.
*/
legacy_account_manager_status,

/**
* Indicates the name of the device registration protocol being executed.
*/
Expand Down
Loading