Merge pull request #5149 from TheThingsNetwork/feature/js-interop-nsid

TheThingsNetwork · Jan 31, 2022 · 46457e7 · 46457e7
2 parents c3a3a88 + a04e1f8
commit 46457e7
Show file tree

Hide file tree

Showing 20 changed files with 627 additions and 1,183 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@ For details about compatibility between different releases, see the **Commitment
 
 ### Fixed
 
+- Device activation flow with a LoRaWAN Backend Interfaces 1.1 capable Join Server.
+
 ### Security
 
 ## [3.17.2] - 2022-01-30

diff --git a/config/messages.json b/config/messages.json
@@ -5750,6 +5750,15 @@
       "file": "errors.go"
     }
   },
+  "error:pkg/interop:dns_lookup_not_supported": {
+    "translations": {
+      "en": "DNS lookup is not supported"
+    },
+    "description": {
+      "package": "pkg/interop",
+      "file": "client.go"
+    }
+  },
   "error:pkg/interop:f_port": {
     "translations": {
       "en": "invalid FPort"
@@ -5849,6 +5858,15 @@
       "file": "errors.go"
     }
   },
+  "error:pkg/interop:missing_nsid": {
+    "translations": {
+      "en": "missing NSID"
+    },
+    "description": {
+      "package": "pkg/interop",
+      "file": "client.go"
+    }
+  },
   "error:pkg/interop:no_action": {
     "translations": {
       "en": "no action"
@@ -5903,6 +5921,15 @@
       "file": "errors.go"
     }
   },
+  "error:pkg/interop:nsid_not_supported": {
+    "translations": {
+      "en": "NSID not supported"
+    },
+    "description": {
+      "package": "pkg/interop",
+      "file": "client.go"
+    }
+  },
   "error:pkg/interop:protocol_version": {
     "translations": {
       "en": "invalid protocol version"
@@ -5950,7 +5977,7 @@
   },
   "error:pkg/interop:unexpected_result": {
     "translations": {
-      "en": "unexpected result code {code}"
+      "en": "unexpected result code `{result_code}`"
     },
     "description": {
       "package": "pkg/interop",

diff --git a/pkg/component/interop_test.go b/pkg/component/interop_test.go
@@ -149,7 +149,7 @@ func TestInteropTLS(t *testing.T) {
 			NsJsMessageHeader: interop.NsJsMessageHeader{
 				MessageHeader: interop.MessageHeader{
 					MessageType:     interop.MessageTypeJoinReq,
-					ProtocolVersion: "1.1",
+					ProtocolVersion: "1.0",
 				},
 				SenderID:   interop.NetID{0x0, 0x0, 0x1},
 				ReceiverID: interop.EUI64{0x42, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -169,7 +169,7 @@ func TestInteropTLS(t *testing.T) {
 			NsJsMessageHeader: interop.NsJsMessageHeader{
 				MessageHeader: interop.MessageHeader{
 					MessageType:     interop.MessageTypeJoinReq,
-					ProtocolVersion: "1.1",
+					ProtocolVersion: "1.0",
 				},
 				SenderID:   interop.NetID{0x0, 0x0, 0x2},
 				ReceiverID: interop.EUI64{0x42, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},

diff --git a/pkg/identityserver/http_interop.go b/pkg/identityserver/http_interop.go
@@ -82,7 +82,7 @@ func (srv *interopServer) HomeNSRequest(ctx context.Context, in *interop.HomeNSR
 		HNSAddress: dev.NetworkServerAddress,
 		HTenantID:  conf.Network.TenantID,
 	}
-	if in.ProtocolVersion.SupportsNSID() {
+	if in.ProtocolVersion.RequiresNSID() {
 		ans.HNSID = (*interop.EUI64)(hNSID)
 	}
 	return ans, nil