openedx · volodymyr-chekyrta · Aug 31, 2023 · Aug 31, 2023 · Aug 31, 2023 · Aug 31, 2023
diff --git a/Authorization/Authorization/Presentation/Base/FieldsView.swift b/Authorization/Authorization/Presentation/Base/FieldsView.swift
@@ -63,6 +63,7 @@ struct FieldsView: View {
                         type: .discovery,
                         fontSize: 90, screenWidth: proxy.size.width)
                 )
+                .id(UUID())
                 .padding(.horizontal, -6)
 
             case .unknown:

diff --git a/Core/Core.xcodeproj/project.pbxproj b/Core/Core.xcodeproj/project.pbxproj
@@ -99,7 +99,7 @@
 		07460FE3294B72D700F70538 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07460FE2294B72D700F70538 /* Notification.swift */; };
 		076F297F2A1F80C800967E7D /* Pagination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 076F297E2A1F80C800967E7D /* Pagination.swift */; };
 		0770DE1928D0847D006D8A5D /* BaseRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE1828D0847D006D8A5D /* BaseRouter.swift */; };
-		0770DE2528D08FBA006D8A5D /* AppStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2428D08FBA006D8A5D /* AppStorage.swift */; };
+		0770DE2528D08FBA006D8A5D /* CoreStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2428D08FBA006D8A5D /* CoreStorage.swift */; };
 		0770DE2A28D0929E006D8A5D /* HTTPTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2928D0929E006D8A5D /* HTTPTask.swift */; };
 		0770DE2C28D092B3006D8A5D /* NetworkLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2B28D092B3006D8A5D /* NetworkLogger.swift */; };
 		0770DE2E28D09743006D8A5D /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2D28D09743006D8A5D /* API.swift */; };
@@ -221,7 +221,7 @@
 		076F297E2A1F80C800967E7D /* Pagination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pagination.swift; sourceTree = "<group>"; };
 		0770DE0828D07831006D8A5D /* Core.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0770DE1828D0847D006D8A5D /* BaseRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseRouter.swift; sourceTree = "<group>"; };
-		0770DE2428D08FBA006D8A5D /* AppStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStorage.swift; sourceTree = "<group>"; };
+		0770DE2428D08FBA006D8A5D /* CoreStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreStorage.swift; sourceTree = "<group>"; };
 		0770DE2928D0929E006D8A5D /* HTTPTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPTask.swift; sourceTree = "<group>"; };
 		0770DE2B28D092B3006D8A5D /* NetworkLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkLogger.swift; sourceTree = "<group>"; };
 		0770DE2D28D09743006D8A5D /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
@@ -381,7 +381,7 @@
 				02CF46C92954A42100A698EE /* Persistence */,
 				0236961728F9A21600EEF206 /* Repository */,
 				0727877528D2383C002E9142 /* Model */,
-				0770DE2428D08FBA006D8A5D /* AppStorage.swift */,
+				0770DE2428D08FBA006D8A5D /* CoreStorage.swift */,
 				02512FEF299533DE0024D438 /* CoreDataHandlerProtocol.swift */,
 			);
 			path = Data;
@@ -793,7 +793,7 @@
 				021D925728DCF12900ACC565 /* AlertView.swift in Sources */,
 				027BD3A82909474200392132 /* KeyboardAvoidingViewController.swift in Sources */,
 				0770DE7B28D0C78C006D8A5D /* Theme.swift in Sources */,
-				0770DE2528D08FBA006D8A5D /* AppStorage.swift in Sources */,
+				0770DE2528D08FBA006D8A5D /* CoreStorage.swift in Sources */,
 				020306CC2932C0C4000949EA /* PickerView.swift in Sources */,
 				027BD3C52909707700392132 /* Shake.swift in Sources */,
 				027BD39C2908810C00392132 /* RegisterUser.swift in Sources */,

