Merge branch 'overint-allowCORS'

cydrobolt · Sep 18, 2016 · a164c48 · a164c48
2 parents f125665 + bad8059
commit a164c48
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
@@ -52,7 +52,8 @@ protected static function encodeResponse($result, $action, $response_type='json'
 
         if ($response_type == 'json') {
             return response(json_encode($response))
-                ->header('Content-Type', 'application/json');
+                ->header('Content-Type', 'application/json')
+                ->header('Access-Control-Allow-Origin', '*');
         }
         else {
             if ($plain_text_response) {
@@ -61,7 +62,9 @@ protected static function encodeResponse($result, $action, $response_type='json'
             }
             // assume plain text if json not requested
             return response($result)
-                ->header('Content-Type', 'text/plain');
+                ->header('Content-Type', 'text/plain')
+                ->header('Access-Control-Allow-Origin', '*');
+
         }
     }
 }