Remove embedly/iframely key settings

spicywebau · Mar 26, 2024 · 46c477a · 46c477a
1 parent 825c238
commit 46c477a
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,8 @@
 - Removed `spicyweb\embeddedassets\gql\types\generators\EmbeddedAssetImageType`
 - Removed `spicyweb\embeddedassets\models\EmbeddedAsset::getVideoCode()`; use `getIframeCode()` instead
 - Removed `spicyweb\embeddedassets\models\EmbeddedAsset::getVideoUrl()`; use `getIframeSrc()` instead
+- Removed `spicyweb\embeddedassets\models\Settings::$embedlyKey`
+- Removed `spicyweb\embeddedassets\models\Settings::$iframelyKey`
 - Removed `spicyweb\embeddedassets\models\Settings::$minImageSize`, due to the Embed 3 parameters it was used for being removed in Embed 4
 - Removed `spicyweb\embeddedassets\Service::EVENT_BEFORE_CREATE_ADAPTER`; use `spicyweb\embeddedassets\Service::EVENT_BEFORE_REQUEST` instead
 - Removed `spicyweb\embeddedassets\validators\Image`

diff --git a/src/Service.php b/src/Service.php
@@ -105,12 +105,6 @@ private function _getDataFromEmbed(string $url): array
             }
         }
 
-        if ($pluginSettings->embedlyKey) {
-            $embedSettings['oembed:embedly_key'] = Craft::parseEnv($pluginSettings->embedlyKey);
-        }
-        if ($pluginSettings->iframelyKey) {
-            $embedSettings['oembed:iframely_key'] = Craft::parseEnv($pluginSettings->iframelyKey);
-        }
         if ($pluginSettings->googleKey) {
             $embedSettings['google:key'] = Craft::parseEnv($pluginSettings->googleKey);
         }

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -18,16 +18,6 @@
  */
 class Settings extends Model
 {
-    /**
-     * @var string
-     */
-    public string $embedlyKey = '';
-
-    /**
-     * @var string
-     */
-    public string $iframelyKey = '';
-
     /**
      * @var string
      */
@@ -227,7 +217,7 @@ protected function defineBehaviors(): array
         return [
             'parser' => [
                 'class' => EnvAttributeParserBehavior::class,
-                'attributes' => ['embedlyKey', 'iframelyKey', 'googleKey', 'facebookKey', 'referer'],
+                'attributes' => ['googleKey', 'facebookKey', 'referer'],
             ],
         ];
     }
@@ -238,7 +228,7 @@ protected function defineBehaviors(): array
     protected function defineRules(): array
     {
         return [
-            [['embedlyKey', 'iframelyKey', 'googleKey', 'facebookKey', 'referer'], StringValidator::class],
+            [['googleKey', 'facebookKey', 'referer'], StringValidator::class],
             ['parameters', 'each', 'rule' => [ParameterValidator::class]],
             [['whitelist', 'extraWhitelist'], 'each', 'rule' => [StringValidator::class]],
             [['maxAssetNameLength', 'maxFileNameLength'], 'integer', 'min' => 10],

diff --git a/src/templates/settings.twig b/src/templates/settings.twig
@@ -2,30 +2,6 @@
 
 <div class="settings">
 
-	{{ forms.autosuggestField({
-		label: "embed.ly API Key"|t('embeddedassets'),
-		instructions: "An {api} key to be used as a fallback data provider."|t('embeddedassets', {
-			api: '[embed.ly API](http://docs.embed.ly/docs/embedly-api)',
-		}),
-		id: 'embedlyKey',
-		name: 'embedlyKey',
-		value: settings.embedlyKey,
-		errors: settings.getErrors('embedlyKey'),
-		suggestEnvVars: true
-	}) }}
-
-	{{ forms.autosuggestField({
-		label: "iFramely API Key"|t('embeddedassets'),
-		instructions: "An {api} key to be used as a fallback data provider."|t('embeddedassets', {
-			api: '[iFramely API](https://iframely.com/docs/iframely-api)',
-		}),
-		id: 'iframelyKey',
-		name: 'iframelyKey',
-		value: settings.iframelyKey,
-		errors: settings.getErrors('iframelyKey'),
-		suggestEnvVars: true
-	}) }}
-
 	{{ forms.autosuggestField({
 		label: "Google API Key"|t('embeddedassets'),
 		instructions: "A {api} key to be used as a fallback data provider."|t('embeddedassets', {

diff --git a/src/translations/en/embeddedassets.php b/src/translations/en/embeddedassets.php
@@ -8,11 +8,9 @@
     'Domain to set as HTTP Referer, e.g. `https://domain.com`' => 'Domain to set as HTTP Referer, e.g. `https://domain.com`',
     'Embed' => 'Embed',
     'Embedded asset' => 'Embedded asset',
-    'embed.ly API Key' => 'embed.ly API Key',
     'Facebook Graph API Key' => 'Facebook Graph API Key',
     'Google API Key' => 'Google API Key',
     'HTTP Referer' => 'HTTP Referer',
-    'iFramely API Key' => 'iFramely API Key',
     'Image' => 'Image',
     'Link' => 'Link',
     'List of extra parameters and their values to be sent when retrieving embed data.' => 'List of extra parameters and their values to be sent when retrieving embed data.',

diff --git a/src/translations/fr/embeddedassets.php b/src/translations/fr/embeddedassets.php
@@ -7,11 +7,9 @@
     'Disable tracking on Vimeo iframes?' => 'Désactiver le suivi des iframes Vimeo ?',
     'Domain to set as HTTP Referer, e.g. `https://domain.com`' => 'Le domaine à utiliser comme HTTP Referer, ex. `https://domain.com`',
     'Embed' => 'Ressources externes',
-    'embed.ly API Key' => 'Clef API pour embed.ly',
     'Facebook Graph API Key' => 'Clef API pour Facebook',
     'Google API Key' => 'Clef API pour Google',
     'HTTP Referer' => 'HTTP Referer',
-    'iFramely API Key' => 'Clef API pour iFramely ',
     'Image' => 'Image',
     'Link' => 'Lien',
     'List of extra parameters and their values to be sent when retrieving embed data.' => 'Liste des paramètres supplémentaires et de leurs valeurs à envoyer lors de la récupération des données intégrées.',