Refactor auth + router

Dimillian · Dimillian · commit f0a0dcead1ff · 2024-11-27T10:14:00.000+01:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,8 +7,8 @@
         {
             "type": "sweetpad-lldb",
             "request": "launch",
-            "name": "Attach to running app (SweetPad)",
+            "name": "Debug",
             "preLaunchTask": "sweetpad: launch"
         }
     ]
-}
+}
diff --git a/App/AppRouter.swift b/App/AppRouter.swift
@@ -0,0 +1,27 @@
+import FeedUI
+import NotificationsUI
+import PostUI
+import Router
+import SwiftUI
+
+public struct AppRouter: ViewModifier {
+  public func body(content: Content) -> some View {
+    content
+      .navigationDestination(for: RouterDestination.self) { destination in
+        switch destination {
+        case .feed(let uri, let name, let avatarImageURL):
+          PostsFeedView(uri: uri, name: name, avatarImageURL: avatarImageURL)
+        case .post(let post):
+          PostDetailView(post: post)
+        case .timeline:
+          PostsTimelineView()
+        }
+      }
+  }
+}
+
+extension View {
+  public func withAppRouter() -> some View {
+    modifier(AppRouter())
+  }
+}
diff --git a/App/AppTabsRoot.swift b/App/AppTabsRoot.swift
@@ -21,16 +21,7 @@ struct AppTabRootView: View {
       NavigationStack(path: $router[tab]) {
         tab.rootView
           .navigationBarHidden(true)
-          .navigationDestination(for: RouterDestination.self) { destination in
-            switch destination {
-            case .feed(let uri, let name, let avatarImageURL):
-              PostsFeedView(uri: uri, name: name, avatarImageURL: avatarImageURL)
-            case .post(let post):
-              PostDetailView(post: post)
-            case .timeline:
-              PostsTimelineView()
-            }
-          }
+          .withAppRouter()
           .environment(\.currentTab, tab)
       }
     }
