Merge pull request #69 from winebarrel/pa_apiKey

Pull around API Key
winebarrel · Nov 7, 2024 · 631487f · 631487f
2 parents 9374007 + 67a8298
commit 631487f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/PagerCall.xcodeproj/project.pbxproj b/PagerCall.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 				CODE_SIGN_ENTITLEMENTS = PagerCall/PagerCall.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 97A8B2WE2P;
@@ -324,7 +324,7 @@
 				CODE_SIGN_ENTITLEMENTS = PagerCall/PagerCall.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 97A8B2WE2P;

diff --git a/PagerCall/ContentView.swift b/PagerCall/ContentView.swift
@@ -2,6 +2,7 @@ import SwiftUI
 
 struct ContentView: View {
     @ObservedObject var pagerDuty: PagerDutyModel
+    @Binding var apiKey: String
     @State private var hoverId = ""
 
     var body: some View {
@@ -56,7 +57,7 @@ struct ContentView: View {
             HStack {
                 Button {
                     Task {
-                        await pagerDuty.update()
+                        await pagerDuty.update(apiKey)
                     }
                 } label: {
                     Image(systemName: "arrow.triangle.2.circlepath")
@@ -76,5 +77,8 @@ struct ContentView: View {
 }
 
 #Preview {
-    ContentView(pagerDuty: PagerDutyModel())
+    ContentView(
+        pagerDuty: PagerDutyModel(),
+        apiKey: .constant("")
+    )
 }
diff --git a/PagerCall/PagerCallApp.swift b/PagerCall/PagerCallApp.swift
@@ -27,7 +27,7 @@ struct PagerCallApp: App {
     private func initialize() {
         Notification.initialize()
 
-        let contentView = ContentView(pagerDuty: pagerDuty)
+        let contentView = ContentView(pagerDuty: pagerDuty, apiKey: $apiKey)
         popover.contentViewController = NSHostingController(rootView: contentView)
 
         scheduleUpdate()
@@ -42,10 +42,10 @@ struct PagerCallApp: App {
         )
 
         timer = Task {
-            await pagerDuty.update()
+            await pagerDuty.update(apiKey)
 
             for await _ in seq {
-                await pagerDuty.update()
+                await pagerDuty.update(apiKey)
             }
         }
     }

diff --git a/PagerCall/PagerDutyAPI.swift b/PagerCall/PagerDutyAPI.swift
@@ -35,8 +35,8 @@ struct PagerDutyAPI {
         struct Oncall: Codable {}
     }
 
-    func isOnCall() async throws -> Bool {
-        let data = try await get("/oncalls", ["user_ids[]": userID])
+    func isOnCall(_ apiKey: String) async throws -> Bool {
+        let data = try await get(apiKey, "/oncalls", ["user_ids[]": userID])
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase
         let resp = try decoder.decode(OncallsResp.self, from: data)
@@ -48,8 +48,8 @@ struct PagerDutyAPI {
         let incidents: Incidents
     }
 
-    func getIncidents() async throws -> Incidents {
-        let data = try await get("/incidents", ["user_ids[]": userID])
+    func getIncidents(_ apiKey: String) async throws -> Incidents {
+        let data = try await get(apiKey, "/incidents", ["user_ids[]": userID])
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase
         decoder.dateDecodingStrategy = .iso8601
@@ -58,14 +58,14 @@ struct PagerDutyAPI {
         return resp.incidents
     }
 
-    private func get(_ path: String, _ query: [String: String] = [:]) async throws -> Data {
+    private func get(_ apiKey: String, _ path: String, _ query: [String: String] = [:]) async throws -> Data {
         var url = endpoint.appendingPathComponent(path)
         url.append(queryItems: query.map { key, val in URLQueryItem(name: key, value: val) })
 
         var req = URLRequest(url: url)
         req.setValue("application/json", forHTTPHeaderField: "Accept")
         req.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        req.setValue("Token token=\(Vault.apiKey)", forHTTPHeaderField: "Authorization")
+        req.setValue("Token token=\(apiKey)", forHTTPHeaderField: "Authorization")
 
         let (data, rawResp) = try await URLSession.shared.data(for: req)
 

diff --git a/PagerCall/PagerDutyModel.swift b/PagerCall/PagerDutyModel.swift
@@ -17,10 +17,10 @@ class PagerDutyModel: ObservableObject {
     @Published var updatedAt: Date?
     @Published var error: PagerDutyError?
 
-    func update() async {
+    func update(_ apiKey: String) async {
         do {
-            let onCallNow = try await api.isOnCall()
-            let currIncidents = try await api.getIncidents()
+            let onCallNow = try await api.isOnCall(apiKey)
+            let currIncidents = try await api.getIncidents(apiKey)
             let newIncidents = currIncidents - incidents
             let hasIncidents = !currIncidents.isEmpty