Skip to content

fixed for the issue #1524 #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixed for the issue #1524 #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1654e45
#1524 fix
vivekNEC May 15, 2024
889e0e0
Update CHANGES_NEXT_RELEASE
vivekNEC Sep 25, 2024
e173e1f
Merge branch 'master' into bugfix-1524
vivekNEC Sep 25, 2024
0e34d23
Merge branch 'master' into bugfix-1524
vivekNEC Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- Upgrade express de from 4.19.2 to 4.20.0
- Fix: autoprovison now working with resources diferent from defaultResource (#1524)

5 changes: 4 additions & 1 deletion lib/services/groups/groupRegistryMongoDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,17 @@ function find(service, subservice, callback) {
}

function findOneInMongoDB(queryObj, fields, callback) {
const query = Group.model.findOne(queryObj);
const query = Group.model.findOne({
$or: [{ apikey: queryObj.apikey }, { type: queryObj.type }]
});
query.select({ __v: 0 });
query.lean().exec(function handleGet(error, data) {
if (error) {
logger.debug(context, 'Internal MongoDB Error getting group: %s', error);
callback(new errors.InternalDbError(error));
} else if (data) {
context = fillService(context, data);
queryObj.resource = data.resource;
logger.debug(context, 'Device group data found: %j', data);
callback(null, data);
} else {
Expand Down
Loading