feat: limited v7 API integration with individual to team migration endpoint - WPB-11961 #2151

El-Fitz · 2024-11-12T17:32:50Z

WPB-11961 [iOS] add API endpoint for upgrading to a team

Issue

Please describe the issue.

A barebones v7 API integration, limited to adding the individual to team migration endpoint, using APIService

Checklist

Title contains a reference JIRA issue number like [WPB-XXX].
Description is filled and free of optional paragraphs.
Adds/updates automated tests.

UI accessibility checklist

If your PR includes UI changes, please utilize this checklist:

Make sure you use the API for UI elements that support large fonts.
All colors are taken from WireDesign.ColorTheme or constructed using WireDesign.BaseColorPalette.
New UI elements have Accessibility strings for VoiceOver.

github-actions · 2024-11-12T17:40:43Z

Test Results

0 tests 0 ✅ 0s ⏱️
0 suites 0 💤
1 files 0 ❌

Results for commit d85246c.

♻️ This comment has been updated with latest results.

WireAPI/Package.resolved

WireAPI/Sources/WireAPI/APIs/AccountsAPI/Responses/UpgradeToTeamResponseEnvelopeV7.swift

WireAPI/Sources/WireAPI/Components/ResponseParser.swift

WireAPI/Sources/WireAPI/Models/Accounts/UpgradeAccountEnvelope.swift

netbe · 2024-11-13T07:30:43Z

WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCaseImplementation.swift

