bugfix: ensure the google_assistant component respects allow_unlock (#18874)

The `Config` object specific to the `google_assistant` component
had a default value for `allow_unlock`. We were not overriding this
default when constructing the Config object during `google_assistant`
component setup, whereas we do when setting up the `cloud` component.

To fix, we thread the `allow_unlock` parameter down through http setup,
and ensure that it's set correctly. Moreover, we also change the
ordering of the `Config` parameters, and remove the default. Future
refactoring should not miss it, as it is now a required parameter.
This commit is contained in:
Andrew Hayworth authored and Paulus Schoutsen committed 2018-12-02 11:14:46 +01:00
1 parent a62fc7ca04
commit b7e2522083
5 files changed
+12 -5

No files matched your search

+1 -1
View File
@@ -191,9 +191,9 @@ class Cloud:
self._gactions_config = ga_h.Config(
should_expose=should_expose,
allow_unlock=self.prefs.google_allow_unlock,
agent_user_id=self.claims['cognito:username'],
entity_config=conf.get(CONF_ENTITY_CONFIG),
allow_unlock=self.prefs.google_allow_unlock,
)
return self._gactions_config