Merge branch 'ntr/merge-upstream' into 'master'

Ntr/merge upstream See merge request shopware-cloud/appsystem/shopwareappexample!5
shopwareArchive · Sep 9, 2020 · c7da260 · c7da260
2 parents 286cf71 + a0d375e
commit c7da260
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/SwagAppsystem/Authenticator.php b/src/SwagAppsystem/Authenticator.php
@@ -48,7 +48,7 @@ public static function authenticateRegisterRequest(Request $request): bool
         $signature = $request->headers->get('shopware-app-signature');
         $queryString = $request->getQueryString();
 
-        $hmac = \hash_hmac('sha256', $queryString, getenv('APP_SECRET'));
+        $hmac = \hash_hmac('sha256', $queryString, $_SERVER['APP_SECRET']);
 
         return hash_equals($hmac, $signature);
     }

diff --git a/src/SwagAppsystem/Controller/Registration.php b/src/SwagAppsystem/Controller/Registration.php
@@ -24,12 +24,12 @@ public function register(Request $request, ShopRepository $shopRepository)
 
         $shopUrl = $this->getShopUrl($request);
         $shopId = $this->getShopId($request);
-        $name = getenv('APP_NAME');
+        $name = $_SERVER['APP_NAME'];
         $secret = bin2hex(random_bytes(64));
 
         $shopRepository->createShop($this->getShopId($request), $this->getShopUrl($request), $secret);
 
-        $proof = \hash_hmac('sha256', $shopId . $shopUrl . $name, getenv('APP_SECRET'));
+        $proof = \hash_hmac('sha256', $shopId . $shopUrl . $name, $_SERVER['APP_SECRET']);
         $body = ['proof' => $proof, 'secret' => $secret, 'confirmation_url' => $this->generateUrl('confirm', [], UrlGeneratorInterface::ABSOLUTE_URL)];
 
         return new JsonResponse($body);