[PM-19644] Remove two factor notice.

Author: andrebispo5

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

@@ -56,15 +56,6 @@ enum FeatureFlag: String, CaseIterable, Codable {
     /// A feature flag for the create account flow.
     case nativeCreateAccountFlow = "native-create-account-flow"
 
-    /// A feature flag for the notice indicating a user does not have two-factor authentication set up.
-    /// If true, the user can dismiss the notice temporarily.
-    case newDeviceVerificationTemporaryDismiss = "new-device-temporary-dismiss"
-
-    /// A feature flag for the notice indicating a user does not have two-factor authentication set up.
-    /// If true, the user can not dismiss the notice, and must set up two-factor authentication.
-    /// Overrides the temporary flag.
-    case newDeviceVerificationPermanentDismiss = "new-device-permanent-dismiss"
-
     /// A feature flag for the refactor on the SSO details endpoint.
     case refactorSsoDetailsEndpoint = "pm-12337-refactor-sso-details-endpoint"
 
@@ -128,8 +119,6 @@ enum FeatureFlag: String, CaseIterable, Codable {
              .flightRecorder,
              .ignore2FANoticeEnvironmentCheck,
              .mobileErrorReporting,
-             .newDeviceVerificationPermanentDismiss,
-             .newDeviceVerificationTemporaryDismiss,
              .testLocalFeatureFlag,
              .testLocalInitialBoolFlag,
              .testLocalInitialIntFlag,

BitwardenShared/Core/Platform/Services/StateService.swift

@@ -328,14 +328,6 @@ protocol StateService: AnyObject {
     ///
     func getTimeoutAction(userId: String?) async throws -> SessionTimeoutAction
 
-    /// Gets the display state of the no-two-factor notice for a user ID.
-    ///
-    /// - Parameters:
-    ///   - userId: The user ID for the account; defaults to current active user if `nil`.
-    /// - Returns: The display state.
-    ///
-    func getTwoFactorNoticeDisplayState(userId: String?) async throws -> TwoFactorNoticeDisplayState
-
     /// Get the two-factor token (non-nil if the user selected the "remember me" option).
     ///
     /// - Parameter email: The user's email address.
@@ -691,14 +683,6 @@ protocol StateService: AnyObject {
     ///
     func setTimeoutAction(action: SessionTimeoutAction, userId: String?) async throws
 
-    /// Sets the user's no-two-factor notice display state for a userID.
-    ///
-    /// - Parameters:
-    ///   - state: The display state to set.
-    ///   - userId: The user ID associated with the state
-    ///
-    func setTwoFactorNoticeDisplayState(_ state: TwoFactorNoticeDisplayState, userId: String?) async throws
-
     /// Sets the user's two-factor token.
     ///
     /// - Parameters:
@@ -1004,14 +988,6 @@ extension StateService {
         try await getTimeoutAction(userId: nil)
     }
 
-    /// Gets the display state of the no-two-factor notice for the current user.
-    ///
-    /// - Returns: The display state.
-    ///
-    func getTwoFactorNoticeDisplayState() async throws -> TwoFactorNoticeDisplayState {
-        try await getTwoFactorNoticeDisplayState(userId: nil)
-    }
-
     /// Sets the number of unsuccessful attempts to unlock the vault for the active account.
     ///
     /// - Returns: The number of unsuccessful unlock attempts for the active account.
@@ -1240,15 +1216,6 @@ extension StateService {
         try await setSyncToAuthenticator(syncToAuthenticator, userId: nil)
     }
 
-    /// Sets the display state for the no-two-factor notice
-    ///
-    /// - Parameters:
-    ///   - state: The state to set.
-    ///
-    func setTwoFactorNoticeDisplayState(state: TwoFactorNoticeDisplayState) async throws {
-        try await setTwoFactorNoticeDisplayState(state, userId: nil)
-    }
-
     /// Sets the session timeout action.
     ///
     /// - Parameter action: The action to take when the user's session times out.
@@ -1652,11 +1619,6 @@ actor DefaultStateService: StateService { // swiftlint:disable:this type_body_le
         return timeoutAction
     }
 
-    func getTwoFactorNoticeDisplayState(userId: String?) async throws -> TwoFactorNoticeDisplayState {
-        let userId = try userId ?? getActiveAccountUserId()
-        return appSettingsStore.twoFactorNoticeDisplayState(userId: userId)
-    }
-
     func getTwoFactorToken(email: String) async -> String? {
         appSettingsStore.twoFactorToken(email: email)
     }
@@ -1961,11 +1923,6 @@ actor DefaultStateService: StateService { // swiftlint:disable:this type_body_le
         appSettingsStore.setTimeoutAction(key: action, userId: userId)
     }
 
-    func setTwoFactorNoticeDisplayState(_ state: TwoFactorNoticeDisplayState, userId: String?) async throws {
-        let userId = try userId ?? getActiveAccountUserId()
-        appSettingsStore.setTwoFactorNoticeDisplayState(state, userId: userId)
-    }
-
     func setTwoFactorToken(_ token: String?, email: String) async {
         appSettingsStore.setTwoFactorToken(token, email: email)
     }

BitwardenShared/Core/Platform/Services/StateServiceTests.swift

@@ -930,24 +930,6 @@ class StateServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body
         XCTAssertEqual(action, .logout)
     }
 
-    /// `getTwoFactorNoticeDisplayState(userId:)` gets the display state of the two-factor notice for the user.
-    func test_getTwoFactorNoticeDisplayState() async throws {
-        appSettingsStore.setTwoFactorNoticeDisplayState(.canAccessEmail, userId: "person@example.com")
-
-        let value = try await subject.getTwoFactorNoticeDisplayState(userId: "person@example.com")
-        XCTAssertEqual(value, .canAccessEmail)
-    }
-
-    /// `getTwoFactorNoticeDisplayState()` gets the display state of the two-factor notice for the current user
-    /// and throws an error if there is no current user.
-    func test_getTwoFactorNoticeDisplayState_noId() async throws {
-        appSettingsStore.setTwoFactorNoticeDisplayState(.canAccessEmail, userId: "1")
-
-        await assertAsyncThrows(error: StateServiceError.noActiveAccount) {
-            _ = try await subject.getTwoFactorNoticeDisplayState()
-        }
-    }
-
     /// `getTwoFactorToken(email:)` gets the two-factor code associated with the email.
     func test_getTwoFactorToken() async {
         appSettingsStore.setTwoFactorToken("yay_you_win!", email: "winner@email.com")
@@ -2052,12 +2034,6 @@ class StateServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body
         }
     }
 
-    /// `setTwoFactorNoticeDisplayState(_:userId:)` sets the display state of the two-factor notice for the user.
-    func test_setTwoFactorNoticeDisplayState() async throws {
-        try await subject.setTwoFactorNoticeDisplayState(.hasNotSeen, userId: "person1@example.com")
-        XCTAssertEqual(appSettingsStore.twoFactorNoticeDisplayState(userId: "person1@example.com"), .hasNotSeen)
-    }
-
     /// `setTwoFactorToken(_:email:)` sets the two-factor code for the email.
     func test_setTwoFactorToken() async {
         await subject.setTwoFactorToken("yay_you_win!", email: "winner@email.com")

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

@@ -475,14 +475,6 @@ protocol AppSettingsStore: AnyObject {
     ///
     func setTimeoutAction(key: SessionTimeoutAction, userId: String)
 
-    /// Sets the display state for the two-factor notice.
-    ///
-    /// - Parameters:
-    ///   - state: The display state.
-    ///   - userId: The userID associated with the state.
-    ///
-    func setTwoFactorNoticeDisplayState(_ state: TwoFactorNoticeDisplayState, userId: String)
-
     /// Sets the two-factor token.
     ///
     /// - Parameters:
@@ -544,14 +536,6 @@ protocol AppSettingsStore: AnyObject {
     ///
     func timeoutAction(userId: String) -> Int?
 
-    /// Get the display state of the no-two-factor notice for a user ID.
-    ///
-    /// - Parameters:
-    ///   - userId: The user ID associated with the state.
-    /// - Returns: The state for the user ID.
-    ///
-    func twoFactorNoticeDisplayState(userId: String) -> TwoFactorNoticeDisplayState
-
     /// Get the two-factor token associated with a user's email.
     ///
     /// - Parameter email: The user's email.
@@ -755,7 +739,6 @@ extension DefaultAppSettingsStore: AppSettingsStore {
         case shouldTrustDevice(userId: String)
         case syncToAuthenticator(userId: String)
         case state
-        case twoFactorNoticeDisplayState(userId: String)
         case twoFactorToken(email: String)
         case unsuccessfulUnlockAttempts(userId: String)
         case usernameGenerationOptions(userId: String)
@@ -855,8 +838,6 @@ extension DefaultAppSettingsStore: AppSettingsStore {
                 key = "state"
             case let .syncToAuthenticator(userId):
                 key = "shouldSyncToAuthenticator_\(userId)"
-            case let .twoFactorNoticeDisplayState(userId):
-                key = "twoFactorNoticeDisplayState_\(userId)"
             case let .twoFactorToken(email):
                 key = "twoFactorToken_\(email)"
             case let .unsuccessfulUnlockAttempts(userId):
@@ -1184,10 +1165,6 @@ extension DefaultAppSettingsStore: AppSettingsStore {
         store(key, for: .vaultTimeoutAction(userId: userId))
     }
 
-    func setTwoFactorNoticeDisplayState(_ state: TwoFactorNoticeDisplayState, userId: String) {
-        store(state, for: .twoFactorNoticeDisplayState(userId: userId))
-    }
-
     func setTwoFactorToken(_ token: String?, email: String) {
         store(token, for: .twoFactorToken(email: email))
     }
@@ -1212,10 +1189,6 @@ extension DefaultAppSettingsStore: AppSettingsStore {
         fetch(for: .vaultTimeoutAction(userId: userId))
     }
 
-    func twoFactorNoticeDisplayState(userId: String) -> TwoFactorNoticeDisplayState {
-        fetch(for: .twoFactorNoticeDisplayState(userId: userId)) ?? .hasNotSeen
-    }
-
     func twoFactorToken(email: String) -> String? {
         fetch(for: .twoFactorToken(email: email))
     }

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

@@ -930,21 +930,6 @@ class AppSettingsStoreTests: BitwardenTestCase { // swiftlint:disable:this type_
         XCTAssertFalse(userDefaults.bool(forKey: "bwPreferencesStorage:shouldSyncToAuthenticator_2"))
     }
 
-    /// `twoFactorNoticeDisplayState(userId:)` returns `.hasNotSeen` if there isn't a previously stored value.
-    func test_twoFactorNoticeDisplayState_isInitiallyNotSeen() {
-        XCTAssertEqual(subject.twoFactorNoticeDisplayState(userId: "anyone@example.com"), .hasNotSeen)
-    }
-
-    /// `twoFactorToken(email:)` can be used to get and set the persisted value in user defaults.
-    func test_twoFactorNoticeDisplayState_withValue() {
-        let date = Date()
-        subject.setTwoFactorNoticeDisplayState(.canAccessEmail, userId: "person1@example.com")
-        subject.setTwoFactorNoticeDisplayState(.seen(date), userId: "person2@example.com")
-
-        XCTAssertEqual(subject.twoFactorNoticeDisplayState(userId: "person1@example.com"), .canAccessEmail)
-        XCTAssertEqual(subject.twoFactorNoticeDisplayState(userId: "person2@example.com"), .seen(date))
-    }
-
     /// `twoFactorToken(email:)` returns `nil` if there isn't a previously stored value.
     func test_twoFactorToken_isInitiallyNil() {
         XCTAssertNil(subject.twoFactorToken(email: "anything@email.com"))

BitwardenShared/Core/Platform/Services/Stores/TestHelpers/MockAppSettingsStore.swift

@@ -52,7 +52,6 @@ class MockAppSettingsStore: AppSettingsStore { // swiftlint:disable:this type_bo
     var shouldTrustDevice = [String: Bool?]()
     var syncToAuthenticatorByUserId = [String: Bool]()
     var timeoutAction = [String: Int]()
-    var twoFactorNoticeDisplayState = [String: TwoFactorNoticeDisplayState]()
     var twoFactorTokens = [String: String]()
     var usesKeyConnector = [String: Bool]()
     var vaultTimeout = [String: Int]()
@@ -296,14 +295,6 @@ class MockAppSettingsStore: AppSettingsStore { // swiftlint:disable:this type_bo
         timeoutAction[userId] = key.rawValue
     }
 
-    func setTwoFactorNoticeDisplayState(_ state: TwoFactorNoticeDisplayState, userId: String) {
-        twoFactorNoticeDisplayState[userId] = state
-    }
-
-    func twoFactorNoticeDisplayState(userId: String) -> TwoFactorNoticeDisplayState {
-        twoFactorNoticeDisplayState[userId] ?? .hasNotSeen
-    }
-
     func setTwoFactorToken(_ token: String?, email: String) {
         twoFactorTokens[email] = token
     }

BitwardenShared/Core/Platform/Services/TestHelpers/MockStateService.swift

@@ -80,14 +80,11 @@ class MockStateService: StateService { // swiftlint:disable:this type_body_lengt
     var setAppRehydrationStateError: Error?
     var setBiometricAuthenticationEnabledResult: Result<Void, Error> = .success(())
     var setBiometricIntegrityStateError: Error?
-    var setTwoFactorNoticeDisplayStateError: Error?
     var settingsBadgeSubject = CurrentValueSubject<SettingsBadgeState, Never>(.fixture())
     var shouldTrustDevice = [String: Bool?]()
     var syncToAuthenticatorByUserId = [String: Bool]()
     var syncToAuthenticatorResult: Result<Void, Error> = .success(())
     var syncToAuthenticatorSubject = CurrentValueSubject<(String?, Bool), Never>((nil, false))
-    var twoFactorNoticeDisplayState = [String: TwoFactorNoticeDisplayState]()
-    var twoFactorNoticeDisplayStateError: Error?
     var twoFactorTokens = [String: String]()
     var unsuccessfulUnlockAttempts = [String: Int]()
     var updateProfileResponse: ProfileResponseModel?
@@ -349,14 +346,6 @@ class MockStateService: StateService { // swiftlint:disable:this type_body_lengt
         return timeoutAction[userId] ?? .lock
     }
 
-    func getTwoFactorNoticeDisplayState(userId: String?) async throws -> TwoFactorNoticeDisplayState {
-        if let error = twoFactorNoticeDisplayStateError {
-            throw error
-        }
-        let userId = try unwrapUserId(userId)
-        return twoFactorNoticeDisplayState[userId] ?? .hasNotSeen
-    }
-
     func getTwoFactorToken(email: String) async -> String? {
         twoFactorTokens[email]
     }
@@ -650,14 +639,6 @@ class MockStateService: StateService { // swiftlint:disable:this type_body_lengt
         accountTokens = Account.AccountTokens(accessToken: accessToken, refreshToken: refreshToken)
     }
 
-    func setTwoFactorNoticeDisplayState(_ state: TwoFactorNoticeDisplayState, userId: String?) async throws {
-        if let error = setTwoFactorNoticeDisplayStateError {
-            throw error
-        }
-        let userId = try unwrapUserId(userId)
-        twoFactorNoticeDisplayState[userId] = state
-    }
-
     func setTwoFactorToken(_ token: String?, email: String) async {
         twoFactorTokens[email] = token
     }

BitwardenShared/Core/Platform/Utilities/Constants.swift

@@ -84,14 +84,6 @@ extension Constants {
 
     /// The default number of KDF iterations to perform.
     static let pbkdf2Iterations = 600_000
-
-    /// The minimum number of seconds an account must have existed for before
-    /// we display the two-factor notice.
-    static let twoFactorNoticeMinimumAccountAgeInterval: TimeInterval = 86400 * 7 // Seven days
-
-    /// The minimum number of seconds after a user delays the two-factor notice
-    /// before we display the notice again.
-    static let twoFactorNoticeDelayInterval: TimeInterval = 86400 * 7 // Seven days
 }
 
 // MARK: Extension Constants