Skip to content

Improve UX when the user is not logged in #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Improve UX when the user is not logged in #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb1b158
Make the authentication button red when the user is not logged in
Dec 3, 2022
b73bd5d
Added "checking" state to app authentication
Dec 7, 2022
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
1 change: 1 addition & 0 deletions Xcodes/AppleAPI/Sources/AppleAPI/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public class Client {
// MARK: - Types

public enum AuthenticationState: Equatable {
case checking
case unauthenticated
case waitingForSecondFactor(TwoFactorOption, AuthOptionsResponse, AppleSessionData)
case authenticated
Expand Down
22 changes: 19 additions & 3 deletions Xcodes/Backend/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ class AppState: ObservableObject {

// MARK: - Published Properties

@Published var authenticationState: AuthenticationState = .unauthenticated
@Published var authenticationState: AuthenticationState = .checking
var isCheckingAuthentication: Bool { authenticationState == .checking }
@Published var availableXcodes: [AvailableXcode] = [] {
willSet {
if newValue.count > availableXcodes.count && availableXcodes.count != 0 {
Expand Down Expand Up @@ -134,6 +135,21 @@ class AppState: ObservableObject {
checkIfHelperIsInstalled()
setupAutoInstallTimer()
setupDefaults()

validateSession()
.receive(on: DispatchQueue.main)
.sink(
receiveCompletion: { [weak self] result in
switch result {
case .finished:
self?.authenticationState = .authenticated
case .failure:
self?.authenticationState = .unauthenticated
}
},
receiveValue: { _ in }
)
.store(in: &cancellables)
}

func setupDefaults() {
Expand Down Expand Up @@ -286,7 +302,7 @@ class AppState: ObservableObject {
self.authError = error
case .finished:
switch self.authenticationState {
case .authenticated, .unauthenticated, .notAppleDeveloper:
case .authenticated, .unauthenticated, .notAppleDeveloper, .checking:
self.presentedSheet = nil
case let .waitingForSecondFactor(option, authOptions, sessionData):
self.handleTwoFactorOption(option, authOptions: authOptions, serviceKey: sessionData.serviceKey, sessionID: sessionData.sessionID, scnt: sessionData.scnt)
Expand Down Expand Up @@ -396,7 +412,7 @@ class AppState: ObservableObject {
self.$authenticationState
.filter { state in
switch state {
case .authenticated, .unauthenticated, .notAppleDeveloper: return true
case .authenticated, .unauthenticated, .notAppleDeveloper, .checking: return true
case .waitingForSecondFactor: return false
}
}
Expand Down
17 changes: 14 additions & 3 deletions Xcodes/Frontend/XcodeList/MainToolbar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,20 @@ struct MainToolbarModifier: ViewModifier {

private var toolbar: some ToolbarContent {
ToolbarItemGroup(placement: .status) {
Button(action: { appState.presentedSheet = .signIn }, label: {
Label("Login", systemImage: "person.circle")
})
ProgressButton(
isInProgress: appState.isCheckingAuthentication,
action: { appState.presentedSheet = .signIn }
) {
switch appState.authenticationState {
case .authenticated:
Label("Login", systemImage: "person.circle")
case .unauthenticated, .notAppleDeveloper, .checking, .waitingForSecondFactor:
Label("Login", systemImage: "person.circle")
.foregroundColor(Color.red)
Text("Signed out") // TODO: Localization
.foregroundColor(Color.red)
}
}
.help("LoginDescription")

ProgressButton(
Expand Down