more Pairing -> Iam renaming

nabto · Apr 25, 2022 · 8e56fb0 · 8e56fb0
1 parent 41afd5c
commit 8e56fb0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/NabtoEdgeClient/NabtoEdgeClient.xcodeproj/project.pbxproj b/NabtoEdgeClient/NabtoEdgeClient.xcodeproj/project.pbxproj
@@ -34,14 +34,14 @@
 		D479085127C581E400790A51 /* CallbackWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D479084E27C581E400790A51 /* CallbackWrapper.swift */; };
 		E2FB5D4F1AA78AC7D4FAEA68 /* Pods_NabtoEdgeClientTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C850E1A5507E6CEBD10099 /* Pods_NabtoEdgeClientTests.framework */; };
 		E92302F614DFF1CE2D44AF7A /* IamUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92E1F3B78BE7B59AA656356 /* IamUtil.swift */; };
-		E923120C46CF30C6E5681300 /* PairAbstract.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92AE96525DAF4143AE97A68 /* PairAbstract.swift */; };
+		E923120C46CF30C6E5681300 /* AbstractIamInvocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92AE96525DAF4143AE97A68 /* AbstractIamInvocation.swift */; };
 		E925CA6B746BB821ABFC6E33 /* PairLocalInitial.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92CF513E9FC4558DD69F13D /* PairLocalInitial.swift */; };
 		E925DD6F9224960796ADCA21 /* PairAutomatic.swift in Sources */ = {isa = PBXBuildFile; fileRef = E920A43B395C45B40AE07277 /* PairAutomatic.swift */; };
 		E92652701579C3210C57BD1A /* PairPasswordInvite.swift in Sources */ = {isa = PBXBuildFile; fileRef = E922433FDF28CDFC63583059 /* PairPasswordInvite.swift */; };
 		E92837BE0959E8D8679649C7 /* TestDeviceDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9221D728E77EBE65E3D5868 /* TestDeviceDefinitions.swift */; };
 		E9289DDF58735633C1389870 /* PairLocalOpen.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9222CFACFDBA713CE870C08 /* PairLocalOpen.swift */; };
 		E92B89A1B66E2D1F8F8D818F /* IamUtilTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92CE3DEF30197BFA961376C /* IamUtilTests.swift */; };
-		E92E743784165CA504619D02 /* PairingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E927FB7D04C0ABD6951697C1 /* PairingHelper.swift */; };
+		E92E743784165CA504619D02 /* IamHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E927FB7D04C0ABD6951697C1 /* IamHelper.swift */; };
 		E92F92784753ABF65C759A79 /* PairPasswordOpen.swift in Sources */ = {isa = PBXBuildFile; fileRef = E92939973C97A9709F442C94 /* PairPasswordOpen.swift */; };
 /* End PBXBuildFile section */
 
@@ -122,9 +122,9 @@
 		E9221D728E77EBE65E3D5868 /* TestDeviceDefinitions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestDeviceDefinitions.swift; sourceTree = "<group>"; };
 		E9222CFACFDBA713CE870C08 /* PairLocalOpen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PairLocalOpen.swift; sourceTree = "<group>"; };
 		E922433FDF28CDFC63583059 /* PairPasswordInvite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PairPasswordInvite.swift; sourceTree = "<group>"; };
-		E927FB7D04C0ABD6951697C1 /* PairingHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PairingHelper.swift; sourceTree = "<group>"; };
+		E927FB7D04C0ABD6951697C1 /* IamHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IamHelper.swift; sourceTree = "<group>"; };
 		E92939973C97A9709F442C94 /* PairPasswordOpen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PairPasswordOpen.swift; sourceTree = "<group>"; };
-		E92AE96525DAF4143AE97A68 /* PairAbstract.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PairAbstract.swift; sourceTree = "<group>"; };
+		E92AE96525DAF4143AE97A68 /* AbstractIamInvocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AbstractIamInvocation.swift; sourceTree = "<group>"; };
 		E92CE3DEF30197BFA961376C /* IamUtilTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IamUtilTests.swift; sourceTree = "<group>"; };
 		E92CF513E9FC4558DD69F13D /* PairLocalInitial.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PairLocalInitial.swift; sourceTree = "<group>"; };
 		E92E1F3B78BE7B59AA656356 /* IamUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IamUtil.swift; sourceTree = "<group>"; };
@@ -257,23 +257,23 @@
 				D479084E27C581E400790A51 /* CallbackWrapper.swift */,
 				D479084C27C581E400790A51 /* ClientImpl.swift */,
 				D479084D27C581E400790A51 /* Helper.swift */,
