Add ClientID to auth requests so auth server can correlate to entityid later. Also extend Koja types.

Author: nevyn

Sources/allonet2/Interaction.swift

@@ -60,7 +60,7 @@ public enum InteractionBody : Codable
 
     // - Authentication (App agent to place)
     case registerAsAuthenticationProvider // -> .success or .error
-    case authenticationRequest(identity: Identity) // -> .success or .error
+    case authenticationRequest(clientId: ClientId, identity: Identity) // -> .success or .error
 
     // - Agent to agent
     case tap(at: SIMD3<Float>) // oneway

Sources/allonet2/PlaceServer/PlaceServer+PlaceInteractions.swift

@@ -70,7 +70,7 @@ extension PlaceServer
         }
         if requiresAuthenticationProvider || (identity.expectation == .app && !alloAppAuthToken.isEmpty)
         {
-            try await authenticate(identity: identity, in: ilogger)
+            try await authenticate(identity: identity, from: client.cid, in: ilogger)
         }
 
         client.announced = true
@@ -101,7 +101,7 @@ extension PlaceServer
         client.session.send(interaction: announce.makeResponse(with: .announceResponse(avatarId: avatar.id, placeName: name)))
     }
 
-    func authenticate(identity: Identity, in ilogger: Logger) async throws(AlloverseError)
+    func authenticate(identity: Identity, from cid: ClientId, in ilogger: Logger) async throws(AlloverseError)
     {
         if identity.expectation == .app
         {
@@ -119,7 +119,7 @@ extension PlaceServer
 
         let request = Interaction(type: .request, senderEntityId: Interaction.PlaceEntity,
                                   receiverEntityId: authenticationId,
-                                  body: .authenticationRequest(identity: identity))
+                                  body: .authenticationRequest(clientId: cid, identity: identity))
 
         let answer = await authenticationProvider.session.request(interaction: request)
 

Sources/allonet2/StandardComponents.swift

@@ -226,28 +226,48 @@ public enum PresenceMode: String, Codable, CaseIterable, Identifiable
 @MainActor
 public struct KojaUser: Codable, Equatable, Identifiable
 {
-    public var id: String
+    public let id: String
+    public let avatarId: EntityID
     public var displayName: String
     public var email: String?
     public var presence: PresenceMode
-    public var avatarId: EntityID
+    
+    public init(id: String, avatarId: EntityID, displayName: String, email: String?, presence: PresenceMode) {
+        self.id = id
+        self.avatarId = avatarId
+        self.displayName = displayName
+        self.email = email
+        self.presence = presence
+    }
 }
 
 @MainActor
 public struct KojaRoom: Codable, Equatable, Identifiable
 {
-    public var id: String
-    public var name: String
-    public var entity: EntityID
+    public let id: String
+    public let name: String
+    public let entity: EntityID
     // TODO: room usage (meeting, team room, etc)
-    public var users: [KojaUser]
+    public var users: [KojaUser] = []
+    
+    public init(id: String, name: String, entity: EntityID) {
+        self.id = id
+        self.name = name
+        self.entity = entity
+    }
 }
 
 @MainActor
 public struct KojaPlaceInfo: Component
 {
-    public var users: [KojaUser]
-    public var rooms: [KojaRoom]
+    public var rooms: [KojaRoom] = []
+    public var invisibleUsers: [KojaUser] = []
+    public var offlineUsers: [KojaUser] = []
+    public init() {}
+    
+    public var allUsers: [KojaUser] {
+        return rooms.flatMap { $0.users } + invisibleUsers + offlineUsers
+    }
 }
 
 // MARK: - Related types