Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-10-22 07:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract instance/account validation status view

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-09-28 22:33:12 +02:00
parent 7446c945b5
commit 78a0291e5d
8 changed files with 112 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Model/AccountValidator.swift
View File

@@ -7,23 +7,26 @@ final class AccountValidator: Service {
let account: Instance.Account?
var formObjectID: Binding<String>
var valid: Binding<Bool>
var validated: Binding<Bool>
var isValid: Binding<Bool>
var isValidated: Binding<Bool>
var isValidating: Binding<Bool>
var error: Binding<String?>?
init(
url: String,
account: Instance.Account? = nil,
id: Binding<String>,
valid: Binding<Bool>,
validated: Binding<Bool>,
isValid: Binding<Bool>,
isValidated: Binding<Bool>,
isValidating: Binding<Bool>,
error: Binding<String?>? = nil
) {
self.url = url
self.account = account
formObjectID = id
self.valid = valid
self.validated = validated
self.isValid = isValid
self.isValidated = isValidated
self.isValidating = isValidating
self.error = error
super.init(baseURL: url)
@@ -50,18 +53,20 @@ final class AccountValidator: Service {
return
}
self.valid.wrappedValue = true
self.isValid.wrappedValue = true
self.error?.wrappedValue = nil
self.validated.wrappedValue = true
}
.onFailure { error in
guard self.url == self.formObjectID.wrappedValue else {
return
}
self.valid.wrappedValue = false
self.isValid.wrappedValue = false
self.error?.wrappedValue = error.userMessage
self.validated.wrappedValue = true
}
.onCompletion { _ in
self.isValidated.wrappedValue = true
self.isValidating.wrappedValue = false
}
}
@@ -75,22 +80,25 @@ final class AccountValidator: Service {
return
}
self.valid.wrappedValue = true
self.validated.wrappedValue = true
self.isValid.wrappedValue = true
}
.onFailure { _ in
guard self.account!.sid == self.formObjectID.wrappedValue else {
return
}
self.valid.wrappedValue = false
self.validated.wrappedValue = true
self.isValid.wrappedValue = false
}
.onCompletion { _ in
self.isValidated.wrappedValue = true
self.isValidating.wrappedValue = false
}
}
func reset() {
valid.wrappedValue = false
validated.wrappedValue = false
isValid.wrappedValue = false
isValidated.wrappedValue = false
isValidating.wrappedValue = false
error?.wrappedValue = nil
}

9
Model/InvidiousAPI.swift
View File

@@ -11,15 +11,6 @@ final class InvidiousAPI: Service, ObservableObject {
@Published var validInstance = true
@Published var signedIn = true
init() {
super.init()
#if os(tvOS)
// TODO: remove
setAccount(.init(id: UUID(), name: "", url: "https://invidious.home.arekf.net", sid: "RpoS7YPPK2-QS81jJF9z4KSQAjmzsOnMpn84c73-GQ8="))
#endif
}
func setAccount(_ account: Instance.Account) {
self.account = account