application id fix

nomisoft · Jan 30, 2017 · 8929ec9 · 8929ec9
1 parent 196f873
commit 8929ec9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/Request/AlexaRequest.php b/src/Request/AlexaRequest.php
@@ -80,5 +80,20 @@ public function getSlots()
         return array_map(function($obj) { return $obj->value; }, get_object_vars($this->getIntent()->slots));
     }
 
+    /**
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getApplicationId()
+    {
+        if (property_exists($this, 'session')) {
+            return $this->session->application->applicationId;
+        }
+        if (property_exists($this, 'context')) {
+            return $this->context->application->applicationId;
+        }
+        throw new \Exception('Application ID not found');
+    }
+
 
 }
diff --git a/src/Request/RequestValidator.php b/src/Request/RequestValidator.php
@@ -10,25 +10,25 @@ class RequestValidator
 {
 
     /**
-     * @var
+     * @var AlexaRequest
      */
     private $request;
 
     /**
-     * @var
+     * @var string[]
      */
     private $errors;
 
     /**
-     * @param $request
+     * @param AlexaRequest $request
      */
-    public function __construct($request)
+    public function __construct(AlexaRequest $request)
     {
         $this->request = $request;
     }
 
     /**
-     * @param $applicationId
+     * @param string $applicationId
      *
      * @return bool
      */
@@ -93,13 +93,13 @@ private function validateSignatureUrl()
     }
 
     /**
-     * @param $applicationId
+     * @param string $applicationId
      *
      * @return bool
      */
     private function validateApplicationId($applicationId)
     {
-        if( $this->request->session->application->applicationId != $applicationId) {
+        if( $this->request->getApplicationId() != $applicationId) {
             $this->errors[] = 'Invalid application id';
             return false;
         }