[PM-20035] Remove native-carousel-flow feature flag. (#1521)

Author: andrebispo5

BitwardenShared/Core/Platform/Models/Enum/FeatureFlag.swift

@@ -47,9 +47,6 @@ enum FeatureFlag: String, CaseIterable, Codable {
     /// A feature flag to enable additional error reporting.
     case mobileErrorReporting = "mobile-error-reporting"
 
-    /// A feature flag for the intro carousel flow.
-    case nativeCarouselFlow = "native-carousel-flow"
-
     /// A feature flag for the create account flow.
     case nativeCreateAccountFlow = "native-create-account-flow"
 
@@ -135,7 +132,6 @@ enum FeatureFlag: String, CaseIterable, Codable {
              .emailVerification,
              .enableAuthenticatorSync,
              .importLoginsFlow,
-             .nativeCarouselFlow,
              .nativeCreateAccountFlow,
              .refactorSsoDetailsEndpoint,
              .restrictCipherItemDeletion,

BitwardenShared/Core/Platform/Models/Enum/FeatureFlagTests.swift

@@ -26,7 +26,6 @@ final class FeatureFlagTests: BitwardenTestCase {
         XCTAssertTrue(FeatureFlag.emailVerification.isRemotelyConfigured)
         XCTAssertTrue(FeatureFlag.enableAuthenticatorSync.isRemotelyConfigured)
         XCTAssertTrue(FeatureFlag.importLoginsFlow.isRemotelyConfigured)
-        XCTAssertTrue(FeatureFlag.nativeCarouselFlow.isRemotelyConfigured)
         XCTAssertTrue(FeatureFlag.nativeCreateAccountFlow.isRemotelyConfigured)
         XCTAssertTrue(FeatureFlag.refactorSsoDetailsEndpoint.isRemotelyConfigured)
         XCTAssertTrue(FeatureFlag.restrictCipherItemDeletion.isRemotelyConfigured)

BitwardenShared/Core/Platform/Services/Stores/AppSettingsStoreTests.swift

@@ -418,7 +418,6 @@ class AppSettingsStoreTests: BitwardenTestCase { // swiftlint:disable:this type_
         }
 
         XCTAssertTrue(try XCTUnwrap(subject.debugFeatureFlag(name: FeatureFlag.emailVerification.rawValue)))
-        XCTAssertTrue(try XCTUnwrap(subject.debugFeatureFlag(name: FeatureFlag.nativeCarouselFlow.rawValue)))
         XCTAssertTrue(try XCTUnwrap(subject.debugFeatureFlag(name: FeatureFlag.enableAuthenticatorSync.rawValue)))
         XCTAssertTrue(try XCTUnwrap(subject.debugFeatureFlag(name: FeatureFlag.nativeCreateAccountFlow.rawValue)))
     }

BitwardenShared/UI/Auth/AuthRouterTests.swift

@@ -190,23 +190,10 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
         XCTAssertEqual(errorReporter.errors as? [BitwardenTestError], [.example])
     }
 
-    /// `handleAndRoute(_ :)` redirects `.didCompleteAuth` to `.landing` and doesn't set the
-    /// carousel shown flag if the carousel feature flag is off.
-    func test_handleAndRoute_didCompleteAuth_carouselNotShown() async {
-        authRepository.activeAccount = .fixture()
-        configService.featureFlagsBool[.nativeCarouselFlow] = false
-
-        let route = await subject.handleAndRoute(.didCompleteAuth)
-
-        XCTAssertEqual(route, .complete)
-        XCTAssertFalse(stateService.introCarouselShown)
-    }
-
     /// `handleAndRoute(_ :)` redirects `.didCompleteAuth` to `.landing` and sets the carousel shown
-    /// flag if the carousel feature flag is on and the carousel hasn't been shown yet.
+    /// flag if the carousel hasn't been shown yet.
     func test_handleAndRoute_didCompleteAuth_carouselShown() async {
         authRepository.activeAccount = .fixture()
-        configService.featureFlagsBoolPreAuth[.nativeCarouselFlow] = true
 
         let route = await subject.handleAndRoute(.didCompleteAuth)
 
@@ -215,10 +202,9 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
     }
 
     /// `handleAndRoute(_ :)` redirects `.didCompleteAuth` to `.vaultUnlockSetup` and sets the
-    /// carousel shown flag if the carousel feature flag is on and the carousel hasn't been shown yet.
+    /// carousel shown flag and the carousel hasn't been shown yet.
     func test_handleAndRoute_didCompleteAuth_carouselShown_vaultUnlockSetup() async {
         authRepository.activeAccount = .fixture()
-        configService.featureFlagsBoolPreAuth[.nativeCarouselFlow] = true
         stateService.activeAccount = .fixture()
         stateService.accountSetupVaultUnlock["1"] = .incomplete
 
@@ -956,8 +942,6 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
     /// `handleAndRoute(_ :)` redirects `.didStart` to `.introCarousel` if there's no accounts and
     /// the carousel flow is enabled.
     func test_handleAndRoute_didStart_carouselFlow() async {
-        configService.featureFlagsBoolPreAuth[.nativeCarouselFlow] = true
-
         let route = await subject.handleAndRoute(.didStart)
 
         XCTAssertEqual(route, .introCarousel)
@@ -966,7 +950,6 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
     /// `handleAndRoute(_ :)` redirects `.didStart` to `.landing` if there's no accounts, the
     /// carousel flow is enabled, but the carousel has already been shown.
     func test_handleAndRoute_didStart_carouselFlow_carouselShown() async {
-        configService.featureFlagsBool[.nativeCarouselFlow] = true
         stateService.introCarouselShown = true
 
         let route = await subject.handleAndRoute(.didStart)
@@ -976,8 +959,6 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
 
     /// `handleAndRoute(_ :)` redirects `.didStart` to `.landing` if it's running in an extension.
     func test_handleAndRoute_didStart_carouselFlow_extension() async {
-        configService.featureFlagsBool[.nativeCarouselFlow] = true
-
         subject = AuthRouter(
             isInAppExtension: true,
             services: ServiceContainer.withMocks(
@@ -999,7 +980,6 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
     func test_handleAndRoute_didStart_carouselFlow_existingAccountNeverLock() async {
         let account = Account.fixture()
         authRepository.activeAccount = .fixture()
-        configService.featureFlagsBoolPreAuth[.nativeCarouselFlow] = true
         vaultTimeoutService.vaultTimeout[account.profile.userId] = .never
 
         let route = await subject.handleAndRoute(.didStart)
@@ -1014,7 +994,6 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
     func test_handleAndRoute_didStart_carouselFlow_existingAccountNeverLockOnManuallylocked() async {
         let account = Account.fixture()
         authRepository.activeAccount = .fixture()
-        configService.featureFlagsBoolPreAuth[.nativeCarouselFlow] = true
         vaultTimeoutService.vaultTimeout[account.profile.userId] = .never
         stateService.isAuthenticated[account.profile.userId] = true
         stateService.manuallyLockedAccounts[account.profile.userId] = true
@@ -1047,13 +1026,6 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
         XCTAssertTrue(authRepository.unlockVaultWithNeverlockKeyCalled)
     }
 
-    /// `handleAndRoute(_ :)` redirects `.didStart` to `.landing`
-    ///     when there are no accounts.
-    func test_handleAndRoute_didStart_noAccounts() async {
-        let route = await subject.handleAndRoute(.didStart)
-        XCTAssertEqual(route, .landing)
-    }
-
     /// `handleAndRoute(_ :)` redirects `.didStart` to `.vaultUnlock`
     ///     when the account is set to timeout on app start with a lock vault action.
     func test_handleAndRoute_didStart_timeoutOnAppRestart_lock() async {

BitwardenShared/UI/Auth/Extensions/AuthRouter+Redirects.swift

@@ -229,13 +229,8 @@ extension AuthRouter {
     ///
     func preparedStartRoute() async -> AuthRoute {
         guard let activeAccount = try? await configureActiveAccount(shouldSwitchAutomatically: true) else {
-            // If no account can be set to active, go to the landing or carousel screen.
-            let isCarouselEnabled: Bool = await services.configService.getFeatureFlag(
-                .nativeCarouselFlow,
-                isPreAuth: true
-            )
             let introCarouselShown = await services.stateService.getIntroCarouselShown()
-            let shouldShowCarousel = isCarouselEnabled && !introCarouselShown && !isInAppExtension
+            let shouldShowCarousel = !introCarouselShown && !isInAppExtension
             return shouldShowCarousel ? .introCarousel : .landing
         }
 
@@ -405,9 +400,8 @@ extension AuthRouter {
     /// existing account or once logging in or creating an account is successful.
     ///
     private func setCarouselShownIfEnabled() async {
-        let isCarouselEnabled: Bool = await services.configService.getFeatureFlag(.nativeCarouselFlow, isPreAuth: true)
         let introCarouselShown = await services.stateService.getIntroCarouselShown()
-        if isCarouselEnabled, !introCarouselShown {
+        if !introCarouselShown {
             await services.stateService.setIntroCarouselShown(true)
         }
     }

BitwardenShared/UI/Platform/DebugMenu/DebugMenuViewTests.swift

@@ -88,15 +88,11 @@ class DebugMenuViewTests: BitwardenTestCase {
     @MainActor
     func test_snapshot_debugMenuWithFeatureFlags() {
         processor.state.featureFlags = [
-            .init(
-                feature: .emailVerification,
-                isEnabled: true
-            ),
-            .init(
-                feature: .nativeCarouselFlow,
-                isEnabled: false
-            ),
+            .init(feature: .emailVerification, isEnabled: true),
         ]
-        assertSnapshot(of: subject, as: .defaultPortrait)
+        assertSnapshot(
+            of: subject,
+            as: .defaultPortrait
+        )
     }
 }