Show "Application Passwords" entry in the my site screen (#24695)

crazytonyli · web-flow · commit 39d1d6e72f1f · 2025-08-08T03:02:08.000Z
* Show "Application Passwords" entry in the Me screen

* Use plain list style on the application passwords list

* Add "Created" text to the application password row

* Remove timestamp from application password name

* Move the 'Application Passwords' row to My Site

* Fix a compiling issue on the Reader app

* Remove unused code

* Fix a copy paste issue
diff --git a/WordPress/Classes/ApplicationToken/ApplicationTokenItemView.swift b/WordPress/Classes/ApplicationToken/ApplicationTokenItemView.swift
@@ -17,7 +17,7 @@ struct ApplicationTokenItemView: View {
                 detailItem(title: Self.name, value: token.name)
             }
 
-            Section(Self.security) {
+            Section {
                 detailItem(title: Self.creationDate, value: token.createdAt.formatted())
 
                 if let lastUsed = token.lastUsed {
@@ -27,6 +27,18 @@ struct ApplicationTokenItemView: View {
                 if let lastIpAddress = token.lastIpAddress {
                     detailItem(title: Self.lastUsedIp, value: lastIpAddress)
                 }
+            } header: {
+                Text(Self.security)
+            } footer: {
+                if token.isCurrent {
+                    HStack(alignment: .firstTextBaseline) {
+                        Circle()
+                            .fill(Color.accentColor)
+                            .frame(width: 8, height: 8)
+
+                        Text(Self.currentlyInUse)
+                    }
+                }
             }
         }
         .navigationTitle(token.name)
@@ -61,7 +73,9 @@ private extension ApplicationTokenItemView {
 
     static var lastUsed: String { NSLocalizedString("applicationPassword.item.lastUsed", value: "Last Used", comment: "Title of row for displaying an application password's last used date") }
 
-    static var lastUsedIp: String { NSLocalizedString("applicationPassword.item.lastUsed", value: "Last IP Address", comment: "Title of row for displaying an application password's last used IP address") }
+    static var lastUsedIp: String { NSLocalizedString("applicationPassword.item.lastUsedIp", value: "Last IP Address", comment: "Title of row for displaying an application password's last used IP address") }
+
+    static var currentlyInUse: String { NSLocalizedString("applicationPassword.item.currentlyInUse", value: "This application password is currently being used by the app.", comment: "Footer message indicating that this application password is currently active and being used by the app") }
 }
 
 // MARK: - SwiftUI Preview
diff --git a/WordPress/Classes/ApplicationToken/ApplicationTokenListItemView.swift b/WordPress/Classes/ApplicationToken/ApplicationTokenListItemView.swift
@@ -13,15 +13,26 @@ public struct ApplicationTokenListItemView: View {
         NavigationLink(destination: {
             ApplicationTokenItemView(token: item)
         }, label: {
-            VStack(alignment: .leading) {
-                Text(item.name)
-                    .font(.headline)
-                    .multilineTextAlignment(.leading)
-                    .lineLimit(2)
-                    .truncationMode(.middle)
-                Text(lastUsedText)
-                    .font(.callout)
-                    .lineLimit(1)
+            HStack {
+                VStack(alignment: .leading) {
+                    Text(item.name)
+                        .font(.headline)
+                        .multilineTextAlignment(.leading)
+                        .lineLimit(2)
+                        .truncationMode(.middle)
+                    Text("\(createdDateText) • \(lastUsedText)")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
+                        .lineLimit(1)
+                }
+
+                Spacer()
+
+                if item.isCurrent {
+                    Circle()
+                        .fill(Color.accentColor)
+                        .frame(width: 8, height: 8)
+                }
             }
         })
     }
@@ -34,9 +45,15 @@ public struct ApplicationTokenListItemView: View {
         return String(format: Self.lastUsedFormat, lastUsed.toShortString())
     }
 
+    private var createdDateText: String {
+        return String(format: Self.createdDateFormat, item.createdAt.toShortString())
+    }
+
     private static let unusedText: String = NSLocalizedString("applicationPassword.list.item.unused", value: "Not used yet.", comment: "Last used time of an application password if it's never been used")
 
     private static let lastUsedFormat: String = NSLocalizedString("applicationPassword.list.item.last-used-format", value: "Last used %@", comment: "String format of last used time of an application password. There is one argument: the last used time relative to now (i.e. 5 days ago).")
+
+    private static let createdDateFormat: String = NSLocalizedString("applicationPassword.list.item.created-date-format", value: "Created %@", comment: "String format of creation date of an application password. There is one argument: the creation date relative to now (i.e. 5 days ago).")
 }
 
 #Preview {
diff --git a/WordPress/Classes/ApplicationToken/ApplicationTokenListView.swift b/WordPress/Classes/ApplicationToken/ApplicationTokenListView.swift
@@ -8,6 +8,8 @@ struct ApplicationTokenListView: View {
     @StateObject
     private var viewModel: ApplicationTokenListViewModel
 
+    @State private var isShowingInfo = false
+
     fileprivate init(tokens: [ApplicationTokenItem]) {
         let dataProvider = StaticTokenProvider(tokens: .success(tokens))
         self.init(dataProvider: dataProvider)
@@ -23,25 +25,39 @@ struct ApplicationTokenListView: View {
     }
 
     var body: some View {
-        ZStack {
-            Color(.systemGroupedBackground)
-                .ignoresSafeArea()
-
-            VStack {
-                if viewModel.isLoadingData {
-                    ProgressView()
-                } else if let error = viewModel.errorMessage {
-                    EmptyStateView(Self.errorTitle, systemImage: "exclamationmark.triangle", description: error)
-                } else {
-                    List(viewModel.applicationTokens) { token in
-                        ApplicationTokenListItemView(item: token)
+        VStack {
+            if viewModel.isLoadingData {
+                ProgressView()
+            } else if let error = viewModel.errorMessage {
+                EmptyStateView(Self.errorTitle, systemImage: "exclamationmark.triangle", description: error)
+            } else {
+                List {
+                    Section {
+                        ForEach(viewModel.applicationTokens) { token in
+                            ApplicationTokenListItemView(item: token)
+                        }
                     }
-                    .listStyle(.insetGrouped)
+                    .listSectionSeparator(.hidden, edges: .top)
                 }
+                .listStyle(.plain)
             }
         }
         .navigationTitle(Self.title)
         .navigationBarTitleDisplayMode(.inline)
+        .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                Button {
+                    isShowingInfo = true
+                } label: {
+                    Image(systemName: "info.circle")
+                }
+            }
+        }
+        .sheet(isPresented: $isShowingInfo) {
+            NavigationView {
+                ApplicationPasswordsInfoView()
+            }
+        }
         .onAppear {
             if viewModel.applicationTokens.isEmpty {
                 Task {
@@ -78,11 +94,14 @@ class ApplicationTokenListViewModel: ObservableObject {
         }
 
         do {
-            let tokens = try await self.dataProvider.loadApplicationTokens()
+            var tokens = try await self.dataProvider.loadApplicationTokens()
                 .sorted { lhs, rhs in
                     // The most recently used/created is placed at the top.
                     (lhs.lastUsed ?? .distantPast, lhs.createdAt) > (rhs.lastUsed ?? .distantPast, rhs.createdAt)
                 }
+            if let current = tokens.firstIndex(where: { $0.isCurrent }) {
+                tokens.move(fromOffsets: IndexSet(integer: current), toOffset: 0)
+            }
             self.applicationTokens = tokens
         } catch {
             self.errorMessage = error.localizedDescription
diff --git a/WordPress/Classes/ApplicationToken/Model/ApplicationTokenItem.swift b/WordPress/Classes/ApplicationToken/Model/ApplicationTokenItem.swift
@@ -13,6 +13,8 @@ public struct ApplicationTokenItem: Identifiable {
     public let lastUsed: Date?
     public let lastIpAddress: String?
 
+    public var isCurrent: Bool = false
+
     public init(name: String, uuid: UUID, appId: String, createdAt: Date, lastUsed: Date?, lastIpAddress: String?) {
         self.name = name
         self.uuid = uuid
diff --git a/WordPress/Classes/Login/ApplicationPasswordRequiredView.swift b/WordPress/Classes/Login/ApplicationPasswordRequiredView.swift
@@ -3,35 +3,59 @@ import SwiftUI
 import WordPressData
 import WordPressCore
 import WordPressShared
+import WordPressUI
 
 struct ApplicationPasswordRequiredView<Content: View>: View {
     private let blog: Blog
     private let localizedFeatureName: String
     @State private var site: WordPressSite?
+    @State private var showLoading: Bool = true
     private let builder: (WordPressClient) -> Content
 
     weak var presentingViewController: UIViewController?
 
     init(blog: Blog, localizedFeatureName: String, presentingViewController: UIViewController, @ViewBuilder content: @escaping (WordPressClient) -> Content) {
-        wpAssert(blog.account == nil, "The Blog argument should be a self-hosted site")
-
         self.blog = blog
         self.localizedFeatureName = localizedFeatureName
-        self.site = try? WordPressSite(blog: blog)
         self.presentingViewController = presentingViewController
         self.builder = content
     }
 
     var body: some View {
-        if let site {
-            builder(WordPressClient(site: site))
-        } else {
-            RestApiUpgradePrompt(localizedFeatureName: localizedFeatureName) {
-                Task {
-                    await self.migrate()
+        VStack {
+            if blog.isHostedAtWPcom && !blog.isAtomic() {
+                EmptyStateView(Strings.unsupported, systemImage: "exclamationmark.triangle.fill")
+            } else if showLoading {
+                ProgressView()
+            } else if let site {
+                builder(WordPressClient(site: site))
+            } else {
+                RestApiUpgradePrompt(localizedFeatureName: localizedFeatureName) {
+                    Task {
+                        await self.migrate()
+                    }
                 }
             }
         }
+        .task {
+            showLoading = true
+            defer { showLoading = false }
+
+            updateSite()
+            await attemptToCreatePasswordIfNeeded()
+        }
+    }
+
+    private func attemptToCreatePasswordIfNeeded() async {
+        guard self.site == nil else { return }
+
+        do {
+            let repository = ApplicationPasswordRepository.shared
+            try await repository.createPasswordIfNeeded(for: TaggedManagedObjectID(blog))
+            updateSite()
+        } catch {
+            DDLogError("Failed to create an application password: \(error)")
+        }
     }
 
     @MainActor
@@ -46,16 +70,23 @@ struct ApplicationPasswordRequiredView<Content: View>: View {
         do {
             // Get an application password for the given site.
             let authenticator = SelfHostedSiteAuthenticator()
-            let blogID = try await authenticator.signIn(site: url, from: presenter, context: .reauthentication(TaggedManagedObjectID(blog), username: blog.username))
+            let _ = try await authenticator.signIn(site: url, from: presenter, context: .reauthentication(TaggedManagedObjectID(blog), username: blog.username))
 
             // Modify the `site` variable to display the intended feature.
-            let blog = try ContextManager.shared.mainContext.existingObject(with: blogID)
-            self.site = try .init(blog: blog)
+            updateSite()
         } catch {
             Notice(error: error).post()
         }
     }
 
+    private func updateSite() {
+        // We check that the site is `selfHosted` to ensure an _Application Password_ is available. That's what this view
+        // is for, after all.
+        if let site = try? WordPressSite(blog: blog), case .selfHosted = site {
+            self.site = site
+        }
+    }
+
     enum Strings {
         static var siteUrlNotFoundError: String {
             NSLocalizedString("applicationPasswordMigration.error.siteUrlNotFound", value: "Cannot find the current site's url", comment: "Error message when the current site's url cannot be found")
@@ -65,5 +96,7 @@ struct ApplicationPasswordRequiredView<Content: View>: View {
             let format = NSLocalizedString("applicationPasswordMigration.error.usernameMismatch", value: "You need to sign in with user \"%@\"", comment: "Error message when the username does not match the signed-in user. The first argument is the currently signed in user's user login name")
             return String(format: format, expected)
         }
+
+        static var unsupported: String { NSLocalizedString("applicationPasswordMigration.error.unsupported", value: "This site does not support Application Passwords.", comment: "Error message shown when the site doesn't support Application Passwords feature") }
     }
 }
diff --git a/WordPress/Classes/Login/SelfHostedSiteAuthenticator.swift b/WordPress/Classes/Login/SelfHostedSiteAuthenticator.swift
@@ -38,9 +38,7 @@ struct SelfHostedSiteAuthenticator {
         }
 
         let deviceName = UIDevice.current.name
-        let timestamp = ISO8601DateFormatter.string(from: .now, timeZone: .current, formatOptions: .withInternetDateTime)
-
-        return "\(appName) iOS app on \(deviceName) (\(timestamp))"
+        return "\(appName) iOS app on \(deviceName)"
     }
 
     static let applicationPasswordUpdated = Foundation.Notification.Name(rawValue: "SelfHostedSiteAuthenticator.applicationPasswordUpdated")
diff --git a/WordPress/Classes/Services/ApplicationPasswordRepository.swift b/WordPress/Classes/Services/ApplicationPasswordRepository.swift
@@ -182,7 +182,13 @@ private extension ApplicationPasswordRepository {
                 return try? blog.getApplicationToken()
             }
 
-            if let saved, !validPasswords.map(\.password).contains(saved), let newPassword = validPasswords.first {
+            var shouldUpdate = saved == nil
+
+            if let saved, !validPasswords.map(\.password).contains(saved) {
+                shouldUpdate = true
+            }
+
+            if shouldUpdate, let newPassword = validPasswords.first {
                 try await assign(newPassword, apiRootURL: apiRootURL, to: blogId)
             }
         }
diff --git a/WordPress/Classes/Services/ApplicationPasswordService.swift b/WordPress/Classes/Services/ApplicationPasswordService.swift
@@ -5,11 +5,12 @@ import WordPressCore
 @objc class ApplicationPasswordService: NSObject {
 
     private let apiClient: WordPressClient
-    private let currentUserId: Int
+    private var currentUserId: UserId?
+    private var currentApplicationPasswordUUID: String?
 
-    init(api: WordPressClient, currentUserId: Int) {
+    init(api: WordPressClient, currentUserId: Int? = nil) {
         self.apiClient = api
-        self.currentUserId = currentUserId
+        self.currentUserId = currentUserId.flatMap(UserId.init)
     }
 
     private func fetchTokens(forUserId userId: UserId) async throws -> [ApplicationPasswordWithEditContext] {
@@ -19,8 +20,28 @@ import WordPressCore
 
 extension ApplicationPasswordService: ApplicationTokenListDataProvider {
     func loadApplicationTokens() async throws -> [ApplicationTokenItem] {
-        try await fetchTokens(forUserId: UserId(currentUserId))
-            .compactMap(ApplicationTokenItem.init)
+        let userId: UserId
+        if let currentUserId {
+            userId = currentUserId
+        } else {
+            userId = try await apiClient.api.users.retrieveMeWithViewContext().data.id
+            currentUserId = userId
+        }
+
+        if self.currentApplicationPasswordUUID == nil {
+            self.currentApplicationPasswordUUID = try? await apiClient.api.applicationPasswords.retrieveCurrentWithViewContext().data.uuid.uuid
+        }
+
+        return try await fetchTokens(forUserId: userId)
+            .compactMap { token -> ApplicationTokenItem? in
+                guard var item = ApplicationTokenItem(token) else { return nil }
+
+                if let current = self.currentApplicationPasswordUUID {
+                    item.isCurrent = current.compare(item.uuid.uuidString, options: .caseInsensitive) == .orderedSame
+                }
+
+                return item
+            }
     }
 }
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import SwiftUI
 import WordPressData
 import WordPressShared
 import WordPressAPI
@@ -344,6 +345,14 @@ extension BlogDetailsViewController {
         let controller = SiteMonitoringViewController(blog: blog, selectedTab: selectedTab)
         presentationDelegate?.presentBlogDetailsViewController(controller)
     }
+
+    @objc public func showApplicationPasswords() {
+        let feature = NSLocalizedString("applicationPasswordRequired.feature.users", value: "Application Passwords Management", comment: "Feature name for managing application passwords in the app")
+        let view = ApplicationPasswordRequiredView(blog: blog, localizedFeatureName: feature, presentingViewController: self) {
+            ApplicationTokenListView(dataProvider: ApplicationPasswordService(api: $0))
+        }
+        presentationDelegate?.presentBlogDetailsViewController(UIHostingController(rootView: view))
+    }
 }
 
 // MARK: - BlogDetailsViewController (Tracking)
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,7 @@ struct SelfHostedSiteAuthenticator {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`let deviceName = UIDevice.current.name`
`41`		`- let timestamp = ISO8601DateFormatter.string(from: .now, timeZone: .current, formatOptions: .withInternetDateTime)`
`42`		`-`
`43`		`- return "\(appName) iOS app on \(deviceName) (\(timestamp))"`
	`41`	`+ return "\(appName) iOS app on \(deviceName)"`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`static let applicationPasswordUpdated = Foundation.Notification.Name(rawValue: "SelfHostedSiteAuthenticator.applicationPasswordUpdated")`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,13 @@ private extension ApplicationPasswordRepository {`
`182`	`182`	`return try? blog.getApplicationToken()`
`183`	`183`	`}`
`184`	`184`
`185`		`- if let saved, !validPasswords.map(\.password).contains(saved), let newPassword = validPasswords.first {`
	`185`	`+ var shouldUpdate = saved == nil`
	`186`	`+`
	`187`	`+ if let saved, !validPasswords.map(\.password).contains(saved) {`
	`188`	`+ shouldUpdate = true`
	`189`	`+ }`
	`190`	`+`
	`191`	`+ if shouldUpdate, let newPassword = validPasswords.first {`
`186`	`192`	`try await assign(newPassword, apiRootURL: apiRootURL, to: blogId)`
`187`	`193`	`}`
`188`	`194`	`}`