fixing bug of auth not working every other time and resolving the issue with firestore service build errors
This commit is contained in:
@@ -33,7 +33,7 @@
|
|||||||
"repositoryURL": "https://github.com/firebase/firebase-ios-sdk",
|
"repositoryURL": "https://github.com/firebase/firebase-ios-sdk",
|
||||||
"state": {
|
"state": {
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"revision": "526f8ca35f9dcf3f1b0aeb94c995f058691b2c26",
|
"revision": "480178b0871217c5f4fd3dd3c3a309c78c1d5c4c",
|
||||||
"version": null
|
"version": null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ struct PhoneVerificationView: View {
|
|||||||
|
|
||||||
@FocusState private var focusedInputField: Bool
|
@FocusState private var focusedInputField: Bool
|
||||||
|
|
||||||
|
|
||||||
|
@State var navigateNext = false
|
||||||
|
|
||||||
// TODO: format the input so that it shows the parentheses and stuff (949)923-0445
|
// TODO: format the input so that it shows the parentheses and stuff (949)923-0445
|
||||||
var body: some View {
|
var body: some View {
|
||||||
ZStack(alignment: .topLeading) {
|
ZStack(alignment: .topLeading) {
|
||||||
@@ -40,6 +43,10 @@ struct PhoneVerificationView: View {
|
|||||||
OnboardingTemplateView(hdrText: "Let's get you verified", imgName: "undraw_my_password_d-6-kg", bottomActArea: AnyView(
|
OnboardingTemplateView(hdrText: "Let's get you verified", imgName: "undraw_my_password_d-6-kg", bottomActArea: AnyView(
|
||||||
VStack {
|
VStack {
|
||||||
HStack {
|
HStack {
|
||||||
|
PushView(destination: PhoneCodeVerificationView(), isActive: self.$navigateNext) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
Text("+\(ccode)")
|
Text("+\(ccode)")
|
||||||
.padding()
|
.padding()
|
||||||
.background(.ultraThinMaterial)
|
.background(.ultraThinMaterial)
|
||||||
@@ -89,14 +96,14 @@ struct PhoneVerificationView: View {
|
|||||||
// TODO: do all of this in view model
|
// TODO: do all of this in view model
|
||||||
// do auth stuff from firebase
|
// do auth stuff from firebase
|
||||||
PhoneAuthProvider.provider()
|
PhoneAuthProvider.provider()
|
||||||
.verifyPhoneNumber(concatPhoneNumber, uiDelegate: nil) { verificationID, error in
|
.verifyPhoneNumber(concatPhoneNumber, uiDelegate: nil) {verificationID, error in
|
||||||
print("firebase auth done, now running my callback")
|
print("firebase auth done, now running my callback")
|
||||||
|
|
||||||
// got a response...done loading... either error to show or next page
|
|
||||||
self.isLoading.toggle()
|
|
||||||
|
|
||||||
// problem verifying number showing alert...maybe fake number or something from user
|
// problem verifying number showing alert...maybe fake number or something from user
|
||||||
if error != nil {
|
if error != nil {
|
||||||
|
// turn off loading page...have an error to show
|
||||||
|
self.isLoading.toggle()
|
||||||
|
|
||||||
self.toastText = "⚠️ Please try again."
|
self.toastText = "⚠️ Please try again."
|
||||||
self.toastSubMessage = "There was an issue validating your phone number"
|
self.toastSubMessage = "There was an issue validating your phone number"
|
||||||
self.showToast.toggle()
|
self.showToast.toggle()
|
||||||
@@ -109,7 +116,8 @@ struct PhoneVerificationView: View {
|
|||||||
// use this in the next screen to verify with the code provided
|
// use this in the next screen to verify with the code provided
|
||||||
UserDefaults.standard.set(verificationID, forKey: "authVerificationID")
|
UserDefaults.standard.set(verificationID, forKey: "authVerificationID")
|
||||||
|
|
||||||
self.navigationStack.push(PhoneCodeVerificationView()) // verify code page
|
// self.navigationStack.push(PhoneCodeVerificationView()) // verify code page
|
||||||
|
self.navigateNext.toggle()
|
||||||
}
|
}
|
||||||
} label: {
|
} label: {
|
||||||
VStack {
|
VStack {
|
||||||
|
|||||||
Reference in New Issue
Block a user