fixed eventForm navigation Issue and send empty phone when login issue

+ HttpError description make public

Author: saroar

Addame/Modules/Views/AuthenticationCore/Package.swift

@@ -25,13 +25,15 @@ let package = Package(
     .package(path: "\(Path.Container.core)/Common"),
     .package(path: "\(Path.Container.core)/PhoneNumberCommon"),
     .package(path: "\(Path.Container.domains)/AddaMeModels"),
-    .package(path: "\(Path.Container.services)/AuthClient")
+    .package(path: "\(Path.Container.services)/AuthClient"),
+    .package(path: "\(Path.Container.core)/KeychainService"),
   ],
   targets: [
     .target(
       name: "AuthenticationCore",
       dependencies: [
         "Common", "PhoneNumberCommon", "AddaMeModels", "AuthClient",
+        "KeychainService", 
         .product(name: "AuthClientLive", package: "AuthClient"),
       ]),
     .testTarget(

Addame/Modules/Views/AuthenticationCore/Sources/AuthenticationCore/AuthenticationCore.swift

@@ -7,6 +7,7 @@ import PhoneNumberKit
 import AddaMeModels
 import AuthClient
 import AuthClientLive
+import KeychainService
 
 struct AuthenticationCore {}
 
@@ -24,7 +25,6 @@ public struct LoginState: Equatable {
   public var isLoginRequestInFlight = false
   @AppStorage("isAuthorized") public var isAuthorized: Bool = false
   @AppStorage("isUserFirstNameEmpty") public var isUserFirstNameEmpty: Bool = true
-  public var isValidPhoneNumber: Bool = false
   public var showTermsSheet: Bool = false
   public var showPrivacySheet: Bool = false
 }
@@ -33,8 +33,7 @@ public enum LoginAction: Equatable {
   case alertDismissed
   case showTermsSheet
   case showPrivacySheet
-  case sendPhoneNumberButtonTapped
-  case loginRequest(String)
+  case sendPhoneNumberButtonTapped(String)
   case verificationRequest(String)
   case loninResponse(Result<AuthResponse, HTTPError>)
   case verificationResponse(Result<LoginRes, HTTPError>)
@@ -58,20 +57,21 @@ public let loginReducer = Reducer<LoginState, LoginAction, AuthenticationEnviron
   case .alertDismissed:
     state.alert = nil
     return .none
-  case .sendPhoneNumberButtonTapped:
+  case .sendPhoneNumberButtonTapped(let phoneNumber):
     state.isLoginRequestInFlight = true
 
+    let phoneNumberKit = PhoneNumberKit()
+    let parseNumber = try? phoneNumberKit.parse(phoneNumber)
+    let e164PhoneNumber = phoneNumberKit.format(parseNumber!, toType: .e164)
+    
+    state.authResponse.phoneNumber = e164PhoneNumber
+    
     return environment.authClient
       .login(state.authResponse)
       .receive(on: environment.mainQueue)
       .catchToEffect()
       .map(LoginAction.loninResponse)
 
-  case let .loginRequest(phoneNumber):
-    state.authResponse.phoneNumber = phoneNumber
-    
-    return .none
-    
   case let .verificationRequest(code):
     if code.count == 6 {
       state.isLoginRequestInFlight = true
@@ -95,19 +95,22 @@ public let loginReducer = Reducer<LoginState, LoginAction, AuthenticationEnviron
   case .loninResponse(.failure(let error)):
     state.isLoginRequestInFlight = false
     state.isValidationCodeIsSend = false
-    state.alert = .init(title: TextState(error.localizedDescription))
+    state.alert = .init(title: TextState(error.description))
 
     return .none
 
   case .verificationResponse(.success(let loginRes)):
+  
     state.isLoginRequestInFlight = false
     state.isAuthorized = true
     state.isUserFirstNameEmpty = loginRes.user.firstName == nil ? false : true
-//    saveCurrentUserAndToken(loginRes)
+  
+    KeychainService.save(codable: loginRes.user, for: .user)
+    KeychainService.save(codable: loginRes.access, for: .token)
     return .none
 
   case .verificationResponse(.failure(let error)):
-    state.alert = .init(title: TextState(error.localizedDescription))
+    state.alert = .init(title: TextState(error.description))
     state.isLoginRequestInFlight = false
 
     return .none
@@ -119,12 +122,7 @@ public let loginReducer = Reducer<LoginState, LoginAction, AuthenticationEnviron
   case .showPrivacySheet:
     state.showPrivacySheet = true
     return .none
-    
+
   }
 
 }
-
-//private func saveCurrentUserAndToken(_ res: LoginRes) {
-//  KeychainService.save(codable: res.user, for: .user)
-//  KeychainService.save(codable: res.access, for: .token)
-//}

Addame/Modules/Views/AuthenticationCore/Sources/AuthenticationCore/AuthenticationView.swift

@@ -7,7 +7,6 @@
 
 import SwiftUI
 import ComposableArchitecture
-import Common
 import PhoneNumberKit
 import AddaMeModels
 import AuthClient
@@ -37,7 +36,7 @@ public struct PhoneNumberTextFieldView: UIViewRepresentable, Equatable {
     return phoneTextField
   }
 
-  func getCurrentText() {
+  public func getCurrentText() {
     self.phoneNumber = phoneTextField.text!
   }
 
@@ -63,6 +62,7 @@ public struct AuthenticationView: View {
   private var baseURL: URL { URL(string:  "http://0.0.0.0:8080/v1/")! }
   @State private var phoneField: PhoneNumberTextFieldView?
   @State private var isValidPhoneNumber: Bool = false
+  @State private var phoneNumber: String = String.empty
 
   let store: Store<LoginState, LoginAction>
 
@@ -78,7 +78,8 @@ public struct AuthenticationView: View {
         .padding(.leading)
 
       Button(action: {
-        viewStore.send(.sendPhoneNumberButtonTapped)
+        self.phoneField?.getCurrentText()
+        viewStore.send(.sendPhoneNumberButtonTapped(self.phoneNumber))
       }, label: {
         Text("GO")
           .font(.headline)
@@ -99,7 +100,7 @@ public struct AuthenticationView: View {
     )
     .onAppear {
       self.phoneField = PhoneNumberTextFieldView(
-        phoneNumber: viewStore.binding(get: { $0.authResponse!.phoneNumber }, send: ViewAction.loginRequest ),
+        phoneNumber: self.$phoneNumber,
         isValid: $isValidPhoneNumber
       )
     }
@@ -265,7 +266,6 @@ extension AuthenticationView {
     public var isValidationCodeIsSend = false
     public var isLoginRequestInFlight = false
     public var isAuthorized: Bool = false
-    public var isValidPhoneNumber: Bool = false
     public var showTermsSheet: Bool = false
     public var showPrivacySheet: Bool = false
   }
@@ -274,8 +274,7 @@ extension AuthenticationView {
     case alertDismissed
     case showTermsSheet
     case showPrivacySheet
-    case sendPhoneNumberButtonTapped
-    case loginRequest(String)
+    case sendPhoneNumberButtonTapped(String)
     case verificationRequest(String)
   }
 }
@@ -289,7 +288,6 @@ extension LoginState {
       isValidationCodeIsSend: self.isValidationCodeIsSend,
       isLoginRequestInFlight: self.isLoginRequestInFlight,
       isAuthorized: self.isAuthorized,
-      isValidPhoneNumber: self.isValidPhoneNumber,
       showTermsSheet: self.showTermsSheet,
       showPrivacySheet: self.showPrivacySheet
     )
@@ -301,10 +299,8 @@ extension LoginAction {
     switch localAction {
     case .alertDismissed:
       return .alertDismissed
-    case .sendPhoneNumberButtonTapped:
-      return .sendPhoneNumberButtonTapped
-    case .loginRequest(let authResponse):
-      return .loginRequest(authResponse)
+    case .sendPhoneNumberButtonTapped(let phoneNumber):
+      return .sendPhoneNumberButtonTapped(phoneNumber)
     case .verificationRequest(let authResponse):
       return .verificationRequest(authResponse)
     case .showTermsSheet:

Addame/Modules/Views/EventView/Sources/EventView/EventReducer.swift

@@ -16,13 +16,7 @@ struct Foo {
   public static var isAuthorized: Bool = false
 }
 
-public let eventReducer = Reducer<EventsState, EventsAction, EventsEnvironment>.combine(
-  eventFormReducer.optional().pullback(
-    state: \.eventFormState,
-    action: /EventsAction.eventForm,
-    environment: { _ in () }
-  ),
-  Reducer { state, action, environment in
+public let eventReducer = Reducer<EventsState, EventsAction, EventsEnvironment> { state, action, environment in
     struct LocationManagerId: Hashable {}
 
     func fetchMoreEventIfNeeded() -> Effect<EventsAction, Never>  {
@@ -69,17 +63,7 @@ public let eventReducer = Reducer<EventsState, EventsAction, EventsEnvironment>.
     switch action {
 
     case let .presentEventForm(present):
-
-      return .none
-    case .eventForm(.didDisappear):
-      if state.isPresentingEventForm == false, let eventform = state.eventFormState {
-        state.eventFormState = nil
-        return cancelEventFormReducerEffects(state: eventform)
-      }
-      return .none
-
-    case .eventForm(.didAppear):
-      
+      state.eventFormState = present ? EventFormState() : nil
       return .none
 
     case .dismissEvent:
@@ -97,15 +81,6 @@ public let eventReducer = Reducer<EventsState, EventsAction, EventsEnvironment>.
           .requestWhenInUseAuthorization(id: LocationManagerId())
           .fireAndForget()
       )
-
-    case .isPresentingEventForm:
-      state.isPresentingEventForm = true
-      
-      if state.isPresentingEventForm {
-        state.eventFormState = EventFormState()
-      }
-      
-      return .none
 
     case .alertDismissed:
       state.alert = nil
@@ -143,7 +118,7 @@ public let eventReducer = Reducer<EventsState, EventsAction, EventsEnvironment>.
 
     case .eventsResponse(.failure(let error)):
       state.isLoadingPage = false
-      state.alert = .init(title: TextState(error.localizedDescription))
+      state.alert = .init(title: TextState(error.description))
 
       return .none
 
@@ -313,6 +288,9 @@ public let eventReducer = Reducer<EventsState, EventsAction, EventsEnvironment>.
       state.eventDetails = nil
       return .none
 
+    case .eventForm(_):
+      
+      return .none
     }
   }
-)
+

Addame/Modules/Views/EventView/Sources/EventView/EventView.swift

@@ -11,7 +11,6 @@ import SwiftUIExtension
 extension EventView {
   public struct ViewState: Equatable {
     public var alert: AlertState<EventsAction>?
-    public var isPresentingEventForm: Bool
     public var isConnected = true
     public var isLocationAuthorized = false
     public var waitingForUpdateLocation = true
@@ -21,12 +20,13 @@ extension EventView {
     public var myEvents: [EventResponse.Item] = []
     public var eventDetails: EventResponse.Item?
     public var isLoadingPage = false
+    
+    public var eventFormState: EventFormState?
   }
 
   public enum ViewAction: Equatable {
     case alertDismissed
     case dismissEventDetails
-    case isPresentingEventForm
     case presentEventForm(Bool)
     case eventForm(EventFormAction)
     case event(index: Int, action: EventAction)
@@ -132,41 +132,29 @@ public struct EventView: View {
       }
       .navigationBarTitleDisplayMode(.automatic)
       .toolbar {
-        
         ToolbarItem(placement: ToolbarItemPlacement.navigationBarTrailing) {
           return Button(action: {
-            viewStore.send(.isPresentingEventForm)
+            viewStore.send(.presentEventForm(true))
           }) {
             Image(systemName: "plus.circle")
               .font(.title)
               .foregroundColor(viewStore.state.isLocationAuthorized ? Color.black : Color.gray)
           }
-          .disabled(!viewStore.state.isLocationAuthorized)
-          .background(
-            NavigationLink(
-              destination: IfLetStore(
-                store.scope(
-                  state: \.eventFormState,
-                  action: EventsAction.eventForm
-                ),
-                then: EventFormView.init(store:),
-                else: Text("Loading search results...")
-              ),
-              isActive: viewStore.binding(
-                get: \.isPresentingEventForm,
-                send: ViewAction.presentEventForm
-              ),
-              label: {
-                Text("Event From").padding()
-              }
-            )
-          )
         }
       }
       .navigationTitle("Events")
       .alert(self.store.scope(state: { $0.alert }), dismiss: .alertDismissed)
-      
     }
+    .navigate(
+      using: store.scope(
+        state: \.eventFormState,
+        action: EventsAction.eventForm
+      ),
+      destination: EventFormView.init(store:),
+      onDismiss: {
+        ViewStore(store.stateless).send(.presentEventForm(false))
+      }
+    )
   }
 
 }
@@ -191,7 +179,7 @@ struct EventView_Previews: PreviewProvider {
       NavigationView {
         EventView(store: store)
 //          .redacted(reason: .placeholder)
-          .redacted(reason: EventsState.events.isLoadingPage ? .placeholder : [])
+//          .redacted(reason: EventsState.events.isLoadingPage ? .placeholder : [])
           .environment(\.colorScheme, .dark)
       }
     }

Addame/Modules/Views/EventView/Sources/EventView/EventsAction.swift

@@ -16,7 +16,7 @@ public enum EventsAction: Equatable {
 
   case alertDismissed
   case dismissEventDetails
-  case isPresentingEventForm
+//  case isPresentingEventForm
   case presentEventForm(Bool)
   case eventForm(EventFormAction)
 
@@ -47,8 +47,7 @@ extension EventsAction {
       return .alertDismissed
     case .dismissEventDetails:
       return .dismissEventDetails
-    case .isPresentingEventForm:
-      return .isPresentingEventForm
+
     case .presentEventForm(let bool):
       return .presentEventForm(bool)
     case .eventForm(let eventFormAction):