chore(core): #1401 use uav: prefix for new opcua security schemes used in tests

Author: erossignon

packages/core/src/thing-description.ts

@@ -197,7 +197,7 @@ export interface AllOfSecurityScheme extends SecurityScheme {
 export type ComboSecurityScheme = AllOfSecurityScheme | OneOfSecurityScheme;
 
 export interface OPCUASecuritySchemeBase extends SecurityScheme, TDT.AdditionalSecurityScheme {
-    scheme: "opcua-channel-security" | "opcua-authentication";
+    scheme: "uav:channel-security" | "uav:authentication";
 }
 
 export type ValidOPCUASecurityPolicy =
@@ -226,30 +226,30 @@ export type ValidOPCUASecurityPolicy =
  *
  */
 export interface OPCUASecureSecurityScheme extends OPCUASecuritySchemeBase {
-    scheme: "opcua-channel-security";
+    scheme: "uav:channel-security";
     policy: ValidOPCUASecurityPolicy;
     messageMode: "sign" | "sign_encrypt";
 }
 export interface OPCUAUnsecureChannelScheme extends OPCUASecuritySchemeBase {
-    scheme: "opcua-channel-security";
+    scheme: "uav:channel-security";
     policy: never;
     messageMode: "none";
 }
 
 export type OPCUAChannelSecurityScheme = OPCUASecureSecurityScheme | OPCUAUnsecureChannelScheme;
 export interface OPCUACAuthenticationSchemeBase extends OPCUASecuritySchemeBase {
-    scheme: "opcua-authentication";
+    scheme: "uav:authentication";
     tokenType: "username" | "certificate" | "anonymous";
 }
 
 export interface OPCUACUserNameAuthenticationScheme extends OPCUACAuthenticationSchemeBase {
-    scheme: "opcua-authentication";
+    scheme: "uav:authentication";
     tokenType: "username";
     userName: string;
     password?: string;
 }
 export interface OPCUACertificateAuthenticationScheme extends OPCUACAuthenticationSchemeBase {
-    scheme: "opcua-authentication";
+    scheme: "uav:authentication";
     tokenType: "certificate";
     // the certificate in PEM format
     //  -----BEGIN CERTIFICATE----
@@ -264,7 +264,7 @@ export interface OPCUACertificateAuthenticationScheme extends OPCUACAuthenticati
     privateKey?: string;
 }
 export interface OPCUAAnonymousAuthenticationScheme extends OPCUACAuthenticationSchemeBase {
-    scheme: "opcua-authentication";
+    scheme: "uav:authentication";
     tokenType: "anonymous";
 }
 export type OPCUACAuthenticationScheme =

packages/core/test/ClientTest.ts

@@ -813,14 +813,14 @@ class WoTClientTest {
                 scheme: "basic",
             },
             opcua_secure_channel_sc: {
-                scheme: "opcua-channel-security",
+                scheme: "uav:channel-security",
             },
-            opcua_authetication_sc: {
-                scheme: "opcua-authentication",
+            opcua_authentication_sc: {
+                scheme: "uav:authentication",
             },
             combo_sc: {
                 scheme: "combo",
-                allOf: ["opcua_secure_channel_sc", "opcua_authetication_sc"],
+                allOf: ["opcua_secure_channel_sc", "opcua_authentication_sc"],
             },
         };
         ct.security = ["combo_sc"];
@@ -835,8 +835,8 @@ class WoTClientTest {
         const comboScheme = pc.securitySchemes[0] as AllOfSecurityScheme;
         expect(comboScheme.allOf).instanceOf(Array);
         expect(comboScheme.allOf.length).equal(2);
-        expect(comboScheme.allOf[0].scheme).equals("opcua-channel-security");
-        expect(comboScheme.allOf[1].scheme).equals("opcua-authentication");
+        expect(comboScheme.allOf[0].scheme).equals("uav:channel-security");
+        expect(comboScheme.allOf[1].scheme).equals("uav:authentication");
     }
 
     @test "ensure combo security - oneOf"() {
@@ -846,23 +846,23 @@ class WoTClientTest {
                 scheme: "basic",
             },
             opcua_secure_channel_encrypt_sc: {
-                scheme: "opcua-channel-security",
+                scheme: "uav:channel-security",
                 mode: "encrypt",
             },
             opcua_secure_channel_sign_sc: {
-                scheme: "opcua-channel-security",
+                scheme: "uav:channel-security",
                 mode: "sign",
             },
-            opcua_authetication_sc: {
-                scheme: "opcua-authentication",
+            opcua_authentication_sc: {
+                scheme: "uav:authentication",
             },
             comob_opcua_secure_channel: {
                 scheme: "combo",
                 oneOf: ["opcua_secure_channel_encrypt_sc", "opcua_secure_channel_sign_sc"],
             },
             combo_sc: {
                 scheme: "combo",
-                allOf: ["comob_opcua_secure_channel", "opcua_authetication_sc"],
+                allOf: ["comob_opcua_secure_channel", "opcua_authentication_sc"],
             },
         };
         ct.security = ["combo_sc"];
@@ -879,16 +879,16 @@ class WoTClientTest {
         expect(comboScheme.allOf).instanceOf(Array);
         expect(comboScheme.allOf.length).equal(2);
         expect(comboScheme.allOf[0].scheme).equals("combo");
-        expect(comboScheme.allOf[1].scheme).equals("opcua-authentication");
+        expect(comboScheme.allOf[1].scheme).equals("uav:authentication");
 
         //
         const firstScheme = comboScheme.allOf[0] as OneOfSecurityScheme;
         expect(firstScheme.scheme).equal("combo");
         expect(firstScheme.oneOf).instanceOf(Array);
 
         expect(firstScheme.oneOf.length).equal(2);
-        expect(firstScheme.oneOf[0].scheme).equal("opcua-channel-security");
-        expect(firstScheme.oneOf[0].scheme).equal("opcua-channel-security");
+        expect(firstScheme.oneOf[0].scheme).equal("uav:channel-security");
+        expect(firstScheme.oneOf[1].scheme).equal("uav:channel-security");
     }
 
     @test "ensure combo security in form - allOf"() {
@@ -898,14 +898,14 @@ class WoTClientTest {
                 scheme: "basic",
             },
             opcua_secure_channel_sc: {
-                scheme: "opcua-channel-security",
+                scheme: "uav:channel-security",
             },
-            opcua_authetication_sc: {
-                scheme: "opcua-authentication",
+            opcua_authentication_sc: {
+                scheme: "uav:authentication",
             },
             combo_sc: {
                 scheme: "combo",
-                allOf: ["opcua_secure_channel_sc", "opcua_authetication_sc"],
+                allOf: ["opcua_secure_channel_sc", "opcua_authentication_sc"],
             },
         };
         ct.security = "basic";
@@ -918,8 +918,8 @@ class WoTClientTest {
         expect(pc.securitySchemes.length).equals(1);
         const comboScheme = pc.securitySchemes[0] as AllOfSecurityScheme;
 
-        expect(comboScheme.allOf[0].scheme).equals("opcua-channel-security");
-        expect(comboScheme.allOf[1].scheme).equals("opcua-authentication");
+        expect(comboScheme.allOf[0].scheme).equals("uav:channel-security");
+        expect(comboScheme.allOf[1].scheme).equals("uav:authentication");
     }
 
     @test "ensure no infinite loop with recursive combo security"() {