diff --git a/App/IcySkyApp.swift b/App/IcySkyApp.swift
@@ -15,6 +15,9 @@ struct IcySkyApp: App {
   @State var auth: Auth = .init()
   @State var currentUser: CurrentUser?
   @State var router: Router = .init()
+  @State var isLoadingInitialSession: Bool = true
+
+  @Environment(\.scenePhase) var scenePhase
 
   var body: some Scene {
     WindowGroup {
@@ -45,17 +48,23 @@ struct IcySkyApp: App {
           }
         }
       )
-      .task {
-        if await auth.refresh() == nil {
+      .task(id: auth.session) {
+        if let newSession = auth.session {
+          await refreshEnvWith(session: newSession)
+          if router.presentedSheet == .auth {
+            router.presentedSheet = nil
+          }
+        } else if auth.session == nil && !isLoadingInitialSession {
           router.presentedSheet = .auth
         }
+        isLoadingInitialSession = false
       }
-      .onChange(of: auth.session) { old, new in
-        if let newSession = new {
-          refreshEnvWith(session: newSession)
-          router.presentedSheet = nil
-        } else if old != nil && new == nil {
-          router.presentedSheet = .auth
+      .task(id: scenePhase) {
+        if scenePhase == .active {
+          await auth.refresh()
+          if auth.session == nil {
+            router.presentedSheet = .auth
+          }
         }
       }
       .overlay(
@@ -120,9 +129,9 @@ struct IcySkyApp: App {
     }
   }
 
-  private func refreshEnvWith(session: UserSession) {
+  private func refreshEnvWith(session: UserSession) async {
     let client = BSkyClient(session: session, protoClient: ATProtoKit(session: session))
     self.client = client
-    self.currentUser = CurrentUser(client: client)
+    self.currentUser = await CurrentUser(client: client)
   }
 }
diff --git a/IcySky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IcySky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "3a57643fb93924ae3e2e31cca833f05a6fdd5fb34c5f6d1fe705dd4ea90b6ba6",
+  "originHash" : "2c1d0e9f1b1f0b46873371aafc79b826af2a41ada3554d9f17d2ad096695fcd4",
   "pins" : [
     {
       "identity" : "atprotokit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/MasterJ93/ATProtoKit",
       "state" : {
-        "revision" : "08923750931951495bbb55371dbbb06cb90f5e13",
-        "version" : "0.20.0"
+        "branch" : "main",
+        "revision" : "ca2ea402e498273fce3e181ed767019f51305280"
       }
     },
     {
@@ -33,17 +33,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
-        "version" : "1.6.1"
+        "revision" : "96a2f8a0fa41e9e09af4585e2724c4e825410b91",
+        "version" : "1.6.2"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
-        "version" : "509.1.1"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     },
     {
diff --git a/Packages/Features/Sources/FeedUI/List/FeedsListView.swift b/Packages/Features/Sources/FeedUI/List/FeedsListView.swift
@@ -66,6 +66,16 @@ public struct FeedsListView: View {
       guard !isInSearch else { return }
       Task { await fetchSuggestedFeed() }
     }
+    .onChange(of: currentUser.savedFeeds.count) {
+      switch filter {
+      case .suggested:
+        feeds = feeds.filter { feed in
+          !currentUser.savedFeeds.contains { $0.value == feed.uri }
+        }
+      case .myFeeds:
+        Task { await fetchMyFeeds() }
+      }
+    }
     .listRowSeparator(.hidden)
   }
 
@@ -83,9 +93,11 @@ extension FeedsListView {
   private func fetchSuggestedFeed() async {
     error = nil
     do {
-      let feeds = try await client.protoClient.getSuggestedFeeds()
+      let feeds = try await client.protoClient.getPopularFeedGenerators(matching: nil)
       withAnimation {
-        self.feeds = feeds.feeds.map { $0.feedItem }
+        self.feeds = feeds.feeds.map { $0.feedItem }.filter { feed in
+          !currentUser.savedFeeds.contains { $0.value == feed.uri }
+        }
       }
     } catch {
       self.error = error
diff --git a/Packages/Features/Sources/NotificationsUI/NotificationsListView.swift b/Packages/Features/Sources/NotificationsUI/NotificationsListView.swift
@@ -15,7 +15,7 @@ public struct NotificationsListView: View {
   public var body: some View {
     NavigationStack {
       List {
-        HeaderView(title: "Notifications")
+        HeaderView(title: "Notifications", showBack: false)
           .padding(.bottom)
         ForEach(notifications, id: \.notificationURI) { notification in
           Text(notification.notificationReason.rawValue)
diff --git a/Packages/Features/Sources/PostUI/List/PostsFeedView.swift b/Packages/Features/Sources/PostUI/List/PostsFeedView.swift
@@ -23,26 +23,28 @@ public struct PostsFeedView: View {
   public var body: some View {
     PostListView(datasource: self)
       .onAppear {
-        withAnimation {
-          do {
-            try modelContext.delete(
-              model: RecentFeedItem.self,
-              where: #Predicate { feed in
-                feed.uri == uri
-              })
-            modelContext.insert(
-              RecentFeedItem(
-                uri: uri,
-                name: name,
-                avatarImageURL: avatarImageURL,
-                lastViewedAt: Date()
-              )
-            )
-            try modelContext.save()
-          } catch {}
-        }
+        updateRecentlyViewed()
       }
   }
+  
+  private func updateRecentlyViewed() {
+    do {
+      try modelContext.delete(
+        model: RecentFeedItem.self,
+        where: #Predicate { feed in
+          feed.uri == uri
+        })
+      modelContext.insert(
+        RecentFeedItem(
+          uri: uri,
+          name: name,
+          avatarImageURL: avatarImageURL,
+          lastViewedAt: Date()
+        )
+      )
+      try modelContext.save()
+    } catch {}
+  }
 }
 
 // MARK: - Datasource
diff --git a/Packages/Model/Package.resolved b/Packages/Model/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "f8f57ad9104df17507a66ed0009a3dfe0092bee34f0c22ded26cbadd45ac749c",
+  "originHash" : "ab17d83bbc31e56e6e212c669f73fd9e87f22beab0992e71293b9e6bb755ce79",
   "pins" : [
     {
       "identity" : "atprotokit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/MasterJ93/ATProtoKit",
       "state" : {
-        "revision" : "08923750931951495bbb55371dbbb06cb90f5e13",
-        "version" : "0.20.0"
+        "branch" : "main",
+        "revision" : "ca2ea402e498273fce3e181ed767019f51305280"
       }
     },
     {
diff --git a/Packages/Model/Package.swift b/Packages/Model/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
   ],
   dependencies: [
     .package(
-      url: "https://github.com/MasterJ93/ATProtoKit", from: "0.20.0"),
+      url: "https://github.com/MasterJ93/ATProtoKit", branch: "main"),
     .package(url: "https://github.com/evgenyneu/keychain-swift", from: "24.0.0"),
   ],
   targets: [
diff --git a/Packages/Model/Sources/Auth/Auth.swift b/Packages/Model/Sources/Auth/Auth.swift
@@ -53,20 +53,17 @@ public final class Auth: @unchecked Sendable {
     self.session = session
   }
 
-  public func refresh() async -> UserSession? {
+  public func refresh() async {
     do {
       if let refreshToken {
         let configuration = ATProtocolConfiguration(handle: "", appPassword: "")
         let session = try await configuration.refreshSession(using: refreshToken)
         self.authToken = session.accessToken
         self.refreshToken = session.refreshToken
         self.session = session
-        return session
       }
-      return nil
     } catch {
       self.session = nil
-      return nil
     }
   }
 
diff --git a/Packages/Model/Sources/User/CurrentUser.swift b/Packages/Model/Sources/User/CurrentUser.swift
@@ -10,20 +10,16 @@ public class CurrentUser {
   public private(set) var profile: AppBskyLexicon.Actor.ProfileViewDetailedDefinition?
   public private(set) var savedFeeds: [AppBskyLexicon.Actor.SavedFeed] = []
 
-  public init(client: BSkyClient) {
+  public init(client: BSkyClient) async {
     self.client = client
-
-    Task {
-      await fetchProfile()
-      await refreshCurrentUser()
-    }
+    await fetch()
   }
 
-  public func refreshCurrentUser() async {
+  public func fetch() async {
     await fetchProfile()
     await fetchPreferences()
   }
-  
+
   public func fetchProfile() async {
     do {
       self.profile = try await client.protoClient.getProfile(client.session.sessionDID)
@@ -39,7 +35,7 @@ public class CurrentUser {
         switch preference {
         case .savedFeedsVersion2(let feeds):
           var feeds = feeds.items
-          feeds.removeAll(where: { $0.value == "following"})
+          feeds.removeAll(where: { $0.value == "following" })
           self.savedFeeds = feeds
         default:
           break

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`{`
`8`	`8`	`"type": "sweetpad-lldb",`
`9`	`9`	`"request": "launch",`
`10`		`- "name": "Attach to running app (SweetPad)",`
	`10`	`+ "name": "Debug",`
`11`	`11`	`"preLaunchTask": "sweetpad: launch"`
`12`	`12`	`}`
`13`	`13`	`]`
`14`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@ struct IcySkyApp: App {`
`15`	`15`	`@State var auth: Auth = .init()`
`16`	`16`	`@State var currentUser: CurrentUser?`
`17`	`17`	`@State var router: Router = .init()`
	`18`	`+ @State var isLoadingInitialSession: Bool = true`
	`19`	`+`
	`20`	`+ @Environment(\.scenePhase) var scenePhase`
`18`	`21`
`19`	`22`	`var body: some Scene {`
`20`	`23`	`WindowGroup {`
`@@ -45,17 +48,23 @@ struct IcySkyApp: App {`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`	`)`
`48`		`- .task {`
`49`		`- if await auth.refresh() == nil {`
	`51`	`+ .task(id: auth.session) {`
	`52`	`+ if let newSession = auth.session {`
	`53`	`+ await refreshEnvWith(session: newSession)`
	`54`	`+ if router.presentedSheet == .auth {`
	`55`	`+ router.presentedSheet = nil`
	`56`	`+ }`
	`57`	`+ } else if auth.session == nil && !isLoadingInitialSession {`
`50`	`58`	`router.presentedSheet = .auth`
`51`	`59`	`}`
	`60`	`+ isLoadingInitialSession = false`
`52`	`61`	`}`
`53`		`- .onChange(of: auth.session) { old, new in`
`54`		`- if let newSession = new {`
`55`		`- refreshEnvWith(session: newSession)`
`56`		`- router.presentedSheet = nil`
`57`		`- } else if old != nil && new == nil {`
`58`		`- router.presentedSheet = .auth`
	`62`	`+ .task(id: scenePhase) {`
	`63`	`+ if scenePhase == .active {`
	`64`	`+ await auth.refresh()`
	`65`	`+ if auth.session == nil {`
	`66`	`+ router.presentedSheet = .auth`
	`67`	`+ }`
`59`	`68`	`}`
`60`	`69`	`}`
`61`	`70`	`.overlay(`
`@@ -120,9 +129,9 @@ struct IcySkyApp: App {`
`120`	`129`	`}`
`121`	`130`	`}`
`122`	`131`
`123`		`- private func refreshEnvWith(session: UserSession) {`
	`132`	`+ private func refreshEnvWith(session: UserSession) async {`
`124`	`133`	`let client = BSkyClient(session: session, protoClient: ATProtoKit(session: session))`
`125`	`134`	`self.client = client`
`126`		`- self.currentUser = CurrentUser(client: client)`
	`135`	`+ self.currentUser = await CurrentUser(client: client)`
`127`	`136`	`}`
`128`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`		`- "originHash" : "3a57643fb93924ae3e2e31cca833f05a6fdd5fb34c5f6d1fe705dd4ea90b6ba6",`
	`2`	`+ "originHash" : "2c1d0e9f1b1f0b46873371aafc79b826af2a41ada3554d9f17d2ad096695fcd4",`
`3`	`3`	`"pins" : [`
`4`	`4`	`{`
`5`	`5`	`"identity" : "atprotokit",`
`6`	`6`	`"kind" : "remoteSourceControl",`
`7`	`7`	`"location" : "https://github.com/MasterJ93/ATProtoKit",`
`8`	`8`	`"state" : {`
`9`		`- "revision" : "08923750931951495bbb55371dbbb06cb90f5e13",`
`10`		`- "version" : "0.20.0"`
	`9`	`+ "branch" : "main",`
	`10`	`+ "revision" : "ca2ea402e498273fce3e181ed767019f51305280"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
`@@ -33,17 +33,17 @@`
`33`	`33`	`"kind" : "remoteSourceControl",`
`34`	`34`	`"location" : "https://github.com/apple/swift-log.git",`
`35`	`35`	`"state" : {`
`36`		`- "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",`
`37`		`- "version" : "1.6.1"`
	`36`	`+ "revision" : "96a2f8a0fa41e9e09af4585e2724c4e825410b91",`
	`37`	`+ "version" : "1.6.2"`
`38`	`38`	`}`
`39`	`39`	`},`
`40`	`40`	`{`
`41`	`41`	`"identity" : "swift-syntax",`
`42`	`42`	`"kind" : "remoteSourceControl",`
`43`	`43`	`"location" : "https://github.com/swiftlang/swift-syntax.git",`
`44`	`44`	`"state" : {`
`45`		`- "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",`
`46`		`- "version" : "509.1.1"`
	`45`	`+ "revision" : "0687f71944021d616d34d922343dcef086855920",`
	`46`	`+ "version" : "600.0.1"`
`47`	`47`	`}`
`48`	`48`	`},`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`		`- "originHash" : "f8f57ad9104df17507a66ed0009a3dfe0092bee34f0c22ded26cbadd45ac749c",`
	`2`	`+ "originHash" : "ab17d83bbc31e56e6e212c669f73fd9e87f22beab0992e71293b9e6bb755ce79",`
`3`	`3`	`"pins" : [`
`4`	`4`	`{`
`5`	`5`	`"identity" : "atprotokit",`
`6`	`6`	`"kind" : "remoteSourceControl",`
`7`	`7`	`"location" : "https://github.com/MasterJ93/ATProtoKit",`
`8`	`8`	`"state" : {`
`9`		`- "revision" : "08923750931951495bbb55371dbbb06cb90f5e13",`
`10`		`- "version" : "0.20.0"`
	`9`	`+ "branch" : "main",`
	`10`	`+ "revision" : "ca2ea402e498273fce3e181ed767019f51305280"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,20 +53,17 @@ public final class Auth: @unchecked Sendable {`
`53`	`53`	`self.session = session`
`54`	`54`	`}`
`55`	`55`
`56`		`- public func refresh() async -> UserSession? {`
	`56`	`+ public func refresh() async {`
`57`	`57`	`do {`
`58`	`58`	`if let refreshToken {`
`59`	`59`	`let configuration = ATProtocolConfiguration(handle: "", appPassword: "")`
`60`	`60`	`let session = try await configuration.refreshSession(using: refreshToken)`
`61`	`61`	`self.authToken = session.accessToken`
`62`	`62`	`self.refreshToken = session.refreshToken`
`63`	`63`	`self.session = session`
`64`		`- return session`
`65`	`64`	`}`
`66`		`- return nil`
`67`	`65`	`} catch {`
`68`	`66`	`self.session = nil`
`69`		`- return nil`
`70`	`67`	`}`
`71`	`68`	`}`
`72`	`69`