Merge branch 'main' into cmcg/pm-19305-vault-timeout-policy

Author: LRNcardozoWDF

.github/workflows/ci-bwa.yml

@@ -42,12 +42,11 @@ on:
         type: boolean
         default: true
       xcode-version:
-          description: "Xcode Version Override - e.g. '15.2'"
-          type: string
+        description: "Xcode Version Override - e.g. '15.2'"
+        type: string
 
 permissions:
   contents: read
-  id-token: write
 
 jobs:
   version:
@@ -64,6 +63,8 @@ jobs:
   build-manual:
     name: Build Manual - ${{ inputs.build-mode }}
     needs: version
+    permissions:
+      id-token: write
     if: ${{ github.event_name == 'workflow_dispatch' && inputs.build-mode != 'CI' }}
     uses: bitwarden/ios/.github/workflows/_build-any.yml@main
     with:
@@ -79,6 +80,8 @@ jobs:
   build-public:
     name: Build CI
     needs: version
+    permissions:
+      id-token: write
     if: ${{ github.event_name == 'push' || inputs.build-mode == 'CI' }}
     uses: bitwarden/ios/.github/workflows/_build-any.yml@main
     strategy:

.github/workflows/ci-bwpm.yml

@@ -45,12 +45,11 @@ on:
         type: boolean
         default: true
       xcode-version:
-          description: "Xcode Version Override - e.g. '15.2'"
-          type: string
+        description: "Xcode Version Override - e.g. '15.2'"
+        type: string
 
 permissions:
   contents: read
-  id-token: write
 
 jobs:
   version:
@@ -67,6 +66,8 @@ jobs:
   build-manual:
     name: Build Manual - ${{ inputs.build-variant }} (${{ inputs.build-mode }})
     needs: version
+    permissions:
+      id-token: write
     if: ${{ github.event_name == 'workflow_dispatch' && inputs.build-mode != 'CI' }}
     uses: bitwarden/ios/.github/workflows/_build-any.yml@main
     with:
@@ -82,6 +83,8 @@ jobs:
   build-public:
     name: Build CI
     needs: version
+    permissions:
+      id-token: write
     if: ${{ github.event_name == 'push' || inputs.build-mode == 'CI' }}
     uses: bitwarden/ios/.github/workflows/_build-any.yml@main
     strategy:

AuthenticatorShared/Core/Platform/Models/Enum/LanguageOption.swift

@@ -19,6 +19,9 @@ enum BitwardenError {
 
         /// An error occurred with data from the API.
         case dataError = 3000
+
+        /// A general-purpose error.
+        case generalError = 4000
     }
 
     // MARK: Errors
@@ -37,6 +40,25 @@ enum BitwardenError {
         )
     }
 
+    /// A general-purpose error.
+    ///
+    /// - Parameters:
+    ///   - type: The type of error. This is used to group the errors in the Crashlytics dashboard.
+    ///   - message: A message describing the error that occurred.
+    ///   - error: An optional underlying error that caused the error.
+    ///
+    static func generalError(type: String, message: String, error: Error? = nil) -> NSError {
+        var userInfo: [String: Any] = ["ErrorMessage": message]
+        if let error {
+            userInfo[NSUnderlyingErrorKey] = error
+        }
+        return NSError(
+            domain: "General Error: \(type)",
+            code: Code.generalError.rawValue,
+            userInfo: userInfo,
+        )
+    }
+
     /// An error that occurred persisting the generator options.
     ///
     /// - Parameter error: The underlying error that caused the logout error.

AuthenticatorShared/Core/Platform/Models/Enum/LanguageOptionTests.swift

