hendrik-hog/Nextcloud-Cookbook-iOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Login Procedure updated (login via in-app browser)

Browse Source
This commit is contained in:
VincentMeilinger
2024-02-04 16:48:51 +01:00
parent 650fe322ca
commit 05aff9e43e
3 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcuserdata/vincie.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

3
Nextcloud Cookbook iOS Client/Localizable.xcstrings
View File

@@ -1018,6 +1018,9 @@
}
}
}
},
"Done" : {
},
"Downloads" : {
"localizations" : {

102
Nextcloud Cookbook iOS Client/Views/Onboarding/V2LoginView.swift
View File

@@ -7,6 +7,7 @@
import Foundation
import SwiftUI
import WebKit
enum V2LoginStage: LoginStage {
case login, validate
@@ -34,6 +35,7 @@ struct V2LoginView: View {
@State var loginStage: V2LoginStage = .login
@State var loginRequest: LoginV2Request? = nil
@State var presentBrowser = false
// TextField handling
enum Field {
@@ -84,7 +86,8 @@ struct V2LoginView: View {
showAlert = true
}
if let loginRequest = loginRequest {
await UIApplication.shared.open(URL(string: loginRequest.login)!)
presentBrowser = true
//await UIApplication.shared.open(URL(string: loginRequest.login)!)
} else {
alertMessage = "Unable to reach server. Please check your server address and internet connection."
showAlert = true
@@ -110,7 +113,49 @@ struct V2LoginView: View {
// fetch login v2 response
Task {
let (response, error) = await fetchLoginV2Response()
checkLogin(response: response, error: error)
}
} label: {
Text("Validate")
.foregroundColor(.white)
.font(.headline)
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.stroke(Color.white, lineWidth: 2)
.foregroundColor(.clear)
)
}
.disabled(loginRequest == nil ? true : false)
.padding()
}
}
}
}
.sheet(isPresented: $presentBrowser, onDismiss: {
Task {
let (response, error) = await fetchLoginV2Response()
checkLogin(response: response, error: error)
}
}) {
if let loginRequest = loginRequest {
WebViewSheet(url: loginRequest.login)
}
}
}
func sendLoginV2Request() async -> NetworkError? {
let (req, error) = await NextcloudApi.loginV2Request()
self.loginRequest = req
return error
}
func fetchLoginV2Response() async -> (LoginV2Response?, NetworkError?) {
guard let loginRequest = loginRequest else { return (nil, .parametersNil) }
return await NextcloudApi.loginV2Response(req: loginRequest)
}
func checkLogin(response: LoginV2Response?, error: NetworkError?) {
if let error = error {
alertMessage = "Login failed. Please login via the browser and try again. (\(error.rawValue))"
showAlert = true
@@ -131,33 +176,36 @@ struct V2LoginView: View {
}
UserSettings.shared.onboarding = false
}
} label: {
Text("Validate")
.foregroundColor(.white)
.font(.headline)
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.stroke(Color.white, lineWidth: 2)
.foregroundColor(.clear)
)
}
.disabled(loginRequest == nil ? true : false)
.padding()
}
}
}
}
}
}
func sendLoginV2Request() async -> NetworkError? {
let (req, error) = await NextcloudApi.loginV2Request()
self.loginRequest = req
return error
}
func fetchLoginV2Response() async -> (LoginV2Response?, NetworkError?) {
guard let loginRequest = loginRequest else { return (nil, .parametersNil) }
return await NextcloudApi.loginV2Response(req: loginRequest)
// Login WebView logic
struct WebViewSheet: View {
@Environment(\.dismiss) var dismiss
@State var url: String
var body: some View {
NavigationView {
WebView(url: URL(string: url)!)
.navigationBarTitle(Text("Nextcloud Login"), displayMode: .inline)
.navigationBarItems(trailing: Button("Done") {
dismiss()
})
}
}
}
struct WebView: UIViewRepresentable {
let url: URL
func makeUIView(context: Context) -> WKWebView {
return WKWebView()
}
func updateUIView(_ uiView: WKWebView, context: Context) {
let request = URLRequest(url: url)
uiView.load(request)
}
}