Merge pull request #17 from Web3Auth/feat/namespace

Feat/namespace

Author: chaitanyapotti

Sources/SessionManager/Models/SignatureModel.swift

@@ -16,20 +16,28 @@ struct SessionRequestModel: Codable {
     var signature: String
     var timeout: Int
     var allowedOrigin: String?
+    var namespace: String?
 
-    public init(key: String, data: String, signature: String, timeout: Int, allowedOrigin: String? = "*") {
+    public init(key: String, data: String, signature: String, timeout: Int, allowedOrigin: String? = "*", namespace: String? = nil) {
         self.key = key
         self.data = data
         self.signature = signature
         self.timeout = timeout
         self.allowedOrigin = allowedOrigin
+        if namespace != nil {
+            self.namespace = namespace
+        }
     }
 }
 
 struct AuthorizeSessionRequest: Codable {
     var key: String
-    public init(key: String) {
+    var namespace: String?
+    public init(key: String, namespace: String?) {
         self.key = key
+        if namespace != nil {
+            self.namespace = namespace
+        }
     }
 }
 

Sources/SessionManager/SessionManager.swift

@@ -12,7 +12,7 @@ public class SessionManager {
     private var sessionServerBaseUrl = "https://session.web3auth.io/v2/"
     private var sessionId: String = ""
 
-    private let sessionNamespace: String = ""
+    private var sessionNamespace: String = ""
     private let sessionTime: Int
     private let allowedOrigin: String
 
@@ -34,10 +34,13 @@ public class SessionManager {
         return KeychainManager.shared.delete(key: .sessionID)
     }
 
-    public init(sessionServerBaseUrl: String? = nil, sessionTime: Int = 86400, allowedOrigin: String? = "*", sessionId: String? = nil) {
+    public init(sessionServerBaseUrl: String? = nil, sessionTime: Int = 86400, allowedOrigin: String? = "*", sessionId: String? = nil, sessionNamespace: String? = nil) {
         if sessionId != nil {
             self.sessionId = sessionId!
         }
+        if sessionNamespace != nil {
+            self.sessionNamespace = sessionNamespace!
+        }
         if let sessionServerBaseUrl = sessionServerBaseUrl {
             self.sessionServerBaseUrl = sessionServerBaseUrl
         }
@@ -87,7 +90,7 @@ public class SessionManager {
             guard let sigJsonStr = String(data: sigData, encoding: .utf8) else {
                 throw SessionManagerError.stringEncodingError
             }
-            let sessionRequestModel = SessionRequestModel(key: publicKeyHex, data: encData, signature: sigJsonStr, timeout: sessionTime, allowedOrigin: allowedOrigin)
+            let sessionRequestModel = SessionRequestModel(key: publicKeyHex, data: encData, signature: sigJsonStr, timeout: sessionTime, allowedOrigin: allowedOrigin, namespace: sessionNamespace)
             let api = Router.set(T: sessionRequestModel)
             let result = await Service.request(router: api)
             switch result {
@@ -113,7 +116,7 @@ public class SessionManager {
         let sessionSecret = try curveSecp256k1.SecretKey(hex: sessionId)
 
         let publicKeyHex = try sessionSecret.toPublic().serialize(compressed: false)
-        let authorizeSession = AuthorizeSessionRequest(key: publicKeyHex)
+        let authorizeSession = AuthorizeSessionRequest(key: publicKeyHex, namespace: sessionNamespace)
         let api = Router.authorizeSession(T: authorizeSession, origin: origin)
         let result = await Service.request(router: api)
         switch result {

Tests/SessionManagerTests/SessionManagementTest.swift

@@ -17,15 +17,15 @@ final class SessionManagementTest: XCTestCase {
 
     func test_createSessionID() async throws {
         let sessionId = try SessionManager.generateRandomSessionID();
-        let session = SessionManager(sessionId: sessionId)
+        let session = SessionManager(sessionId: sessionId, sessionNamespace: "sfa")
         let (privKey, pubKey) = try generatePrivateandPublicKey()
         let sfa = SFAModel(publicKey: pubKey, privateKey: privKey)
         let _ = try await session.createSession(data: sfa)
     }
 
     func test_authoriseSessionID() async throws {
         let sessionId = try SessionManager.generateRandomSessionID();
-        let session = SessionManager(sessionId: sessionId)
+        let session = SessionManager(sessionId: sessionId, sessionNamespace: "sfa")
         let (privKey, pubKey) = try generatePrivateandPublicKey()
         let sfa = SFAModel(publicKey: pubKey, privateKey: privKey)
         let created = try await session.createSession(data: sfa)
@@ -70,7 +70,7 @@ final class SessionManagementTest: XCTestCase {
 
     func test_invalidateSession() async throws {
         let sessionId = try SessionManager.generateRandomSessionID();
-        let session = SessionManager(sessionId: sessionId)
+        let session = SessionManager(sessionId: sessionId, sessionNamespace: "sfa")
         let (privKey, pubKey) = try generatePrivateandPublicKey()
         let sfa = SFAModel(publicKey: pubKey, privateKey: privKey)
         let created = try await session.createSession(data: sfa)