From 525bf56d5b734fc3bddbb63ceead4dc8f089049b Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Sat, 26 Apr 2025 16:48:39 +0100 Subject: [PATCH 1/2] Added typing for `findForeignObject` --- packages/adapter/src/lib/adapter/adapter.ts | 9 ++++++++- packages/cli/src/lib/setup/setupUsers.ts | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/adapter/src/lib/adapter/adapter.ts b/packages/adapter/src/lib/adapter/adapter.ts index 630457c87b..12906e4de7 100644 --- a/packages/adapter/src/lib/adapter/adapter.ts +++ b/packages/adapter/src/lib/adapter/adapter.ts @@ -4459,7 +4459,14 @@ export class AdapterClass extends EventEmitter { findForeignObject( idOrName: string, type: ioBroker.CommonType | null, - options: { user?: `system.user.${string}`; language?: ioBroker.Languages }, + options: { + user?: `system.user.${string}`; + language?: ioBroker.Languages; + /** Internal flag, if adapter has already checked the access rights */ + checked?: boolean; + /** Search only within the states, that belongs to this user */ + limitToOwnerRights?: boolean; + }, callback: ioBroker.FindObjectCallback, ): void; diff --git a/packages/cli/src/lib/setup/setupUsers.ts b/packages/cli/src/lib/setup/setupUsers.ts index 8376baec45..09a819a516 100644 --- a/packages/cli/src/lib/setup/setupUsers.ts +++ b/packages/cli/src/lib/setup/setupUsers.ts @@ -334,7 +334,7 @@ export class Users { if (!isExisting) { return tools.maybeCallbackWithError(callback, `User "${username}" does not exist.`); } - // Check group + // Check a group if (!password) { prompt.message = ''; prompt.delimiter = ''; @@ -356,7 +356,7 @@ export class Users { } as const satisfies prompt.Schema; prompt.start(); - prompt.get>(schema, (err, result) => { + prompt.get>(schema, (_err: Error | null, result): void => { if (result) { if (result.password !== result.repeatPassword) { return tools.maybeCallbackWithError(callback, 'Passwords are not identical!'); From 3f0dabb36b2a47017079a167fcb57eef2f0986e3 Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Mon, 5 May 2025 12:29:45 +0100 Subject: [PATCH 2/2] Changed comment --- packages/adapter/src/lib/adapter/adapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/adapter/src/lib/adapter/adapter.ts b/packages/adapter/src/lib/adapter/adapter.ts index 12906e4de7..ffc1c8ea97 100644 --- a/packages/adapter/src/lib/adapter/adapter.ts +++ b/packages/adapter/src/lib/adapter/adapter.ts @@ -4462,7 +4462,7 @@ export class AdapterClass extends EventEmitter { options: { user?: `system.user.${string}`; language?: ioBroker.Languages; - /** Internal flag, if adapter has already checked the access rights */ + /** This can be set to true to disable permission checks if they were already checked otherwise. Use it with caution! */ checked?: boolean; /** Search only within the states, that belongs to this user */ limitToOwnerRights?: boolean;