Skip to content

Allow directly entering GitHub personal access token. #30

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
zhongliang02 wants to merge 1 commit into from
Closed

Allow directly entering GitHub personal access token. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 2 deletions CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct AddGitHubPipelineSheet: View {
@StateObject private var branch = DebouncedText()
@StateObject private var branchList = GitHubBranchList()
@StateObject private var builder = GitHubPipelineBuilder()
@State private var tokenInput: String = ""

var body: some View {
VStack {
Expand All @@ -29,10 +30,15 @@ struct AddGitHubPipelineSheet: View {
.padding(.bottom)
Form {
HStack {
TextField("Authentication:", text: $authenticator.tokenDescription)
TextField("Authentication:", text: $tokenInput, prompt: Text("paste token or sign in"))
.accessibilityIdentifier("Token field")
.truncationMode(.tail)
.disabled(true)
.onChange(of: tokenInput) {
authenticator.setToken(tokenInput)
}
.onSubmit {
authenticator.setToken(tokenInput)
}
if authenticator.isWaitingForToken {
Button("Cancel") {
authenticator.cancelSignIn()
Expand All @@ -42,6 +48,7 @@ struct AddGitHubPipelineSheet: View {
Task {
if await authenticator.signInAtGitHub() {
await authenticator.waitForToken()
tokenInput = authenticator.token ?? ""
}
}
}
Expand Down Expand Up @@ -152,6 +159,7 @@ struct AddGitHubPipelineSheet: View {
.padding()
.onAppear() {
authenticator.fetchTokenFromKeychain()
tokenInput = authenticator.token ?? ""
}
.onDisappear() {
authenticator.storeTokenInKeychain()
Expand Down
6 changes: 6 additions & 0 deletions CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubAuthenticator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ class GitHubAuthenticator: ObservableObject {
tokenDescription = token ?? ""
}

func setToken(_ newToken: String) {
let trimmed = newToken.trimmingCharacters(in: .whitespacesAndNewlines)
token = trimmed.isEmpty ? nil : trimmed
tokenDescription = token ?? ""
}

func openApplicationsOnWebsite() {
NSWorkspace.shared.open(GitHubAPI.applicationsUrl())
}
Expand Down