Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Brand/Intro/NCIntroViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class NCIntroViewController: UIViewController, UICollectionViewDataSource, UICol
private var timer: Timer?
private var textColor: UIColor = .white
private var textColorOpponent: UIColor = .black
private var activeLoginProvider: NCLoginProvider?

// MARK: - View Life Cycle

Expand Down Expand Up @@ -164,11 +165,12 @@ class NCIntroViewController: UIViewController, UICollectionViewDataSource, UICol
}

@IBAction func signupWithProvider(_ sender: Any) {
if let viewController = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginProvider") as? NCLoginProvider {
viewController.controller = self.controller
viewController.initialURLString = NCBrandOptions.shared.linkloginPreferredProviders
self.navigationController?.pushViewController(viewController, animated: true)
}
let loginProvider = NCLoginProvider()
loginProvider.controller = self.controller
loginProvider.initialURLString = NCBrandOptions.shared.linkloginPreferredProviders
loginProvider.presentingViewController = self
loginProvider.startAuthentication()
self.activeLoginProvider = loginProvider
Comment on lines 167 to +173
Copy link

Copilot AI Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing delegate assignment in NCIntroViewController: The signupWithProvider method creates a new NCLoginProvider but never sets its delegate property. This means if the authentication is cancelled or fails, the onBack() delegate method won't be called, potentially leaving the UI in an inconsistent state. The delegate should be set to self after implementing the NCLoginProviderDelegate protocol, similar to how it's done in NCLogin.swift.

Copilot uses AI. Check for mistakes.
}

@IBAction func host(_ sender: Any) {
Expand Down
17 changes: 11 additions & 6 deletions iOSClient/Login/NCLogin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
private var p12Data: Data?
private var p12Password: String?
private var QRCodeCheck: Bool = false
private var activeLoginProvider: NCLoginProvider?

// MARK: - View Life Cycle

Expand Down Expand Up @@ -338,12 +339,14 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
// Login Flow V2
if error == .success, let token, let endpoint, let login {
nkLog(debug: "Successfully received login flow information.")
let safariVC = NCLoginProvider()
safariVC.initialURLString = login
safariVC.uiColor = textColor
safariVC.delegate = self
safariVC.startPolling(loginFlowV2Token: token, loginFlowV2Endpoint: endpoint, loginFlowV2Login: login)
navigationController?.pushViewController(safariVC, animated: true)
let loginProvider = NCLoginProvider()
loginProvider.initialURLString = login
loginProvider.delegate = self
loginProvider.controller = self.controller
loginProvider.presentingViewController = self
loginProvider.startPolling(loginFlowV2Token: token, loginFlowV2Endpoint: endpoint, loginFlowV2Login: login)
loginProvider.startAuthentication()
self.activeLoginProvider = loginProvider
}
}
case .failure(let error):
Expand Down Expand Up @@ -506,5 +509,7 @@ extension NCLogin: NCLoginProviderDelegate {
func onBack() {
loginButton.isEnabled = true
loginButton.hideSpinnerAndShowButton()
activeLoginProvider?.cancel()
activeLoginProvider = nil
}
}
Loading
Loading