diff --git a/Core/Core/Data/CoreStorage.swift b/Core/Core/Data/CoreStorage.swift
@@ -0,0 +1,17 @@
+//
+//  CoreStorage.swift
+//  Core
+//
+//  Created by Vladimir Chekyrta on 13.09.2022.
+//
+
+import Foundation
+
+public protocol CoreStorage {
+    var accessToken: String? {get set}
+    var refreshToken: String? {get set}
+    var cookiesDate: String? {get set}
+    var user: DataLayer.User? {get set}
+    var userSettings: UserSettings? {get set}
+    func clear()
+}
diff --git a/Core/Core/Data/Repository/AuthRepository.swift b/Core/Core/Data/Repository/AuthRepository.swift
@@ -19,10 +19,10 @@ public protocol AuthRepositoryProtocol {
 public class AuthRepository: AuthRepositoryProtocol {
 
     private let api: API
-    private let appStorage: AppStorage
+    private var appStorage: CoreStorage
     private let config: Config
 
-    public init(api: API, appStorage: AppStorage, config: Config) {
+    public init(api: API, appStorage: CoreStorage, config: Config) {
         self.api = api
         self.appStorage = appStorage
         self.config = config

diff --git a/Core/Core/Network/DownloadManager.swift b/Core/Core/Network/DownloadManager.swift
@@ -71,15 +71,15 @@ public protocol DownloadManagerProtocol {
 public class DownloadManager: DownloadManagerProtocol {
 
     private let persistence: CorePersistenceProtocol
-    private let appStorage: Core.AppStorage
+    private let appStorage: CoreStorage
     private let connectivity: ConnectivityProtocol
     private var downloadRequest: DownloadRequest?
     private var currentDownload: DownloadData?
     private var isDownloadingInProgress: Bool = false
 
     public init(
         persistence: CorePersistenceProtocol,
-        appStorage: Core.AppStorage,
+        appStorage: CoreStorage,
         connectivity: ConnectivityProtocol
     ) {
         self.persistence = persistence

diff --git a/Core/Core/Network/RequestInterceptor.swift b/Core/Core/Network/RequestInterceptor.swift
@@ -11,11 +11,11 @@ import Alamofire
 final public class RequestInterceptor: Alamofire.RequestInterceptor {
 
     private let config: Config
-    private let appStorage: AppStorage
+    private var storage: CoreStorage
 
-    public init(config: Config, appStorage: AppStorage) {
+    public init(config: Config, storage: CoreStorage) {
         self.config = config
-        self.appStorage = appStorage
+        self.storage = storage
     }
 
     private let lock = NSLock()
@@ -34,7 +34,7 @@ final public class RequestInterceptor: Alamofire.RequestInterceptor {
             var urlRequest = urlRequest
 
             // Set the Authorization header value using the access token.
-            if let token = appStorage.accessToken {
+            if let token = storage.accessToken {
                 urlRequest.setValue("Bearer " + token, forHTTPHeaderField: "Authorization")
             }
 
@@ -57,7 +57,7 @@ final public class RequestInterceptor: Alamofire.RequestInterceptor {
                 return completion(.doNotRetry)
             }
 
-            guard let token = appStorage.refreshToken else {
+            guard let token = storage.refreshToken else {
                 return completion(.doNotRetryWithError(error))
             }
 
@@ -117,8 +117,8 @@ final public class RequestInterceptor: Alamofire.RequestInterceptor {
                               refreshToken.count > 0 else {
                             return completion(false)
                         }
-                        self.appStorage.accessToken = accessToken
-                        self.appStorage.refreshToken = refreshToken
+                        self.storage.accessToken = accessToken
+                        self.storage.refreshToken = refreshToken
                         completion(true)
                     } catch {
                         completion(false)

diff --git a/Course/Course/Data/CourseRepository.swift b/Course/Course/Data/CourseRepository.swift
@@ -24,12 +24,12 @@ public protocol CourseRepositoryProtocol {
 public class CourseRepository: CourseRepositoryProtocol {
 
     private let api: API
-    private let appStorage: AppStorage
+    private let appStorage: CoreStorage
     private let config: Config
     private let persistence: CoursePersistenceProtocol
 
     public init(api: API,
-                appStorage: AppStorage,
+                appStorage: CoreStorage,
                 config: Config,
                 persistence: CoursePersistenceProtocol) {
         self.api = api

diff --git a/Dashboard/Dashboard/Data/DashboardRepository.swift b/Dashboard/Dashboard/Data/DashboardRepository.swift
@@ -16,20 +16,20 @@ public protocol DashboardRepositoryProtocol {
 public class DashboardRepository: DashboardRepositoryProtocol {
 
     private let api: API
-    private let appStorage: AppStorage
+    private let storage: CoreStorage
     private let config: Config
     private let persistence: DashboardPersistenceProtocol
 
-    public init(api: API, appStorage: AppStorage, config: Config, persistence: DashboardPersistenceProtocol) {
+    public init(api: API, storage: CoreStorage, config: Config, persistence: DashboardPersistenceProtocol) {
         self.api = api
-        self.appStorage = appStorage
+        self.storage = storage
         self.config = config
         self.persistence = persistence
     }
 
     public func getMyCourses(page: Int) async throws -> [CourseItem] {
         let result = try await api.requestData(
-            DashboardEndpoint.getMyCourses(username: appStorage.user?.username ?? "", page: page)
+            DashboardEndpoint.getMyCourses(username: storage.user?.username ?? "", page: page)
         )
             .mapResponse(DataLayer.CourseEnrollments.self)
             .domain(baseURL: config.baseURL.absoluteString)

diff --git a/Discovery/Discovery/Data/DiscoveryRepository.swift b/Discovery/Discovery/Data/DiscoveryRepository.swift
@@ -19,12 +19,12 @@ public protocol DiscoveryRepositoryProtocol {
 public class DiscoveryRepository: DiscoveryRepositoryProtocol {
 
     private let api: API
-    private let appStorage: AppStorage
+    private let appStorage: CoreStorage
     private let config: Config
     private let persistence: DiscoveryPersistenceProtocol
 
     public init(api: API,
-                appStorage: AppStorage,
+                appStorage: CoreStorage,
                 config: Config,
                 persistence: DiscoveryPersistenceProtocol) {
         self.api = api

diff --git a/Discussion/Discussion/Data/Model/Data_CreatedComment.swift b/Discussion/Discussion/Data/Model/Data_CreatedComment.swift
@@ -61,9 +61,7 @@ public extension DataLayer {
 public extension DataLayer.CreatedComment {
     var domain: Post {
         Post(authorName: author ?? DiscussionLocalization.anonymous,
-             authorAvatar: profileImage.imageURLSmall?.addingPercentEncoding(
-                withAllowedCharacters: .urlHostAllowed
-             ) ?? "",
+             authorAvatar: profileImage.imageURLSmall ?? "",
              postDate: Date(iso8601: createdAt),
              postTitle: "",
              postBodyHtml: renderedBody,

diff --git a/Discussion/Discussion/Data/Network/DiscussionRepository.swift b/Discussion/Discussion/Data/Network/DiscussionRepository.swift
@@ -36,11 +36,11 @@ public protocol DiscussionRepositoryProtocol {
 public class DiscussionRepository: DiscussionRepositoryProtocol {
 
     private let api: API
-    private let appStorage: AppStorage
+    private let appStorage: CoreStorage
     private let config: Config
     private let router: DiscussionRouter
 
-    public init(api: API, appStorage: AppStorage, config: Config, router: DiscussionRouter) {
+    public init(api: API, appStorage: CoreStorage, config: Config, router: DiscussionRouter) {
         self.api = api
         self.appStorage = appStorage
         self.config = config

diff --git a/Discussion/Discussion/Presentation/Comments/Base/BaseResponsesViewModel.swift b/Discussion/Discussion/Presentation/Comments/Base/BaseResponsesViewModel.swift
@@ -24,7 +24,7 @@ public class BaseResponsesViewModel {
     public var totalPages = 1
     @Published public var itemsCount = 0
     public var fetchInProgress = false
-
+    
     var errorMessage: String? {
         didSet {
             withAnimation {
@@ -44,19 +44,16 @@ public class BaseResponsesViewModel {
     internal let interactor: DiscussionInteractorProtocol
     internal let router: DiscussionRouter
     internal let config: Config
-    internal let storage: Core.AppStorage
-
     internal let addPostSubject = CurrentValueSubject<Post?, Never>(nil)
 
-    init(interactor: DiscussionInteractorProtocol,
-         router: DiscussionRouter,
-         config: Config,
-         storage: Core.AppStorage
+    init(
+        interactor: DiscussionInteractorProtocol,
+        router: DiscussionRouter,
+        config: Config
     ) {
         self.interactor = interactor
         self.router = router
         self.config = config
-        self.storage = storage
     }
 
     @MainActor
@@ -137,7 +134,6 @@ public class BaseResponsesViewModel {
 
     func addNewPost(_ post: Post) {
         var newPostWithAvatar = post
-        newPostWithAvatar.authorAvatar = storage.userProfile?.profileImage?.imageURLLarge ?? ""
         postComments?.comments.append(newPostWithAvatar)
         itemsCount += 1
     }

diff --git a/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift b/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift
@@ -7,7 +7,6 @@
 
 import SwiftUI
 import Core
-import Kingfisher
 import Combine
 
 public struct ResponsesView: View {
@@ -208,7 +207,6 @@ struct ResponsesView_Previews: PreviewProvider {
             interactor: DiscussionInteractor(repository: DiscussionRepositoryMock()),
             router: DiscussionRouterMock(),
             config: ConfigMock(),
-            storage: .mock,
             threadStateSubject: .init(nil)
         )
         let post = Post(

diff --git a/Discussion/Discussion/Presentation/Comments/Responses/ResponsesViewModel.swift b/Discussion/Discussion/Presentation/Comments/Responses/ResponsesViewModel.swift
@@ -20,11 +20,10 @@ public class ResponsesViewModel: BaseResponsesViewModel, ObservableObject {
         interactor: DiscussionInteractorProtocol,
         router: DiscussionRouter,
         config: Config,
-        storage: Core.AppStorage,
         threadStateSubject: CurrentValueSubject<ThreadPostState?, Never>
     ) {
         self.threadStateSubject = threadStateSubject
-        super.init(interactor: interactor, router: router, config: config, storage: storage)
+        super.init(interactor: interactor, router: router, config: config)
     }
 
     func generateCommentsResponses(comments: [UserComment], parentComment: Post) -> Post? {