Passing token to pipeline builder, and added corresponding test.

This fixes #25.

Author: erikdoe

CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift

@@ -136,7 +136,7 @@ struct AddGitHubPipelineSheet: View {
                 .keyboardShortcut(.cancelAction)
                 Button("Apply") {
                     Task {
-                        if let p = await builder.makePipeline() {
+                        if let p = await builder.makePipeline(token: authenticator.token) {
                             config.setPipeline(p)
                             presentation.dismiss()
                         }

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubAuthenticator.swift

@@ -137,6 +137,7 @@ class GitHubAuthenticator: ObservableObject {
 
     func storeTokenInKeychain() {
         guard let token else { return }
+        guard UserDefaults.active.string(forKey: "GitHubToken") == nil else { return } // slight hack so we don't store tokens from test
         do {
             try Keychain.standard.setToken(token, forService: "GitHub")
         } catch {

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubPipelineBuilder.swift

@@ -33,7 +33,7 @@ class GitHubPipelineBuilder: ObservableObject {
         return true
     }
 
-    func makePipeline() async -> Pipeline? {
+    func makePipeline(token: String?) async -> Pipeline? {
         guard !name.isEmpty else { return nil }
         guard let owner else { return nil }
         guard let repository else { return nil }
@@ -45,7 +45,7 @@ class GitHubPipelineBuilder: ObservableObject {
         let workflowPathComponents = [ workflow.filename, String(workflow.id) ]
         for wfid in workflowPathComponents {
             url = GitHubAPI.feedUrl(owner: owner, repository: repository, workflow: wfid, branch: branchName)
-            if let url, let result = await fetchRuns(url: url), result == 200 {
+            if let url, let result = await fetchRuns(url: url, token: token), result == 200 {
                 break
             }
             url = nil
@@ -59,9 +59,9 @@ class GitHubPipelineBuilder: ObservableObject {
         return pipeline
     }
 
-    private func fetchRuns(url: URL) async -> Int? {
+    private func fetchRuns(url: URL, token: String?) async -> Int? {
         let feed = PipelineFeed(type: .github, url:url)
-        guard let request = GitHubAPI.requestForFeed(feed: feed, token: nil) else {
+        guard let request = GitHubAPI.requestForFeed(feed: feed, token: token) else {
             return nil
         }
         let result = await fetchRuns(request: request)

CCMenuUITests/GitHubTests.swift

@@ -59,7 +59,7 @@ class GitHubTests: XCTestCase {
             return try TestHelper.contentsOfFile("GitHubWorkflowRunsResponse.json")
         }
 
-        let app = TestHelper.launchApp(pipelines: "GitHubPipelineLocalhost.json", pauseMonitor: false)
+        let app = TestHelper.launchApp(pipelines: "GitHubPipelineLocalhost.json", pauseMonitor: false, token: "TEST-TOKEN")
         let window = app.windows["Pipelines"]
 
         // Make sure the update message shows that the limit was exceeded
@@ -128,6 +128,62 @@ class GitHubTests: XCTestCase {
         waitForExpectations(timeout: 5)
     }
 
+    func testAddsGitHubPrivatePipeline() throws {
+        webapp.router.get("/users/erikdoe") { _ in
+            try TestHelper.contentsOfFile("GitHubUserResponse.json")
+        }
+        webapp.router.get("/users/erikdoe/repos") { _ in
+            return "[]"
+        }
+        webapp.router.get("/user/repos") { _ in
+            try TestHelper.contentsOfFile("GitHubReposByUserCCM2OnlyResponse.json")
+        }
+        webapp.router.get("/repos/erikdoe/ccmenu2/actions/workflows") { _ in
+            try TestHelper.contentsOfFile("GitHubWorkflowsResponse.json")
+        }
+        webapp.router.get("/repos/erikdoe/ccmenu2/branches") { _ in
+            try TestHelper.contentsOfFile("GitHubBranchesResponse.json")
+        }
+        webapp.router.get("/repos/erikdoe/ccmenu2/actions/workflows/build-and-test.yaml/runs", options: .editResponse) { r -> String in
+            if r.headers["Authorization"].first != "Bearer TEST-TOKEN" {
+                r.response.status = .notFound
+                return "{ \"message\": \"Not found\" } "
+            }
+            return try TestHelper.contentsOfFile("GitHubWorkflowRunsResponse.json")
+        }
+
+        let app = TestHelper.launchApp(pipelines: "EmptyPipelines.json", pauseMonitor: false, token: "TEST-TOKEN")
+        let window = app.windows["Pipelines"]
+        let sheet = openAddGitHubPipelineSheet(app: app)
+
+        // Enter owner
+        sheet.textFields["Owner field"].click()
+        sheet.typeText("erikdoe" + "\n")
+
+        // Make sure that the repositories and workflows are loaded and the default display name is set
+        let repositoryBox = sheet.comboBoxes["Repository combo box"]
+        expectation(for: NSPredicate(format: "value == 'ccmenu2'"), evaluatedWith: repositoryBox)
+        let workflowPicker = sheet.popUpButtons["Workflow picker"]
+        expectation(for: NSPredicate(format: "value == 'Build and test'"), evaluatedWith: workflowPicker)
+        let displayNameField = sheet.textFields["Display name field"]
+        expectation(for: NSPredicate(format: "value == 'ccmenu2 | Build and test'"), evaluatedWith: displayNameField)
+        waitForExpectations(timeout: 3)
+
+        // Set a custom display name, and close the sheet
+        displayNameField.click()
+        sheet.typeKey("a", modifierFlags: [ .command ])
+        sheet.typeText("CCMenu")
+        sheet.buttons["Apply"].click()
+
+        // Make sure the pipeline is shown, and that its status is fetched immediately
+        let titleText = window.outlines.staticTexts["Pipeline title"]
+        expectation(for: NSPredicate(format: "value == 'CCMenu'"), evaluatedWith: titleText)
+        let descriptionText = window.outlines.staticTexts["Status description"]
+        expectation(for: NSPredicate(format: "value CONTAINS 'Label: 42'"), evaluatedWith: descriptionText)
+        waitForExpectations(timeout: 5)
+    }
+
+
     func testAddsGitHubPipelineByIdIfNeccessary() throws {
         webapp.router.get("/users/erikdoe") { _ in
             try TestHelper.contentsOfFile("GitHubUserResponse.json")
@@ -221,6 +277,8 @@ class GitHubTests: XCTestCase {
         XCTAssertEqual("main", branchParam)
     }
 
+    
+
     func testFindsPrivateReposForUser() throws {
         webapp.router.get("/users/erikdoe") { _ in
             try TestHelper.contentsOfFile("GitHubUserResponse.json")