create and set user local proxy

Author: treethought

flask_assistant/core.py

@@ -39,6 +39,7 @@ def find_assistant():  # Taken from Flask-ask courtesy of @voutilad
 context_manager = LocalProxy(lambda: find_assistant().context_manager)
 convert_errors = LocalProxy(lambda: find_assistant().convert_errors)
 session_id = LocalProxy(lambda: find_assistant().session_id)
+user = LocalProxy(lambda: find_assistant().user)
 
 # Converter shorthands for commonly used system entities
 _converter_shorthands = {
@@ -220,6 +221,14 @@ def session_id(self):
     def session_id(self, value):
         _app_ctx_stack.top._assist_session_id = value
 
+    @property
+    def user(self):
+        return getattr(_app_ctx_stack.top, "_assist_user", {})
+
+    @user.setter
+    def user(self, value):
+        _app_ctx_stack.top._assist_user = value
+
     def _register_context_to_func(self, intent_name, context=[]):
         required = self._required_contexts.get(intent_name)
         if required:
@@ -367,8 +376,14 @@ def _flask_assitant_view_func(self, nlp_result=None, *args, **kwargs):
         # TODO: acces context_manager from assist, instead of own object
         self.context_manager._assist = self
 
-        # Get access token from request
+        
         original_request = self.request.get("originalDetectIntentRequest")
+
+
+        if original_request and original_request["payload"].get("user"):
+            self.user = original_request["payload"]["user"]
+
+        # Get access token from request
         if original_request and original_request.get("user"):
             self.access_token = original_request["user"].get("accessToken")
 

flask_assistant/response.py

@@ -28,14 +28,21 @@ def __init__(self, speech, display_text=None, is_ssml=False):
         }
 
         if "ACTIONS_ON_GOOGLE" in self._integrations:
+            self._set_user_storage()
             self._integrate_with_actions(self._speech, self._display_text, is_ssml)
 
     def add_msg(self, speech, display_text=None, is_ssml=False):
         self._messages.append({"text": {"text": [speech]}})
         if "ACTIONS_ON_GOOGLE" in self._integrations:
             self._integrate_with_actions(speech, display_text, is_ssml)
 
-        return self
+    def _set_user_storage(self):
+        from flask_assistant.core import user
+
+        # If empty or unspecified,
+        # the existing persisted token will be unchanged.
+        if user.get("userStorage"):
+            self._response["payload"]["google"]["userStorage"] = user["userStorage"]
 
     def _integrate_with_actions(self, speech=None, display_text=None, is_ssml=False):
         if display_text is None: