Merge stage for release 1.2.0

Author: GufCab

ormconfig.js

@@ -7,7 +7,7 @@ module.exports = {
     "database": "os2iot",
     "synchronize": false,
     "logging": false,
-    "entities": ["src/entities/*.ts"],
+    "entities": ["src/entities/*.ts", "src/entities/permissions/*.ts"],
     "migrations": ["src/migration/*.ts"],
     "cli": {
         "migrationsDir": "src/migration"

package-lock.json

@@ -58,12 +58,14 @@
         "mqtt": "^4.2.6",
         "nestjs-pino": "^1.3.0",
         "njwt": "^1.0.0",
+        "nodemailer": "^6.7.2",
         "passport": "^0.4.1",
         "passport-headerapikey": "^1.2.2",
         "passport-jwt": "^4.0.0",
         "passport-local": "^1.0.0",
         "passport-saml": "^1.3.5",
         "pg": "^8.5.1",
+        "protobufjs": "^6.11.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "rxjs": "^6.6.3",
@@ -83,6 +85,7 @@
         "@types/express": "^4.17.9",
         "@types/lodash": "^4.14.165",
         "@types/node": "^14.14.14",
+        "@types/nodemailer": "^6.4.4",
         "@types/passport-jwt": "^3.0.3",
         "@types/passport-local": "^1.0.33",
         "@types/supertest": "^2.0.10",

package.json

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package gw;
+
+// ConnState contains the connection state of a gateway.
+message ConnState {
+    // Gateway ID.
+    bytes gateway_id = 1 [json_name = "gatewayID"];
+
+    enum State {
+        OFFLINE = 0;
+        ONLINE = 1;
+    }
+
+    State state = 2;
+}

resources/chirpstack-state.proto

@@ -4,7 +4,7 @@ import { SetMetadata } from "@nestjs/common";
 import { RolesMetaData } from "./constants";
 
 export const Read = () => SetMetadata(RolesMetaData, PermissionType.Read);
-export const Write = () => SetMetadata(RolesMetaData, PermissionType.Write);
-export const OrganizationAdmin = () =>
-    SetMetadata(RolesMetaData, PermissionType.OrganizationAdmin);
+export const UserAdmin = () => SetMetadata(RolesMetaData, PermissionType.OrganizationUserAdmin);
+export const GatewayAdmin = () => SetMetadata(RolesMetaData, PermissionType.OrganizationGatewayAdmin);
+export const ApplicationAdmin = () => SetMetadata(RolesMetaData, PermissionType.OrganizationApplicationAdmin);
 export const GlobalAdmin = () => SetMetadata(RolesMetaData, PermissionType.GlobalAdmin);

src/auth/roles.decorator.ts

@@ -40,34 +40,37 @@ export class RolesGuard implements CanActivate {
     hasAccess(user: AuthenticatedUser, roleRequired: string): boolean {
         if (user.permissions.isGlobalAdmin) {
             return true;
-        } else if (roleRequired == PermissionType.OrganizationAdmin) {
-            return this.hasOrganizationAdminAccess(user);
-        } else if (roleRequired == PermissionType.Write) {
-            return this.hasOrganizationAdminAccess(user) || this.hasWriteAccess(user);
+        } else if (roleRequired == PermissionType.OrganizationApplicationAdmin) {
+            return this.hasOrganizationApplicationAdminAccess(user);
+        } else if (roleRequired == PermissionType.OrganizationUserAdmin) {
+            return this.hasOrganizationUserAdminAccess(user);
+        } else if (roleRequired == PermissionType.OrganizationGatewayAdmin) {
+            return this.hasOrganizationGatewayAdminAccess(user);
         } else if (roleRequired == PermissionType.Read) {
             return (
-                this.hasOrganizationAdminAccess(user) ||
-                this.hasWriteAccess(user) ||
+                this.hasOrganizationApplicationAdminAccess(user) ||
+                this.hasOrganizationUserAdminAccess(user) ||
+                this.hasOrganizationGatewayAdminAccess(user) ||
                 this.hasReadAccess(user)
             );
         }
 
         return false;
     }
 
-    hasOrganizationAdminAccess(user: AuthenticatedUser): boolean {
-        return user.permissions.organizationAdminPermissions.size > 0;
+    hasOrganizationApplicationAdminAccess(user: AuthenticatedUser): boolean {
+        return user.permissions.orgToApplicationAdminPermissions.size > 0;
     }
 
-    hasWriteAccess(user: AuthenticatedUser): boolean {
-        return this.hasSomeAccess(user.permissions.writePermissions);
+    hasOrganizationUserAdminAccess(user: AuthenticatedUser): boolean {
+        return user.permissions.orgToUserAdminPermissions.size > 0;
     }
 
-    hasReadAccess(user: AuthenticatedUser): boolean {
-        return this.hasSomeAccess(user.permissions.readPermissions);
+    hasOrganizationGatewayAdminAccess(user: AuthenticatedUser): boolean {
+        return user.permissions.orgToGatewayAdminPermissions.size > 0;
     }
 
-    hasSomeAccess(userPermission: Map<number, number[]>): boolean {
-        return userPermission.size > 0;
+    hasReadAccess(user: AuthenticatedUser): boolean {
+        return user.permissions.orgToReadPermissions.size > 0;
     }
 }

src/auth/roles.guard.ts

@@ -1,4 +1,4 @@
-import { GetLogLevels } from "@helpers/env-variable-helper";
+import { GetLogLevels, formatEmail } from "@helpers/env-variable-helper";
 
 export default (): any => {
     return {
@@ -8,7 +8,7 @@ export default (): any => {
             port: parseInt(process.env.DATABASE_PORT, 10) || 5433,
             username: process.env.DATABASE_USERNAME || "os2iot",
             password: process.env.DATABASE_PASSWORD || "toi2so",
-            ssl: process.env.DATABASE_ENABLE_SSL === "true"
+            ssl: process.env.DATABASE_ENABLE_SSL === "true",
         },
         jwt: {
             secret: process.env.JWT_SECRET || "secretKey-os2iot-secretKey",
@@ -17,6 +17,8 @@ export default (): any => {
         backend: {
             baseurl:
                 process.env.BACKEND_BASEURL || "https://test-os2iot-backend.os2iot.dk",
+            deviceStatsIntervalInDays:
+                parseInt(process.env.DEVICE_STATS_INTERVAL_IN_DAYS, 10) || 29,
         },
         kombit: {
             entryPoint:
@@ -30,6 +32,24 @@ export default (): any => {
         chirpstack: {
             jwtsecret: process.env.CHIRPSTACK_JWTSECRET || "verysecret",
         },
-        logLevels: process.env.LOG_LEVEL ? GetLogLevels(process.env.LOG_LEVEL) : GetLogLevels('debug')
+        logLevels: process.env.LOG_LEVEL
+            ? GetLogLevels(process.env.LOG_LEVEL)
+            : GetLogLevels("debug"),
+        email: {
+            host: process.env.EMAIL_HOST || "smtp.ethereal.email",
+            port: process.env.EMAIL_PORT || 587,
+            user: process.env.EMAIL_USER || "[email protected]",
+            pass: process.env.EMAIL_PASS || "KzRSyYReEygpFPPZdd",
+            /**
+             * Can be formatted to show a user-friendly name before the e-mail.
+             * E.g. "OS2iot <[email protected]>"
+             */
+            from: process.env.EMAIL_FROM
+                ? formatEmail(process.env.EMAIL_FROM)
+                : "OS2iot [email protected]",
+        },
+        frontend: {
+            baseurl: process.env.FRONTEND_BASEURL || "http://localhost:8081",
+        },
     };
 };

src/config/configuration.ts

@@ -0,0 +1 @@
+export const MqttClientId = "os2iot-backend";

src/config/constants/mqtt-constants.ts

@@ -0,0 +1,2 @@
+export const DefaultLimit = 100;
+export const DefaultOffset = 0;

src/config/constants/pagination-constants.ts

@@ -0,0 +1,6 @@
+// OS2iot won't be translated in any other language than Danish in the foreseeable future
+export enum Translations {
+    OrganizationAdmin = "Organisationsadministrator",
+    ApplicationAdmin = "Applikationsadministrator",
+    ReadLevel = "Læserettigheder",
+}