From 5e5a47ce02edb62617898f5503306904c32491c7 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sat, 29 Aug 2020 11:03:12 +0200
Subject: [PATCH] Leave out roles array in serialized user

Leave out the roles property containing the array of role ids if the
user does not have any roles.
---
 lib/users.js      |  5 ++++-
 test/lib/users.js | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/users.js b/lib/users.js
index 1ad2a8bf..4ba85e96 100644
--- a/lib/users.js
+++ b/lib/users.js
@@ -173,9 +173,12 @@ class User {
 	serialize() {
 		let serialized = {
 			name: this.name,
-			roles: [...this.roles].map(role => role.id),
 		};
 
+		if (this.roles.size) {
+			serialized.roles = [...this.roles].map(role => role.id);
+		}
+
 		if (this.tokenValidAfter) {
 			serialized.tokenValidAfter = this.tokenValidAfter;
 		}
diff --git a/test/lib/users.js b/test/lib/users.js
index 901bb53b..2e577135 100644
--- a/test/lib/users.js
+++ b/test/lib/users.js
@@ -71,13 +71,20 @@ describe("lib/users", function() {
 			[2, new users.Role({ id: 2, name: "b", description: "b role", permissions: ["test"] })],
 		]);
 		it("should round trip serialize", function() {
-			let orig = new users.User({ name: "admin", roles: [1] }, roles);
-			let copy = new users.User(orig.serialize(), roles);
-			assert.deepEqual(copy, orig);
+			function test_roundtrip(serialized) {
+				let user = new users.User(serialized, roles);
+				let user_serialized = user.serialize();
+				assert.deepEqual(user_serialized, serialized);
+				let user_deserialized = new users.User(user_serialized, roles);
+				assert.deepEqual(user_deserialized, user);
+			}
 
-			orig = new users.User({ name: "user", roles: [2], tokenValidAfter: 12345 }, roles);
-			copy = new users.User(orig.serialize(), roles);
-			assert.deepEqual(copy, orig);
+			test_roundtrip({ name: "admin", roles: [1] });
+			test_roundtrip({ name: "user", roles: [2], token_valid_after: 12345 });
+		});
+		it("should ignore invalid roles", function() {
+			let user = new users.User({ name: "test", roles: [1, 4, 55] }, roles);
+			assert.equal(user.roles.size, 1, "Unexpected count of roles");
 		});
 		it("should track online users", function() {
 			let user = new users.User({ name: "admin", roles: [1] }, roles);