@@ -881,44 +881,28 @@ struct SettingsTab: View {
881881self.manualGatewayTLS = link.tls
882882883883let trimmedInstanceId = GatewaySettingsStore.currentInstanceID()
884-let trimmedBootstrapToken =
885- link.bootstrapToken?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
886-if !trimmedBootstrapToken.isEmpty {
884+let setupAuth = GatewayConnectionController.ManualAuthOverride.setupAuth(from: link)
885+if setupAuth.hasBootstrapToken {
887886GatewayOnboardingReset.prepareForBootstrapPairing(
888887 appModel: self.appModel,
889888 instanceId: trimmedInstanceId)
890889}
891890if !trimmedInstanceId.isEmpty {
892-GatewaySettingsStore.saveGatewayBootstrapToken(trimmedBootstrapToken, instanceId: trimmedInstanceId)
891+GatewaySettingsStore.saveGatewayBootstrapToken(setupAuth.bootstrapToken, instanceId: trimmedInstanceId)
893892}
894-let trimmedToken = link.token?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
895-let trimmedPassword = link.password?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
896-if !trimmedToken.isEmpty {
897-self.gatewayToken = trimmedToken
893+if setupAuth.shouldApplyTokenField {
894+self.gatewayToken = setupAuth.token
898895if !trimmedInstanceId.isEmpty {
899-GatewaySettingsStore.saveGatewayToken(trimmedToken, instanceId: trimmedInstanceId)
900-}
901-} else if !trimmedBootstrapToken.isEmpty {
902-self.gatewayToken = ""
903-if !trimmedInstanceId.isEmpty {
904-GatewaySettingsStore.saveGatewayToken("", instanceId: trimmedInstanceId)
896+GatewaySettingsStore.saveGatewayToken(setupAuth.token, instanceId: trimmedInstanceId)
905897}
906898}
907-if !trimmedPassword.isEmpty {
908-self.gatewayPassword = trimmedPassword
909-if !trimmedInstanceId.isEmpty {
910-GatewaySettingsStore.saveGatewayPassword(trimmedPassword, instanceId: trimmedInstanceId)
911-}
912-} else if !trimmedBootstrapToken.isEmpty {
913-self.gatewayPassword = ""
899+if setupAuth.shouldApplyPasswordField {
900+self.gatewayPassword = setupAuth.password
914901if !trimmedInstanceId.isEmpty {
915-GatewaySettingsStore.saveGatewayPassword("", instanceId: trimmedInstanceId)
902+GatewaySettingsStore.saveGatewayPassword(setupAuth.password, instanceId: trimmedInstanceId)
916903}
917904}
918-self.pendingManualAuthOverride = GatewayConnectionController.ManualAuthOverride.normalized(
919- token: trimmedToken,
920- bootstrapToken: trimmedBootstrapToken,
921- password: trimmedPassword)
905+self.pendingManualAuthOverride = setupAuth.manualAuthOverride
922906}
923907924908private func openGatewayQRScanner() {
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。