Skip to content

Commit 2163095

Browse files
committed
Revert "chore: remove code from WireDomain package - WPB-14598 (#2945)"
This reverts commit 824f9c2. # Conflicts: # WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTest.swift # wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportBackupFileArchiver.swift # wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift # wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/SessionManager+importBackupUseCase.swift # wire-ios-sync-engine/Support/Sourcery/generated/AutoMockable.generated.swift # wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift
1 parent 27949c6 commit 2163095

File tree

75 files changed

+133
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+133
-381
lines changed

WireAPI/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
"identifier" : "WireAPITests",
2323
"name" : "WireAPITests"
2424
},
25-
"testExecutionOrdering" : "random",
26-
"threadSanitizerEnabled" : true,
27-
"undefinedBehaviorSanitizerEnabled" : true
25+
"testExecutionOrdering" : "random"
2826
},
2927
"testTargets" : [
3028
{

WireAnalytics/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
"identifier" : "WireAnalyticsTests",
2323
"name" : "WireAnalyticsTests"
2424
},
25-
"testExecutionOrdering" : "random",
26-
"threadSanitizerEnabled" : true,
27-
"undefinedBehaviorSanitizerEnabled" : true
25+
"testExecutionOrdering" : "random"
2826
},
2927
"testTargets" : [
3028
{

WireAuthentication/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12-
"threadSanitizerEnabled" : true,
13-
"undefinedBehaviorSanitizerEnabled" : true
12+
1413
},
1514
"testTargets" : [
1615
{

WireCells/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"defaultOptions" : {
1212
"language" : "en",
1313
"region" : "DE",
14-
"testExecutionOrdering" : "random",
15-
"threadSanitizerEnabled" : true,
16-
"undefinedBehaviorSanitizerEnabled" : true
14+
"testExecutionOrdering" : "random"
1715
},
1816
"testTargets" : [
1917
{

WireConversations/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"defaultOptions" : {
1212
"language" : "en",
1313
"region" : "DE",
14-
"testExecutionOrdering" : "random",
15-
"threadSanitizerEnabled" : true,
16-
"undefinedBehaviorSanitizerEnabled" : true
14+
"testExecutionOrdering" : "random"
1715
},
1816
"testTargets" : [
1917
{

WireDebug/Package.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ let package = Package(
1414
dependencies: [
1515
.package(name: "WireAuthentication", path: "../WireAuthentication"),
1616
.package(name: "WireCells", path: "../WireCells"),
17+
.package(name: "WireDomainPackage", path: "../WireDomain"),
1718
.package(name: "WireFoundation", path: "../WireFoundation"),
1819
.package(path: "../WireUI")
1920
],
@@ -25,6 +26,7 @@ let package = Package(
2526
dependencies: [
2627
.product(name: "WireAuthenticationUI", package: "WireAuthentication"),
2728
.product(name: "WireCellsUI", package: "WireCells"),
29+
.product(name: "WireDomainPackage", package: "WireDomainPackage"),
2830
"WireFoundation",
2931
.product(name: "WireReusableUIComponents", package: "WireUI")
3032
]

WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigration/IndividualToTeamMigrationError.swift

Lines changed: 0 additions & 1 deletion
This file was deleted.

WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigration/IndividualToTeamMigrationResult.swift

Lines changed: 0 additions & 1 deletion
This file was deleted.

WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigration/IndividualToTeamMigrationUseCaseProtocol.swift

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import Foundation
2020
import WireAPI
2121
import WireDataModel
22+
import WireDomainPackage
2223
import WireLogging
2324
import WireSystem
2425

WireDomain/Sources/WireDomainPackage/Placeholder.swift

Lines changed: 0 additions & 17 deletions
This file was deleted.

WireUI/Sources/WireIndividualToTeamMigrationUI/UseCases/IndividualToTeamMigrationError.swift renamed to WireDomain/Sources/WireDomainPackage/UseCases/Protocols/CreateLegacyBackupError.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19-
public enum IndividualToTeamMigrationError: Error, Sendable {
20-
case userAlreadyInTeam
21-
case generic(any Error)
19+
public enum CreateLegacyBackupError: Error {
20+
case noActiveAccountForExport
21+
case compressionError
22+
/// Failed to create `InputStream` or `OutputStream` from `URL`.
23+
case failedToCreateStreamsForEncryption
2224
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19-
public enum ImportLegacyBackupError: Error, Equatable, CaseIterable {
19+
public enum ImportBackupError: Error, Equatable, CaseIterable {
2020
case noActiveAccountForImport
2121
/// The backup file is encrypted and a password is needed for decryption.
2222
case passwordRequired
@@ -27,7 +27,7 @@ public enum ImportLegacyBackupError: Error, Equatable, CaseIterable {
2727
case invalidFileExtension
2828
case keyCreationFailed
2929
case decryptionError
30-
case failedToBackUpUserClient
30+
case faildToBackUpUserClient
3131
/// Failed to create `InputStream` or `OutputStream` from `URL`.
3232
case failedToCreateStreamForDecryption
3333
}

WireUI/Sources/WireIndividualToTeamMigrationUI/UseCases/IndividualToTeamMigrationResult.swift renamed to WireDomain/Sources/WireDomainPackage/UseCases/Protocols/IndividualToTeamMigrationUseCaseProtocol.swift

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,23 @@
1818

1919
public import Foundation
2020

21-
public struct IndividualToTeamMigrationResult: Sendable {
21+
public enum IndividualToTeamMigrationError: Error, Sendable {
22+
case userAlreadyInTeam
23+
case generic(any Error)
24+
}
2225

26+
public struct IndividualToTeamMigrationResult: Sendable {
2327
public let teamID: UUID
2428
public let teamName: String
2529

2630
public init(teamID: UUID, teamName: String) {
2731
self.teamID = teamID
2832
self.teamName = teamName
2933
}
34+
}
3035

36+
// sourcery: AutoMockable
37+
/// Sends a request to the backend to migrate the user to a team.
38+
public protocol IndividualToTeamMigrationUseCaseProtocol: Sendable {
39+
func invoke(teamName: String) async throws -> IndividualToTeamMigrationResult
3140
}

WireDomain/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
"identifier" : "01D0DCAF2C1C8C880076CB1C",
2828
"name" : "WireDomainTests"
2929
},
30-
"testExecutionOrdering" : "random",
31-
"threadSanitizerEnabled" : true,
32-
"undefinedBehaviorSanitizerEnabled" : true
30+
"testExecutionOrdering" : "random"
3331
},
3432
"testTargets" : [
3533
{
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"configurations" : [
3+
{
4+
"id" : "28FE03E5-05C7-4215-A556-2675ABB60489",
5+
"name" : "Test Scheme Action",
6+
"options" : {
7+
8+
}
9+
}
10+
],
11+
"defaultOptions" : {
12+
"codeCoverage" : false
13+
},
14+
"testTargets" : [
15+
{
16+
"target" : {
17+
"containerPath" : "container:",
18+
"identifier" : "WireDomainPackageTests",
19+
"name" : "WireDomainPackageTests"
20+
}
21+
}
22+
],
23+
"version" : 1
24+
}

WireFoundation/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
"identifier" : "WireFoundationTests",
2323
"name" : "WireFoundationTests"
2424
},
25-
"testExecutionOrdering" : "random",
26-
"threadSanitizerEnabled" : true,
27-
"undefinedBehaviorSanitizerEnabled" : true
25+
"testExecutionOrdering" : "random"
2826
},
2927
"testTargets" : [
3028
{

WireLogging/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
"containerPath" : "container:WireLogging",
2222
"identifier" : "WireLoggingTests",
2323
"name" : "WireLoggingTests"
24-
},
25-
"threadSanitizerEnabled" : true,
26-
"undefinedBehaviorSanitizerEnabled" : true
24+
}
2725
},
2826
"testTargets" : [
2927
{

WireUI/Package.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ let package = Package(
2828
dependencies: [
2929
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"),
3030
.package(path: "../WireAnalytics"),
31+
.package(name: "WireDomainPackage", path: "../WireDomain"),
3132
.package(name: "WireFoundation", path: "../WireFoundation"),
3233
.package(path: "../WireLogging"),
3334
.package(path: "../WirePlugins")
@@ -57,6 +58,7 @@ let package = Package(
5758
name: "WireIndividualToTeamMigrationUI",
5859
dependencies: [
5960
"WireAnalytics",
61+
.product(name: "WireDomainPackage", package: "WireDomainPackage"),
6062
"WireFoundation",
6163
"WireReusableUIComponents"
6264
]
@@ -94,6 +96,7 @@ let package = Package(
9496
name: "WireSettingsUI",
9597
dependencies: [
9698
"WireDesign",
99+
.product(name: "WireDomainPackage", package: "WireDomainPackage"),
97100
"WireFoundation",
98101
"WireLogging",
99102
"WireReusableUIComponents",

WireUI/Sources/WireIndividualToTeamMigrationUI/IndividualToTeamMigrationViewController.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import SwiftUI
2020
import WireAnalytics
2121
import WireDesign
22+
import WireDomainPackage
2223
import WireFoundation
2324
import WireReusableUIComponents
2425

WireUI/Sources/WireIndividualToTeamMigrationUI/UseCases/IndividualToTeamMigrationUseCaseProtocol.swift

Lines changed: 0 additions & 22 deletions
This file was deleted.

WireUI/Sources/WireIndividualToTeamMigrationUI/Views/PreviewsSetup/_FeaturePreview.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import SwiftUI
20+
import WireDomainPackage
2021

2122
public struct MockUseCase: IndividualToTeamMigrationUseCaseProtocol {
2223
let error: (any Error)?

WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import SwiftUI
2020
import WireDesign
21+
import WireDomainPackage
2122
import WireFoundation
2223
import WireLogging
2324

WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import WireDomainPackage
2021
import WireLogging
2122

2223
@MainActor
@@ -133,23 +134,23 @@ final class ImportBackupViewModel: ObservableObject {
133134
state = .success
134135
}
135136
}
136-
} catch ImportLegacyBackupError.passwordRequired {
137+
} catch ImportBackupError.passwordRequired {
137138
logger.debug("password is required to open backup file")
138139
state = .requestingPassword(url: url, isPasswordIncorrect: false)
139140
return // don't clean up temporary file
140-
} catch ImportLegacyBackupError.decryptionError {
141+
} catch ImportBackupError.decryptionError {
141142
logger.warn("failed to decrypt backup file, presenting the password input again")
142143
state = .requestingPassword(url: url, isPasswordIncorrect: true)
143144
return // don't clean up temporary file
144-
} catch ImportLegacyBackupError.incompatibleFileFormat {
145+
} catch ImportBackupError.incompatibleFileFormat {
145146
logger.warn("restore failed due to incompatible file format")
146147
alertContent = .init(
147148
title: Strings.Alert.IncompatibleBackupError.title,
148149
message: Strings.Alert.IncompatibleBackupError.message,
149150
action: Strings.Alert.ok
150151
)
151152
state = .restoreFailed
152-
} catch ImportLegacyBackupError.invalidAccountID {
153+
} catch ImportBackupError.invalidAccountID {
153154
logger.warn("restore failed due to invalid account ID")
154155
alertContent = .init(
155156
title: Strings.Alert.WrongFileError.title,

WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewImportBackupUseCase.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818

1919
import Foundation
20+
import WireDomainPackage
2021

2122
struct PreviewImportBackupUseCase: ImportBackupUseCaseProtocol {
2223

@@ -36,7 +37,7 @@ struct PreviewImportBackupUseCase: ImportBackupUseCaseProtocol {
3637
try Task.checkCancellation()
3738

3839
if i == failAtIndex {
39-
throw ImportLegacyBackupError.allCases.randomElement()!
40+
throw ImportBackupError.allCases.randomElement()!
4041
}
4142

4243
continuation.yield(.progress(i, steps))

WireUI/Tests/TestPlans/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
"identifier" : "WireDesignTests",
2828
"name" : "WireDesignTests"
2929
},
30-
"testExecutionOrdering" : "random",
31-
"threadSanitizerEnabled" : true,
32-
"undefinedBehaviorSanitizerEnabled" : true
30+
"testExecutionOrdering" : "random"
3331
},
3432
"testTargets" : [
3533
{

WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTest.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19+
import WireDomainPackage
1920
import WireLogging
2021
import WireTestingPackage
2122
import XCTest
@@ -89,7 +90,7 @@ final class ImportBackupViewModelTest: XCTestCase {
8990
sut.pickedBackupFile(result: .success(temporaryFile))
9091
wait(forConditionToBeTrue: sut.isImportConfirmationPresented, timeout: 3)
9192
sut.confirmOverwrite()
92-
continuation.finish(throwing: ImportLegacyBackupError.passwordRequired)
93+
continuation.finish(throwing: ImportBackupError.passwordRequired)
9394

9495
// Then
9596
wait(forConditionToBeTrue: sut.isEnterBackupPasswordPresented, timeout: 3)

WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Mocks/MockImportBackupUseCaseProtocol.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//
1818

1919
import Foundation
20-
import WireSettingsUI
20+
import WireDomainPackage
2121

2222
public final class MockImportBackupUseCaseProtocol: ImportBackupUseCaseProtocol {
2323

scripts/AllTests.xctestplan

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
"identifier" : "TrimStringCatalogsTests",
2323
"name" : "TrimStringCatalogsTests"
2424
},
25-
"testExecutionOrdering" : "random",
26-
"threadSanitizerEnabled" : true,
27-
"undefinedBehaviorSanitizerEnabled" : true
25+
"testExecutionOrdering" : "random"
2826
},
2927
"testTargets" : [
3028
{

0 commit comments

Comments
 (0)