+
+public struct IndividualToTeamMigrationUseCase {
+    private let accountsAPI: AccountsAPI
+    private let logger: WireLogger = WireLogger(tag: "individual-to-team-migration")


prefer a static one like WireLogger.individualToTeam

meaning instead of using the string, declare one in WireLogger+Instances.swift

But then the WireLogger has manual references to all the other modules. Isn't that... weird?

WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCaseImplementation.swift

netbe · 2024-11-13T07:32:25Z

wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift

@@ -42,6 +68,12 @@ open class AuthenticatedSessionFactory {
        reachability: Reachability,
        minTLSVersion: String?
    ) {
+        self.apiService = APIService(
+            backendURL: environment.backendURL,
+            // TODO: Use the authentication storage from https://github.com/wireapp/wire-ios/pull/2084


netbe · 2024-11-13T07:34:06Z

wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift

 import WireDataModel

+
+final class InMemoryAuthenticationStorage: AuthenticationStorage {


I understand this is temporary too until renew access token PR is merged, right?
otherwise I would suggest to move to own file

There already is an InMemoryAuthenticationStorage so feel free to make it public and use it here.

It's exactly the same code, just copy-pasted.
And it is temporary until the renew access token PR is merged.

@johnxnguyen Do we want the InMemoryAuthentication to be and remain public?

WireAPI/Sources/WireAPI/Models/Network/TLSVersion.swift

WireAPI/Sources/WireAPI/APIs/AccountsAPI/Responses/UpgradeToTeamResponseEnvelopeV7.swift

johnxnguyen

Looks good, I'll wait for the conversations to be resolved before approving.

WireAPI/Sources/WireAPI/APIs/AccountsAPI/AccountsAPIBuilder.swift

WireAPI/Sources/WireAPI/APIs/AccountsAPI/AccountsAPIError.swift

WireAPI/Sources/WireAPI/Models/Accounts/UpgradeAccountEnvelope.swift

johnxnguyen · 2024-11-13T11:24:00Z

wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift

 import WireDataModel

+
+final class InMemoryAuthenticationStorage: AuthenticationStorage {


There already is an InMemoryAuthenticationStorage so feel free to make it public and use it here.

…dpoint

…ar button item

samwyndham

Nice work! Feel free to ignore comments which I prefix with optional.

samwyndham · 2024-11-22T13:13:45Z

WireAPI/Sources/WireAPI/APIs/AccountsAPI/AccountsAPIError.swift

+    /// An error occurred while encoding the request body.
+    case invalidRequestBody
+
+    /// A request url is not invalid.


Suggested change

/// A request url is not invalid.

/// A request url is not valid.

samwyndham · 2024-11-22T13:20:10Z

WireAPI/Sources/WireAPI/APIs/AccountsAPI/AccountsAPIV7.swift

+    override func upgradeToTeam(teamName: String) async throws -> UpgradedAccountTeam {
+        let components = URLComponents(string: "upgrade-personal-to-team")
+
+        guard let url = components?.url else {


Optional: Personally I might force unwrap this and ensure it is tested

samwyndham · 2024-11-22T13:23:34Z

WireAPI/Sources/WireAPI/APIs/AccountsAPI/Requests/UpgradeToTeamRequestBodyV7.swift

+    let name: String
+
+    init(
+        currency: String? = nil,


Out of interest, do you expect this to be called with default values?

samwyndham · 2024-11-22T13:30:44Z

wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift

+    private var accessToken: WireAPI.AccessToken?
+    private var cookieData: Data?
+
+    func storeAccessToken(_ accessToken: WireAPI.AccessToken) {


Out of interest, are these custom setters / getters to implement AuthenticationStorage?

netbe

Looks good, I've replied to my comments so you can finish pending points

El-Fitz requested review from netbe, caldrian and johnxnguyen November 12, 2024 17:32

El-Fitz self-assigned this Nov 12, 2024

echoes-hq bot added the echoes/initiative: personal-users-to-team-users... label Nov 12, 2024

netbe reviewed Nov 13, 2024

View reviewed changes

johnxnguyen reviewed Nov 13, 2024

View reviewed changes

El-Fitz force-pushed the feat/individual-to-team-migration-ui branch from 12300f5 to 7ebdca4 Compare November 15, 2024 09:09

El-Fitz added 3 commits November 15, 2024 16:06

feat: add limited v7 API version with individual to team migration en…

3436dad

…dpoint

fix: misc requested changes & improvements

202be9c

refactor: move buttons to reusable components, use reusable dismiss b…

d85246c

…ar button item

El-Fitz force-pushed the feat/invidiual-to-team-migration-api branch from aa88e45 to d85246c Compare November 15, 2024 15:08

El-Fitz requested review from johnxnguyen and netbe November 22, 2024 09:00

samwyndham approved these changes Nov 22, 2024

View reviewed changes

netbe approved these changes Nov 22, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: limited v7 API integration with individual to team migration endpoint - WPB-11961 #2151

feat: limited v7 API integration with individual to team migration endpoint - WPB-11961 #2151

El-Fitz commented Nov 12, 2024 •

edited by github-actions bot

Loading

github-actions bot commented Nov 12, 2024 •

edited

Loading

netbe Nov 13, 2024

El-Fitz Nov 13, 2024

netbe Nov 22, 2024

El-Fitz Nov 22, 2024

netbe Nov 13, 2024

netbe Nov 13, 2024

johnxnguyen Nov 13, 2024

El-Fitz Nov 13, 2024

johnxnguyen left a comment

johnxnguyen Nov 13, 2024

samwyndham left a comment

samwyndham Nov 22, 2024

samwyndham Nov 22, 2024

samwyndham Nov 22, 2024

samwyndham Nov 22, 2024

netbe left a comment

		import WireDataModel


		final class InMemoryAuthenticationStorage: AuthenticationStorage {

	/// A request url is not invalid.
	/// A request url is not valid.

feat: limited v7 API integration with individual to team migration endpoint - WPB-11961 #2151

Are you sure you want to change the base?

feat: limited v7 API integration with individual to team migration endpoint - WPB-11961 #2151

Conversation

El-Fitz commented Nov 12, 2024 • edited by github-actions bot Loading

Issue

Checklist

UI accessibility checklist

github-actions bot commented Nov 12, 2024 • edited Loading

Test Results

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

johnxnguyen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samwyndham left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

netbe left a comment

Choose a reason for hiding this comment

El-Fitz commented Nov 12, 2024 •

edited by github-actions bot

Loading

github-actions bot commented Nov 12, 2024 •

edited

Loading