-				E92F919B16104FB2A34E9523 /* pairing */,
+				E92F919B16104FB2A34E9523 /* iam */,
 			);
 			path = impl;
 			sourceTree = "<group>";
 		};
-		E92F919B16104FB2A34E9523 /* pairing */ = {
+		E92F919B16104FB2A34E9523 /* iam */ = {
 			isa = PBXGroup;
 			children = (
-				E92AE96525DAF4143AE97A68 /* PairAbstract.swift */,
+				E92AE96525DAF4143AE97A68 /* AbstractIamInvocation.swift */,
 				E920A43B395C45B40AE07277 /* PairAutomatic.swift */,
-				E927FB7D04C0ABD6951697C1 /* PairingHelper.swift */,
+				E927FB7D04C0ABD6951697C1 /* IamHelper.swift */,
 				E92CF513E9FC4558DD69F13D /* PairLocalInitial.swift */,
 				E9222CFACFDBA713CE870C08 /* PairLocalOpen.swift */,
 				E922433FDF28CDFC63583059 /* PairPasswordInvite.swift */,
 				E92939973C97A9709F442C94 /* PairPasswordOpen.swift */,
 			);
-			path = pairing;
+			path = iam;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -542,9 +542,9 @@
 				D479084927C5803300790A51 /* CoapResponse.swift in Sources */,
 				D479085027C581E400790A51 /* Helper.swift in Sources */,
 				E92302F614DFF1CE2D44AF7A /* IamUtil.swift in Sources */,
-				E923120C46CF30C6E5681300 /* PairAbstract.swift in Sources */,
+				E923120C46CF30C6E5681300 /* AbstractIamInvocation.swift in Sources */,
 				E925DD6F9224960796ADCA21 /* PairAutomatic.swift in Sources */,
-				E92E743784165CA504619D02 /* PairingHelper.swift in Sources */,
+				E92E743784165CA504619D02 /* IamHelper.swift in Sources */,
 				E925CA6B746BB821ABFC6E33 /* PairLocalInitial.swift in Sources */,
 				E9289DDF58735633C1389870 /* PairLocalOpen.swift in Sources */,
 				E92652701579C3210C57BD1A /* PairPasswordInvite.swift in Sources */,

diff --git a/...dgeClient/impl/pairing/PairAbstract.swift → ...ient/impl/iam/AbstractIamInvocation.swift b/...dgeClient/impl/pairing/PairAbstract.swift → ...ient/impl/iam/AbstractIamInvocation.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-internal protocol PairAbstractProtocol {
+internal protocol AbstractIamInvocationProtocol {
 
     typealias SyncHook = () throws -> ()
     typealias AsyncHook = (@escaping AsyncStatusReceiver) -> Void
@@ -18,7 +18,7 @@ internal protocol PairAbstractProtocol {
     var asyncHookBeforeCoap: AsyncHook? { get }
 }
 
-extension PairAbstractProtocol {
+extension AbstractIamInvocationProtocol {
 
     func execute() throws {
         do {
@@ -33,7 +33,7 @@ extension PairAbstractProtocol {
                 throw error
             }
         } catch {
-            try PairingHelper.throwPairingError(error)
+            try PairingHelper.throwIamError(error)
         }
     }
 
@@ -43,7 +43,7 @@ extension PairAbstractProtocol {
                 if (error == NabtoEdgeClientError.OK) {
                     self.executeAsyncImpl(closure)
                 } else {
-                    PairingHelper.invokePairingErrorHandler(error, closure)
+                    PairingHelper.invokeIamErrorHandler(error, closure)
                 }
             }
         } else {
@@ -59,13 +59,13 @@ extension PairAbstractProtocol {
             }
             coap.executeAsync { error, response in
                 if (error != NabtoEdgeClientError.OK) {
-                    PairingHelper.invokePairingErrorHandler(error, closure)
+                    PairingHelper.invokeIamErrorHandler(error, closure)
                 } else {
                     closure(self.mapStatus(status: response?.status))
                 }
             }
         } catch {
-            PairingHelper.invokePairingErrorHandler(error, closure)
+            PairingHelper.invokeIamErrorHandler(error, closure)
         }
     }
 

diff --git a/...geClient/impl/pairing/PairingHelper.swift → .../NabtoEdgeClient/impl/iam/IamHelper.swift b/...geClient/impl/pairing/PairingHelper.swift → .../NabtoEdgeClient/impl/iam/IamHelper.swift
@@ -14,7 +14,7 @@ internal class PairingHelper {
         }
     }
 
-    static internal func throwPairingError(_ error: Error) throws {
+    static internal func throwIamError(_ error: Error) throws {
         if let pairingError = error as? IamError {
             throw pairingError
         } else if let apiError = error as? NabtoEdgeClientError {
@@ -23,7 +23,7 @@ internal class PairingHelper {
         throw IamError.FAILED
     }
 
-    static internal func invokePairingErrorHandler(_ error: Error, _ closure: @escaping AsyncPairingResultReceiver) {
+    static internal func invokeIamErrorHandler(_ error: Error, _ closure: @escaping AsyncPairingResultReceiver) {
         if let pairingError = error as? IamError {
             closure(pairingError)
         } else if let apiError = error as? NabtoEdgeClientError {

diff --git a/...geClient/impl/pairing/PairAutomatic.swift → ...toEdgeClient/impl/iam/PairAutomatic.swift b/...geClient/impl/pairing/PairAutomatic.swift → ...toEdgeClient/impl/iam/PairAutomatic.swift
@@ -80,7 +80,7 @@ internal class PairAutomatic {
             do {
                 connection = try self.execute()
             } catch {
-                PairingHelper.invokePairingErrorHandler(error, { pairingError in
+                PairingHelper.invokeIamErrorHandler(error, { pairingError in
                     closure(pairingError, nil)
                 })
                 return

diff --git a/...lient/impl/pairing/PairLocalInitial.swift → ...dgeClient/impl/iam/PairLocalInitial.swift b/...lient/impl/pairing/PairLocalInitial.swift → ...dgeClient/impl/iam/PairLocalInitial.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-internal class PairLocalInitial : PairAbstractProtocol {
+internal class PairLocalInitial : AbstractIamInvocationProtocol {
     private(set) var method: String = "POST"
     private(set) var path: String = "/iam/pairing/local-initial"
     private(set) var connection: Connection

diff --git a/...geClient/impl/pairing/PairLocalOpen.swift → ...toEdgeClient/impl/iam/PairLocalOpen.swift b/...geClient/impl/pairing/PairLocalOpen.swift → ...toEdgeClient/impl/iam/PairLocalOpen.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-internal class PairLocalOpen : PairAbstractProtocol {
+internal class PairLocalOpen : AbstractIamInvocationProtocol {
     private(set) var method: String = "POST"
     private(set) var path: String = "/iam/pairing/local-open"
     private(set) var connection: Connection

diff --git a/...ent/impl/pairing/PairPasswordInvite.swift → ...eClient/impl/iam/PairPasswordInvite.swift b/...ent/impl/pairing/PairPasswordInvite.swift → ...eClient/impl/iam/PairPasswordInvite.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-internal class PairPasswordInvite : PairAbstractProtocol {
+internal class PairPasswordInvite : AbstractIamInvocationProtocol {
 
     private(set) var method: String = "POST"
     private(set) var path: String = "/iam/pairing/password-invite"

diff --git a/...lient/impl/pairing/PairPasswordOpen.swift → ...dgeClient/impl/iam/PairPasswordOpen.swift b/...lient/impl/pairing/PairPasswordOpen.swift → ...dgeClient/impl/iam/PairPasswordOpen.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-internal class PairPasswordOpen : PairAbstractProtocol {
+internal class PairPasswordOpen : AbstractIamInvocationProtocol {
 
     private(set) var method: String = "POST"
     private(set) var path: String = "/iam/pairing/password-open"