Merge branch 'hotfix/fix_product_mapping_bug' into develop

ot_admin/Classes/Controller/SiteController.php

@@ -82,8 +82,8 @@ class SiteController extends ActionController
     ];
 
     private const IS_PRODUCT_PREMIUM = [
-        "school-standard" => false,
-        "artist-standard" => false,
+        "school" => false,
+        "artist" => false,
         "school-premium" => true,
         "artist-premium" => true,
         "manager" => true,
@@ -1638,7 +1638,7 @@ class SiteController extends ActionController
         $rootUid = $this->otWebsiteRepository->findRootUidForOrganization($organizationId);
 
         $organizationExtraData = $this->fetchOrganizationExtraData($organizationId);
-        $isPremium = self::IS_PRODUCT_PREMIUM[$organizationExtraData['admin']['product']];
+        $isPremium = self::IS_PRODUCT_PREMIUM[$organizationExtraData['admin']['product'] ?? false];
 
         if ($editorsGroupUid === null) {
             try {
@@ -2337,7 +2337,7 @@ class SiteController extends ActionController
         $hashInstance = GeneralUtility::makeInstance(PasswordHashFactory::class)->getDefaultHashInstance('BE');
         $hashedRandomPassword = $hashInstance->getHashedPassword(uniqid("", true));
 
-        $adminGroup = self::IS_PRODUCT_PREMIUM[$userData['product']] ? self::BEGROUP_ADMIN_PREMIUM : self::BEGROUP_ADMIN_STANDARD;
+        $adminGroup = (self::IS_PRODUCT_PREMIUM[$userData['product']] ?? false) ? self::BEGROUP_ADMIN_PREMIUM : self::BEGROUP_ADMIN_STANDARD;
         $adminGroupUid = $this->getBaseBeGroupUid($adminGroup);
 
         $values = [
@@ -2404,7 +2404,7 @@ class SiteController extends ActionController
             $fileMounts[] = $row['uid'];
         }
 
-        $mainGroup = self::IS_PRODUCT_PREMIUM[$userData['product']] ? self::BEGROUP_EDITOR_PREMIUM : self::BEGROUP_EDITOR_STANDARD;
+        $mainGroup = (self::IS_PRODUCT_PREMIUM[$userData['product']] ?? false) ? self::BEGROUP_EDITOR_PREMIUM : self::BEGROUP_EDITOR_STANDARD;
         $mainGroupUid = $this->getBaseBeGroupUid($mainGroup);
 
         $values = [