@@ -47,6 +47,9 @@ public class ServiceContainer: Services {
     /// The service used by the application to encrypt and decrypt items
     let cryptographyService: CryptographyService
 
+    /// A helper for building an error report containing the details of an error that occurred.
+    public let errorReportBuilder: ErrorReportBuilder
+
     /// The service used by the application to report non-fatal errors.
     public let errorReporter: ErrorReporter
 
@@ -93,6 +96,8 @@ public class ServiceContainer: Services {
     ///   - clientService: The service used by the application to handle encryption and decryption tasks.
     ///   - configService: The service to get locally-specified configuration.
     ///   - cryptographyService: The service used by the application to encrypt and decrypt items
+    ///   - errorReportBuilder: A helper for building an error report containing the details of an
+    ///     error that occurred.
     ///   - errorReporter: The service used by the application to report non-fatal errors.
     ///   - exportItemsService: The service to export items.
     ///   - importItemsService: The service to import items.
@@ -115,6 +120,7 @@ public class ServiceContainer: Services {
         clientService: ClientService,
         configService: ConfigService,
         cryptographyService: CryptographyService,
+        errorReportBuilder: ErrorReportBuilder,
         errorReporter: ErrorReporter,
         exportItemsService: ExportItemsService,
         importItemsService: ImportItemsService,
@@ -136,6 +142,7 @@ public class ServiceContainer: Services {
         self.clientService = clientService
         self.configService = configService
         self.cryptographyService = cryptographyService
+        self.errorReportBuilder = errorReportBuilder
         self.errorReporter = errorReporter
         self.exportItemsService = exportItemsService
         self.importItemsService = importItemsService
@@ -186,6 +193,11 @@ public class ServiceContainer: Services {
             environmentService: environmentService,
         )
 
+        let errorReportBuilder = DefaultErrorReportBuilder(
+            activeAccountStateProvider: stateService,
+            appInfoService: appInfoService,
+        )
+
         let timeProvider = CurrentTime()
         let totpExpirationManagerFactory = DefaultTOTPExpirationManagerFactory(timeProvider: timeProvider)
 
@@ -305,6 +317,7 @@ public class ServiceContainer: Services {
             clientService: clientService,
             configService: configService,
             cryptographyService: cryptographyService,
+            errorReportBuilder: errorReportBuilder,
             errorReporter: errorReporter,
             exportItemsService: exportItemsService,
             importItemsService: importItemsService,

AuthenticatorShared/Core/Platform/Services/ErrorReporter/BitwardenError.swift

@@ -10,6 +10,7 @@ typealias Services = HasAppInfoService
     & HasCameraService
     & HasConfigService
     & HasCryptographyService
+    & HasErrorReportBuilder
     & HasErrorReporter
     & HasExportItemsService
     & HasImportItemsService

AuthenticatorShared/Core/Platform/Services/ServiceContainer.swift

@@ -17,6 +17,7 @@ extension ServiceContainer {
         clientService: ClientService = MockClientService(),
         configService: ConfigService = MockConfigService(),
         cryptographyService: CryptographyService = MockCryptographyService(),
+        errorReportBuilder: ErrorReportBuilder = MockErrorReportBuilder(),
         errorReporter: ErrorReporter = MockErrorReporter(),
         exportItemsService: ExportItemsService = MockExportItemsService(),
         importItemsService: ImportItemsService = MockImportItemsService(),
@@ -39,6 +40,7 @@ extension ServiceContainer {
             clientService: clientService,
             configService: configService,
             cryptographyService: cryptographyService,
+            errorReportBuilder: errorReportBuilder,
             errorReporter: errorReporter,
             exportItemsService: exportItemsService,
             importItemsService: importItemsService,

AuthenticatorShared/Core/Platform/Services/Services.swift

@@ -23,6 +23,7 @@ final class AuthCoordinator: NSObject, Coordinator, HasStackNavigator, HasRouter
     typealias Router = AnyRouter<AuthEvent, AuthRoute>
 
     typealias Services = HasBiometricsRepository
+        & HasErrorAlertServices.ErrorAlertServices
         & HasErrorReporter
 
     // MARK: Properties
@@ -111,3 +112,9 @@ final class AuthCoordinator: NSObject, Coordinator, HasStackNavigator, HasRouter
         stackNavigator?.replace(view, animated: true)
     }
 }
+
+// MARK: - HasErrorAlertServices
+
+extension AuthCoordinator: HasErrorAlertServices {
+    var errorAlertServices: ErrorAlertServices { services }
+}