Skip to content
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.

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

Fixed: TypeError: Cannot read property 'owner' of undefined #408

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 3 additions & 10 deletions huemagic/utils/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,7 @@ function API()
})
.catch(function(error)
{
if (error.response)
{
reject({ status: error.response.status, errors: error.response.data.errors ? error.response.data.errors : error.response.data});
}
else
{
reject({ status: error.code, errors: error.message});
}
reject({ status: error.response.status, errors: error.response.data.errors ? error.response.data.errors : error.response.data});
});
});
}
Expand Down Expand Up @@ -182,7 +175,7 @@ function API()
const scope = this;
var fullResource = Object.assign({}, resource);

if(resource["owner"])
if(resource["owner"] && typeof allResources[fullResource["owner"]["rid"]] !== 'undefined')
{
fullResource = scope.fullResource(allResources[fullResource["owner"]["rid"]], allResources);
}
Expand Down Expand Up @@ -282,4 +275,4 @@ function API()
}

// EXPORT
module.exports = new API;
module.exports = new API;
3 changes: 2 additions & 1 deletion huemagic/utils/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ class HueGroupMessage
constructor(resource, options = {})
{
let service = Object.values(resource["services"]["grouped_light"])[0];
let onOff = service.on.on;
service = options.resources[service.id];

// GET ALL RESOURCES
Expand All @@ -130,7 +131,7 @@ class HueGroupMessage

this.message = {};
this.message.payload = {};
this.message.payload.on = service.on.on;
this.message.payload.on = onOff;
this.message.payload.updated = resource.updated;

this.message.info = {};
Expand Down