Merge branch 'master' into dependabot/npm_and_yarn/fs-extra-11.3.2

Author: Apollon77

CONTRIBUTING.md

@@ -8,7 +8,7 @@ The js-controller repository is a monorepo which is managed via `lerna`. Every f
 To install the dependencies, execute
 
 ```bash
-npm i --ignore-scripts
+npm ci --ignore-scripts
 ```
 
 in the root folder of the project.

packages/db-objects-file/src/lib/objects/objectsInMemServerRedis.js

@@ -80,7 +80,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-objects listening on port ${
-                        settings.port || 9001
+                        this.settings.connection.port || 9001
                     }`,
                 );
 
@@ -90,7 +90,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-objects on port ${settings.port || 9001}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-objects on port ${this.settings.connection.port || 9001}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_OBJ_DB);
             });

packages/db-objects-jsonl/src/lib/objects/objectsInMemServerRedis.js

@@ -80,7 +80,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-objects listening on port ${
-                        settings.port || 9001
+                        this.settings.connection.port || 9001
                     }`,
                 );
 
@@ -90,7 +90,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-objects on port ${settings.port || 9001}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-objects on port ${this.settings.connection.port || 9001}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_OBJ_DB);
             });

packages/db-states-file/src/lib/states/statesInMemServerRedis.js

@@ -68,7 +68,7 @@ export class StatesInMemoryServer extends StatesInMemoryFileDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${
-                        this.settings.port || 9000
+                        this.settings.connection.port || 9000
                     }`,
                 );
 
@@ -78,7 +78,7 @@ export class StatesInMemoryServer extends StatesInMemoryFileDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-states on port ${this.settings.connection.port || 9000}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_STATES_DB);
             });
@@ -534,8 +534,8 @@ export class StatesInMemoryServer extends StatesInMemoryFileDB {
                 this.server = net.createServer();
                 this.server.on('error', err =>
                     this.log.info(
-                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${
-                            settings.port || 9001
+                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-states listening on port ${
+                            settings.port || 9000
                         }: ${err}`,
                     ),
                 );

packages/db-states-jsonl/src/lib/states/statesInMemServerRedis.js

@@ -68,7 +68,7 @@ export class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${
-                        this.settings.port || 9000
+                        this.settings.connection.port || 9000
                     }`,
                 );
 
@@ -78,7 +78,7 @@ export class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-states on port ${this.settings.connection.port || 9000}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_STATES_DB);
             });
@@ -534,8 +534,8 @@ export class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                 this.server = net.createServer();
                 this.server.on('error', err =>
                     this.log.info(
-                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${
-                            settings.port || 9001
+                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-states listening on port ${
+                            settings.port || 9000
                         }: ${err}`,
                     ),
                 );

packages/types-dev/objects.d.ts

@@ -439,6 +439,8 @@ declare global {
             password: string;
             /** Whether this user is enabled */
             enabled: boolean;
+            /** External authentications besides password, e.g. OIDC */
+            externalAuthentication?: Record<string, unknown>;
 
             // Make it possible to narrow the object type using the custom property
             custom?: undefined;

packages/types-public/index.test-d.ts

@@ -78,10 +78,16 @@ function objectChangeHandler(id: string, object: ioBroker.Object | null | undefi
             case 'instance':
             case 'meta':
             case 'script':
-            case 'user':
                 // nothing special here, update these tests when we have specialized definitions
                 break;
-
+            case 'user': {
+                if (object.common.externalAuthentication?.oidc) {
+                    /** It is up to the dev how this looks like hence, oidc is of type unknown */
+                    const oidc = object.common.externalAuthentication.oidc as { sub: string };
+                    oidc.sub === 'foo';
+                }
+                break;
+            }
             case 'state':
                 if (object.acl) {
                     object.acl.state.toFixed();
@@ -891,6 +897,14 @@ const _userObject: ioBroker.UserObject = {
     native: {},
 };
 
+/** With external auth */
+const _userObjectExt: ioBroker.UserObject = {
+    _id: 'system.user.me',
+    type: 'user',
+    common: { name: 'me', password: '*****', enabled: true, externalAuthentication: { oidc: { sub: 'bar' } } },
+    native: {},
+};
+
 // Ensure that getForeignObject tries to resolve a specific object type
 async () => {
     const inst: ioBroker.InstanceObject | null | undefined =