Rename CopilotStatus to GitHubCopilotAccountStatus

Author: intitni

Copilot for Xcode/ContentView.swift

@@ -5,7 +5,7 @@ import SwiftUI
 struct ContentView: View {
     @Environment(\.openURL) var openURL
     @AppStorage("username") var username: String = ""
-    @State var copilotStatus: CopilotStatus?
+    @State var copilotStatus: GitHubCopilotAccountStatus?
     @State var message: String?
     @State var userCode: String?
 

Copilot for Xcode/CopilotView.swift

@@ -6,7 +6,7 @@ import SwiftUI
 struct CopilotView: View {
     @Environment(\.openURL) var openURL
     @AppStorage("username") var username: String = ""
-    @State var copilotStatus: CopilotStatus?
+    @State var copilotStatus: GitHubCopilotAccountStatus?
     @State var message: String?
     @State var userCode: String?
     @State var version: String?

Core/Sources/Client/AsyncXPCService.swift

@@ -11,7 +11,7 @@ public struct AsyncXPCService {
         self.service = service
     }
 
-    public func checkStatus() async throws -> CopilotStatus {
+    public func checkStatus() async throws -> GitHubCopilotAccountStatus {
         try await withXPCServiceConnected(connection: connection) {
             service, continuation in
             service.checkStatus { status, error in
@@ -20,8 +20,8 @@ public struct AsyncXPCService {
                     return
                 }
                 continuation.resume(
-                    status.flatMap(CopilotStatus.init(rawValue:))
-                        ?? CopilotStatus.notAuthorized
+                    status.flatMap(GitHubCopilotAccountStatus.init(rawValue:))
+                        ?? GitHubCopilotAccountStatus.notAuthorized
                 )
             }
         }
@@ -63,7 +63,7 @@ public struct AsyncXPCService {
     }
 
     public func signInConfirm(userCode: String) async throws
-        -> (username: String, status: CopilotStatus)
+        -> (username: String, status: GitHubCopilotAccountStatus)
     {
         try await withXPCServiceConnected(connection: connection) {
             service, continuation in
@@ -74,13 +74,13 @@ public struct AsyncXPCService {
                 }
                 continuation.resume((
                     username ?? "",
-                    status.flatMap(CopilotStatus.init(rawValue:)) ?? .alreadySignedIn
+                    status.flatMap(GitHubCopilotAccountStatus.init(rawValue:)) ?? .alreadySignedIn
                 ))
             }
         }
     }
 
-    public func signOut() async throws -> CopilotStatus {
+    public func signOut() async throws -> GitHubCopilotAccountStatus {
         try await withXPCServiceConnected(connection: connection) {
             service, continuation in
             service.signOut { finishstatus, error in
@@ -89,7 +89,7 @@ public struct AsyncXPCService {
                     return
                 }
                 continuation
-                    .resume(finishstatus.flatMap(CopilotStatus.init(rawValue:)) ?? .notSignedIn)
+                    .resume(finishstatus.flatMap(GitHubCopilotAccountStatus.init(rawValue:)) ?? .notSignedIn)
             }
         }
     }

…s/CopilotModel/GitHubCopilotStatus.swift …otModel/GitHubCopilotAccountStatus.swiftCore/Sources/CopilotModel/GitHubCopilotStatus.swift renamed to Core/Sources/CopilotModel/GitHubCopilotAccountStatus.swift Core/Sources/CopilotModel/GitHubCopilotStatus.swift renamed to Core/Sources/CopilotModel/GitHubCopilotAccountStatus.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum CopilotStatus: String, Codable, CustomStringConvertible {
+public enum GitHubCopilotAccountStatus: String, Codable, CustomStringConvertible {
     case alreadySignedIn = "AlreadySignedIn"
     case maybeOk = "MaybeOk"
     case notAuthorized = "NotAuthorized"

Core/Sources/GitHubCopilotService/CopilotRequest.swift

@@ -52,7 +52,7 @@ enum CopilotRequest {
 
     struct CheckStatus: CopilotRequestType {
         struct Response: Codable {
-            var status: CopilotStatus
+            var status: GitHubCopilotAccountStatus
         }
 
         var request: ClientRequest {
@@ -76,7 +76,7 @@ enum CopilotRequest {
 
     struct SignInConfirm: CopilotRequestType {
         struct Response: Codable {
-            var status: CopilotStatus
+            var status: GitHubCopilotAccountStatus
             var user: String
         }
 
@@ -91,7 +91,7 @@ enum CopilotRequest {
 
     struct SignOut: CopilotRequestType {
         struct Response: Codable {
-            var status: CopilotStatus
+            var status: GitHubCopilotAccountStatus
         }
 
         var request: ClientRequest {

Core/Sources/GitHubCopilotService/CopilotService.swift

@@ -7,10 +7,10 @@ import Preferences
 import XPCShared
 
 public protocol CopilotAuthServiceType {
-    func checkStatus() async throws -> CopilotStatus
+    func checkStatus() async throws -> GitHubCopilotAccountStatus
     func signInInitiate() async throws -> (verificationUri: String, userCode: String)
-    func signInConfirm(userCode: String) async throws -> (username: String, status: CopilotStatus)
-    func signOut() async throws -> CopilotStatus
+    func signInConfirm(userCode: String) async throws -> (username: String, status: GitHubCopilotAccountStatus)
+    func signOut() async throws -> GitHubCopilotAccountStatus
     func version() async throws -> String
 }
 
@@ -160,7 +160,7 @@ public final class CopilotAuthService: CopilotBaseService, CopilotAuthServiceTyp
         }
     }
 
-    public func checkStatus() async throws -> CopilotStatus {
+    public func checkStatus() async throws -> GitHubCopilotAccountStatus {
         try await server.sendRequest(CopilotRequest.CheckStatus()).status
     }
 
@@ -170,13 +170,13 @@ public final class CopilotAuthService: CopilotBaseService, CopilotAuthServiceTyp
     }
 
     public func signInConfirm(userCode: String) async throws
-        -> (username: String, status: CopilotStatus)
+        -> (username: String, status: GitHubCopilotAccountStatus)
     {
         let result = try await server.sendRequest(CopilotRequest.SignInConfirm(userCode: userCode))
         return (result.user, result.status)
     }
 
-    public func signOut() async throws -> CopilotStatus {
+    public func signOut() async throws -> GitHubCopilotAccountStatus {
         try await server.sendRequest(CopilotRequest.SignOut()).status
     }