Remove “SAML” from OAuth copy

The OAuth configuration should not reference SAML. SAML is for the Apigee Edge Org configuration, not the client connection.
apigee · Jun 19, 2018 · 788d632 · 788d632
1 parent 555501c
commit 788d632
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/Form/AuthenticationForm.php b/src/Form/AuthenticationForm.php
@@ -157,7 +157,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#title' => $this->t('Apigee Edge API authentication type'),
       '#options' => [
         'apigee_edge_basic_auth' => $this->t('Basic authentication'),
-        'apigee_edge_oauth' => $this->t('OAuth (SAML)'),
+        'apigee_edge_oauth' => $this->t('OAuth'),
       ],
       '#default_value' => isset($oauth_default_value) ? 'apigee_edge_oauth' : 'apigee_edge_basic_auth',
       '#required' => TRUE,
@@ -183,7 +183,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       $form['authentication']['key_basic_auth_missing'] = [
         '#type' => 'item',
         '#title' => $this->t('There is no available basic authentication key for connecting to Apigee Edge.'),
-        '#description' => $this->t('Select an OAuth (SAML) key or <a href=":link">create a new basic authentication key</a>.', [
+        '#description' => $this->t('Select an OAuth key or <a href=":link">create a new basic authentication key</a>.', [
           ':link' => Url::fromRoute('entity.key.add_form', ['destination' => 'admin/config/apigee-edge/settings'])->toString(),
         ]),
         '#states' => [
@@ -198,7 +198,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['authentication']['key_oauth'] = [
       '#type' => 'radios',
-      '#title' => $this->t('OAuth (SAML) keys'),
+      '#title' => $this->t('OAuth keys'),
       '#options' => $oauth_keys,
       '#access' => !empty($oauth_keys) && !empty($oauth_token_keys),
       '#default_value' => $oauth_default_value,
@@ -213,7 +213,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['authentication']['key_oauth_token'] = [
       '#type' => 'radios',
-      '#title' => $this->t('OAuth (SAML) token keys'),
+      '#title' => $this->t('OAuth token keys'),
       '#options' => $oauth_token_keys,
       '#access' => !empty($oauth_keys) && !empty($oauth_token_keys),
       '#default_value' => $oauth_token_default_value,
@@ -229,8 +229,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     if (empty($oauth_keys)) {
       $form['authentication']['key_oauth_missing'] = [
         '#type' => 'item',
-        '#title' => $this->t('There is no available OAuth (SAML) key for connecting to Apigee Edge.'),
-        '#description' => $this->t('Select a basic authentication key or <a href=":link">create a new OAuth (SAML) key</a>.', [
+        '#title' => $this->t('There is no available OAuth key for connecting to Apigee Edge.'),
+        '#description' => $this->t('Select a basic authentication key or <a href=":link">create a new OAuth key</a>.', [
           ':link' => Url::fromRoute('entity.key.add_form', ['destination' => 'admin/config/apigee-edge/settings'])->toString(),
         ]),
         '#states' => [
@@ -246,8 +246,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     if (empty($oauth_token_keys)) {
       $form['authentication']['key_oauth_token_missing'] = [
         '#type' => 'item',
-        '#title' => $this->t('There is no available OAuth (SAML) token key for connecting to Apigee Edge.'),
-        '#description' => $this->t('Select a basic authentication key or <a href=":link">create a new OAuth (SAML) token key</a>.', [
+        '#title' => $this->t('There is no available OAuth token key for connecting to Apigee Edge.'),
+        '#description' => $this->t('Select a basic authentication key or <a href=":link">create a new OAuth token key</a>.', [
           ':link' => Url::fromRoute('entity.key.add_form', ['destination' => 'admin/config/apigee-edge/settings'])->toString(),
         ]),
         '#states' => [

diff --git a/src/Plugin/KeyType/OauthKeyType.php b/src/Plugin/KeyType/OauthKeyType.php
@@ -30,7 +30,7 @@
  *
  * @KeyType(
  *   id = "apigee_edge_oauth",
- *   label = @Translation("Apigee Edge OAuth (SAML)"),
+ *   label = @Translation("Apigee Edge OAuth"),
  *   description = @Translation("Key type to use for Apigee Edge OAuth credentials."),
  *   group = "apigee_edge",
  *   key_value = {

diff --git a/src/Plugin/KeyType/OauthTokenKeyType.php b/src/Plugin/KeyType/OauthTokenKeyType.php
@@ -30,7 +30,7 @@
  *
  * @KeyType(
  *   id = "apigee_edge_oauth_token",
- *   label = @Translation("Apigee Edge OAuth (SAML) token"),
+ *   label = @Translation("Apigee Edge OAuth token"),
  *   description = @Translation("Key type to use for Apigee Edge OAuth tokens."),
  *   group = "apigee_edge",
  *   key_value = {

diff --git a/tests/src/Functional/EdgeAuthenticationTest.php b/tests/src/Functional/EdgeAuthenticationTest.php
@@ -95,8 +95,8 @@ public function testEdgeAuthentication() {
     $this->drupalGet('/admin/config/apigee-edge/settings');
     $this->assertSession()->pageTextContains('There is no available basic authentication key for connecting to Apigee Edge.');
     $this->getSession()->getPage()->selectFieldOption('edit-key-type', 'apigee_edge_oauth');
-    $this->assertSession()->pageTextContains('There is no available OAuth (SAML) key for connecting to Apigee Edge.');
-    $this->assertSession()->pageTextContains('There is no available OAuth (SAML) token key for connecting to Apigee Edge.');
+    $this->assertSession()->pageTextContains('There is no available OAuth key for connecting to Apigee Edge.');
+    $this->assertSession()->pageTextContains('There is no available OAuth token key for connecting to Apigee Edge.');
 
     // Add new Apigee Edge basic authentication key
     // with environment variables provider.
@@ -144,8 +144,8 @@ public function testEdgeAuthentication() {
     $this->assertSession()->pageTextContains('Test key in private file');
     $this->assertSession()->pageTextContains('Wrong test key in private file');
     $this->getSession()->getPage()->selectFieldOption('edit-key-type', 'apigee_edge_oauth');
-    $this->assertSession()->pageTextContains('There is no available OAuth (SAML) key for connecting to Apigee Edge.');
-    $this->assertSession()->pageTextContains('There is no available OAuth (SAML) token key for connecting to Apigee Edge.');
+    $this->assertSession()->pageTextContains('There is no available OAuth key for connecting to Apigee Edge.');
+    $this->assertSession()->pageTextContains('There is no available OAuth token key for connecting to Apigee Edge.');
 
     // Test key stored in environment variables.
     $this->drupalPostForm('/admin/config/apigee-edge/settings', [
@@ -323,8 +323,8 @@ public function testEdgeAuthentication() {
     $this->assertEmpty($this->config('apigee_edge.client')->get('active_key_oauth_token'));
     $this->assertSession()->pageTextContains('There is no available basic authentication key for connecting to Apigee Edge.');
     $this->getSession()->getPage()->selectFieldOption('edit-key-type', 'apigee_edge_oauth');
-    $this->assertSession()->pageTextContains('There is no available OAuth (SAML) key for connecting to Apigee Edge.');
-    $this->assertSession()->pageTextContains('There is no available OAuth (SAML) token key for connecting to Apigee Edge.');
+    $this->assertSession()->pageTextContains('There is no available OAuth key for connecting to Apigee Edge.');
+    $this->assertSession()->pageTextContains('There is no available OAuth token key for connecting to Apigee Edge.');
 
     // Only Apigee Edge keys are usable in SDK connector.
     $this->expectExceptionMessage('Type of default_key key does not implement EdgeKeyTypeInterface.');