Merge pull request #130 from davidalbertonogueira/master

Fix deprecated Google certificates & add MediaResponse

Author: treethought

flask_assistant/core.py

@@ -395,7 +395,11 @@ def _set_user_profile(self):
             from flask_assistant.utils import decode_token
 
             token = self.user["idToken"]
-            profile_payload = decode_token(token, self.client_id)
+            decode_resp = decode_token(token, self.client_id)
+            if decode_resp["status"]=="BAD":
+                return
+            else: #decode_resp["status"]=="OK"
+                profile_payload = decode_resp["output"]
             for k in ["sub", "iss", "aud", "iat", "exp"]:
                 profile_payload.pop(k)
 

flask_assistant/response.py

@@ -11,7 +11,7 @@ def __init__(self, speech, display_text=None, is_ssml=False):
         self._display_text = display_text
         self._integrations = current_app.config.get("INTEGRATIONS", [])
         self._messages = [{"text": {"text": [speech]}}]
-
+        self._is_ssml = is_ssml
         self._response = {
             "fulfillmentText": speech,
             "fulfillmentMessages": self._messages,
@@ -197,6 +197,49 @@ def build_carousel(self, items=None):
         )
         return carousel
 
+    def add_media(self, url, name, description=None, icon_url=None, icon_alt=None):
+        """Adds a Media Card Response
+
+        Media responses let your Actions play audio content with a
+        playback duration longer than the 240-second limit of SSML.
+
+        Can be included with ask and tell responses.
+        If added to an `ask` response, suggestion chips
+
+         Arguments:
+            url {str} -- Required. Url where the media is stored
+            name {str} -- Name of media card.
+
+        Optional:
+            description {str} -- A description of the item (default: {None})
+            icon_url {str} -- Url of icon image
+            icon_alt {str} -- Accessibility text for icon image
+
+        example usage:
+
+            resp = ask("Check out this tune")
+            resp = resp.add_media(url, "Jazzy Tune")
+            return resp_with_media.suggest("Next Song", "Done")
+
+
+        """
+        media_object = {"contentUrl": url, "name": name}
+        if description:
+            media_object["description"] = description
+
+        if icon_url:
+            media_object["largeImage"] = {}
+            media_object["largeImage"]["imageUri"] = icon_url
+            media_object["largeImage"]["accessibilityText"] = icon_alt or name
+
+        self._messages.append(
+            {
+                "platform": "ACTIONS_ON_GOOGLE",
+                "mediaContent": {"mediaObjects": [media_object], "mediaType": "AUDIO",},
+            }
+        )
+        return self
+
 
 def build_item(
     title, key=None, synonyms=None, description=None, img_url=None, alt_text=None
@@ -307,10 +350,12 @@ def __init__(self, speech, display_text=None, is_ssml=False):
         self._response["payload"]["google"]["expect_user_response"] = True
 
     def reprompt(self, prompt):
-        self._response["payload"]["google"]["no_input_prompts"] = [
-            {"text_to_speech": prompt}
-        ]
-
+        repromtKey = "text_to_speech"
+        if self._is_ssml:
+            repromtKey = "ssml"
+        repromtResponse = {}
+        repromtResponse[repromtKey] = prompt
+        self._response["payload"]["google"]["no_input_prompts"] = [repromtResponse]
         return self
 
 
@@ -367,18 +412,26 @@ class sign_in(_Response):
     with the `user.profile` local
 
     In order to complete the sign in process, you will need to create an intent with
-    the `actions_intent_SIGN)IN` event
+    the `actions_intent_SIGN_IN` event
     """
 
+    # Payload according to https://developers.google.com/assistant/conversational/helpers#account_sign-in
     def __init__(self, reason=None):
         super(sign_in, self).__init__(speech=None)
 
         self._messages[:] = []
-        self._response["payload"]["google"]["systemIntent"] = {
-            "intent": "actions.intent.SIGN_IN",
-            "data": {
-                "optContext": reason,
-                "@type": "type.googleapis.com/google.actions.v2.SignInValueSpec",
-            },
+        self._response = {
+            "payload": {
+                "google": {
+                    "expectUserResponse": True,
+                    "systemIntent": {
+                        "intent": "actions.intent.SIGN_IN",
+                        "data": {
+                            "@type": "type.googleapis.com/google.actions.v2.SignInValueSpec"
+                        },
+                    },
+                }
+            }
         }
 
+

flask_assistant/utils.py

@@ -6,17 +6,10 @@
 from google.auth import jwt
 from flask_assistant.core import Assistant
 from . import logger
-
+import requests
 
 logger.setLevel(logging.INFO)
 
-GOOGLE_PUBLIC_KEY = {
-    "ee4dbd06c06683cb48dddca6b88c3e473b6915b9": "-----BEGIN CERTIFICATE-----\nMIIDJjCCAg6gAwIBAgIIXlp0tU/OdR8wDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe\nFw0xOTEwMDMxNDQ5MzRaFw0xOTEwMjAwMzA0MzRaMDYxNDAyBgNVBAMTK2ZlZGVy\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wggEiMA0GCSqG\nSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC41NLGPK9PRi0KjFTIQ9qEirje2IrmWSwZ\n7lmgTzwA4mpc4tqDn7AfUTHmuyhDrbweGq2wQeYJDbBPT5uX86XcQgAcu4IzSuZG\nJZ68ASYOWWlKV0vYjf6W/9v73sGJFxbkoAB8X7QH/fN80QYoXvSX+IwNnePnoikM\nnAsNiZrkLoqHuv5+ahOgpBN5qyvKglasNiXGpv8EL96CKb+nmMudzpypjbQHJUp2\nmfDvOiTX6IuSXyeYRkyzOeX7wqpV1l+TU3A8orMylNe8e+oL/2mAYVzCC9Wk1nq2\nGT4vRRmzrr2GW4eKr9525JQe7BKBKkC2WWhKE+EmqPm2ZFnQ/frlAgMBAAGjODA2\nMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsG\nAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4IBAQA+mwyWb+SZMLOiQS1lUgN6iXO2JZm+\nq6rmSYnpLP5nCtwKjHbGSw0DoUchem2g0AYsB/HqNl5zLvJb5CXlP79sTO6Ot7sX\nHI3Mtqw4Fe1QFCC5QVhudpMNKNQYq8P45SrfwMW1qSYYsMXbpmNkIPbFvxib1L0l\niUfnjCXFB4XiDa80Cb73cxmU7a24/j03o42kjcRX2BtXs6jhP7z8BxnDCjybjlLT\no5gBombtlPKgOTdcF+eKdaO1LLQ+9LmueiZH/HCsvAmmxLT9g1XZCEFg5zttdetT\nVV+03sFBGhoJPbChiOJMdH8IQVEdtpvnAiYyVBYEUSj7CWSZEI50syL2\n-----END CERTIFICATE-----\n",
-    "8c58e138614bd58742172bd5080d197d2b2dd2f3": "-----BEGIN CERTIFICATE-----\nMIIDJjCCAg6gAwIBAgIIFqFLh91FQ0kwDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe\nFw0xOTA5MjUxNDQ5MzRaFw0xOTEwMTIwMzA0MzRaMDYxNDAyBgNVBAMTK2ZlZGVy\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wggEiMA0GCSqG\nSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ/fKZfxfVD68YAuMfl5bnoNBjZ4kyhXMi\nffkizGpJGkMR2gL6ansSYLrd94Gn/W5FH0hMLCWK41gBXXI6alI6y0YNGSeGnmbO\nZz8Si+oMfiPAj9NaawMwNnusdMqrkMUrMBUmWSTzk4ttu3U9TVkIXZ5i0LNvntJO\nuG+Ga4A+CaipE6Y1QoXkFwFDDum8qpXYKMlF0pSbGz/Nb2o1RjINlo9gx+KWgaPK\n2wWw+n6XJDLFtcmhRtQPuMDpxRveY63OlE4CCRhnJLvjSD4ZlxUtqmoDALpRnGUI\n36VdsZpvtz5CsIy8PB+7ZTcBBK8jfy73kxpuuMdlaxZEJuolV8cjAgMBAAGjODA2\nMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsG\nAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4IBAQCY7YX8EDcPQGFpklGVtqN7tlfm+Gi8\n0v3E9WoQUiMQJ9Mt34ixd3zPjMeKOtVxj6BZzHrpyR6rM9lB4nzoyCWf9K86HaWS\nuxtAACj7yovKAh2x5pFwEB014qNdG03YYQFy8MvDxegaL4soWqCa2UfEK4vdWyJi\nZKM0iT6s78VY6vOWxK+z1IC/6AYbyskzv57T+dBUwGcwQEf0yBeu89tR7LFSaVV/\n6A+dTGyFlHysR6dddwJvzl7jG83RQs2L58qIISD+6RdRxcD02h388YhhMy9Nrpmo\nZeXouJ7YLsHGFkn3yfWi3KWYVdTGbd/9BQPBjhKzS93SxdolTKKVOI/7\n-----END CERTIFICATE-----\n",
-    "3db3ed6b9574ee3fcd9f149e59ff0eef4f932153": "-----BEGIN CERTIFICATE-----\nMIIDJjCCAg6gAwIBAgIIeBPD3wqfL6EwDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe\nFw0xOTEwMTExNDQ5MzRaFw0xOTEwMjgwMzA0MzRaMDYxNDAyBgNVBAMTK2ZlZGVy\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wggEiMA0GCSqG\nSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYpym/gLFOh4IoQhfOeGo+DbUyEIA/0Odf\nmzb9R1nVvM5WFHyqKiT8/yPvLxgXYzYlzyvZu18KAkYWWNuS21Vzhe+d4949P6EZ\n/096QjVFSHvKTo94bSQImeZxZiBhfFcvw/RMM0eTeZZPgOXI3YIJyWjAZ9FUslt7\nWoLU0HZFc/JyPRF8M2kinkdYxnzA+MjzCetXlqmhAr+wLPg/QLKwACyRIF2FJHgf\nPsvqaeF7JXo0zHPcGuHUOqXCHon6KiHZF7OC4bzTuTEzVipJTLYy9QUyL4M2L8bQ\nu1ISUSaXhj+i1WT0RDJwqpioOFprVFqqkVvbUW0nXD/x1UA4nvf7AgMBAAGjODA2\nMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsG\nAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4IBAQBr5+4ZvfhP436NdJgN0Jn7iwwVArus\nXUn0hfuBbCoj1DhuRkP9wyLCpOo6cQS0T5bURVZzirsKc5sXP4fNYXqbfLaBpc7n\njTUtTOIqoA4LKPU7/FH6Qt/UfZ4DQIsKaD3087KdY3ePatSn/HTxvT8Ghqy/JGjf\nLXZehQnlyyCRaCMqv1gEOMiY/8LG3d1hLL7CMphnb4ASk0YMKrWkKhIoa6NWU2Rd\nqp01F4iG44ABpea+ymXAGmWBVPnep51kr/wIPIzr9WvNFAAZW2Enk3+kUWNupuz+\npdXq9KnegVsCs4G7QcTPqwc/vMu7uGq/pruDEOYVOd9Rm+rr0wlMgkcf\n-----END CERTIFICATE-----\n",
-}
-
-
 def import_with_3(module_name, path):
     import importlib.util
 
@@ -49,6 +42,31 @@ def get_assistant(filename):
 
 
 def decode_token(token, client_id):
-    decoded = jwt.decode(token, certs=GOOGLE_PUBLIC_KEY, verify=True, audience=client_id)
-    return decoded
-    
+    r = requests.get('https://accounts.google.com/.well-known/openid-configuration')
+    if(r.status_code != 200):
+        print("status_code != 200; status_code =", r.status_code)
+        print(r)
+        try:
+            return {'status':'BAD','error':r.status_code, "output": r.text}
+        except requests.exceptions.RequestException as e:   
+            return {'status':'BAD','error':r.status_code}
+
+    if "jwks_uri" not in r.json():
+        error_message = "Missing jwks_uri in 'https://accounts.google.com/.well-known/openid-configuration'"
+        print(error_message)
+        return {'status':'BAD','error':error_message}
+
+    googleapis_certs = r.json()["jwks_uri"].replace("/v3/", "/v1/")
+    r = requests.get(googleapis_certs)
+    if(r.status_code != 200):
+        print("status_code != 200; status_code =", r.status_code)
+        print(r)
+        try:
+            return {'status':'BAD','error':r.status_code, "output": r.text}
+        except requests.exceptions.RequestException as e:   
+            return {'status':'BAD','error':r.status_code}
+    else:
+        public_keys = r.json()
+        decoded = jwt.decode(token, certs=public_keys, verify=True, audience=client_id)
+        return {'status':'OK','output': decoded}
+        

requirements.txt

@@ -3,7 +3,7 @@ cachetools==3.1.1
 certifi==2018.11.29
 chardet==3.0.4
 click==7.0
-flask==1.0.2
+flask==1.1.1
 google-auth==1.6.3
 idna==2.8
 itsdangerous==1.1.0

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name="Flask-Assistant",
-    version="0.4.1",
+    version="0.5.0",
     url="https://github.com/treethought/flask-assistant",
     license="Apache 2.0",
     author="Cam Sweeney",