Fix two regressions introduced by 0.15.0.

See: brocaar/chirpstack-application-server#37.

Author: brocaar

docs/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.15.1
+
+**Bugfixes:**
+
+* Fix error handling for creating a node-session that already exists
+* Fix delete node-session regression introduced in 0.15.0
+
 ## 0.15.0
 
 **Features:**

internal/api/network_server.go

@@ -64,7 +64,7 @@ func (n *NetworkServerAPI) CreateNodeSession(ctx context.Context, req *ns.Create
 		return nil, grpc.Errorf(codes.Internal, err.Error())
 	}
 	if exists {
-		return nil, grpc.Errorf(codes.AlreadyExists, err.Error())
+		return nil, grpc.Errorf(codes.AlreadyExists, "node-session already exists")
 	}
 
 	if err := session.SaveNodeSession(n.ctx.RedisPool, sess); err != nil {
@@ -181,12 +181,7 @@ func (n *NetworkServerAPI) DeleteNodeSession(ctx context.Context, req *ns.Delete
 	var devEUI lorawan.EUI64
 	copy(devEUI[:], req.DevEUI)
 
-	sess, err := session.GetNodeSession(n.ctx.RedisPool, devEUI)
-	if err != nil {
-		return nil, grpc.Errorf(codes.Unknown, err.Error())
-	}
-
-	if err := session.DeleteNodeSession(n.ctx.RedisPool, sess.DevAddr); err != nil {
+	if err := session.DeleteNodeSession(n.ctx.RedisPool, devEUI); err != nil {
 		return nil, grpc.Errorf(codes.Unknown, err.Error())
 	}
 

internal/session/session.go

@@ -210,18 +210,18 @@ func GetNodeSession(p *redis.Pool, devEUI lorawan.EUI64) (NodeSession, error) {
 	return ns, nil
 }
 
-// DeleteNodeSession deletes the NodeSession matching the given DevAddr.
-func DeleteNodeSession(p *redis.Pool, devAddr lorawan.DevAddr) error {
+// DeleteNodeSession deletes the NodeSession matching the given DevEUI.
+func DeleteNodeSession(p *redis.Pool, devEUI lorawan.EUI64) error {
 	c := p.Get()
 	defer c.Close()
 
-	val, err := redis.Int(c.Do("DEL", fmt.Sprintf(nodeSessionKeyTempl, devAddr)))
+	val, err := redis.Int(c.Do("DEL", fmt.Sprintf(nodeSessionKeyTempl, devEUI)))
 	if err != nil {
-		return fmt.Errorf("delete node-session %s error: %s", devAddr, err)
+		return fmt.Errorf("delete node-session %s error: %s", devEUI, err)
 	}
 	if val == 0 {
-		return fmt.Errorf("node-session %s does not exist", devAddr)
+		return fmt.Errorf("node-session %s does not exist", devEUI)
 	}
-	log.WithField("dev_addr", devAddr).Info("node-session deleted")
+	log.WithField("dev_eui", devEUI).Info("node-session deleted")
 	return nil
 }

internal/session/session_test.go

@@ -139,6 +139,16 @@ func TestNodeSession(t *testing.T) {
 						So(exists, ShouldBeTrue)
 					})
 				})
+
+				Convey("When deleting a NodeSession", func() {
+					So(DeleteNodeSession(p, ns.DevEUI), ShouldBeNil)
+
+					Convey("Then the node-session has been removed", func() {
+						exists, err := NodeSessionExists(p, ns.DevEUI)
+						So(err, ShouldBeNil)
+						So(exists, ShouldBeFalse)
+					})
+				})
 			})
 
 			Convey("When calling validateAndGetFullFCntUp", func() {

mkdocs.yml

@@ -14,7 +14,7 @@ pages:
   - changelog.md
 
 extra:
-  version: '0.15.0'
+  version: '0.15.1'
   github:
     download_release: true