Merge pull request #86 from USEPA/IN-151

IN-151 Remove patch for simplesamlphp_auth prefix
USEPA · Mar 31, 2021 · c8a1084 · c8a1084
2 parents 549262d + e88a5c1
commit c8a1084
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -129,8 +129,7 @@
                 "3002948: tablefield_cellspan module throwing error": "https://www.drupal.org/files/issues/2019-11-26/warning_fix-3002948-6.patch"
             },
             "drupal/simplesamlphp_auth": {
-                "2983154: Redirect to original destination after logging in": "https://www.drupal.org/files/issues/2020-01-02/simplesamlphp_auth-return-to-destination-parameter-2983154-8-D8.patch",
-                "2978876: Add capability to remove prefix from username": "https://www.drupal.org/files/issues/2020-10-19/simplesamlphp_auth-add_capability_to_remove_prefix_from_username-2978876-9.patch"
+                "2983154: Redirect to original destination after logging in": "https://www.drupal.org/files/issues/2020-01-02/simplesamlphp_auth-return-to-destination-parameter-2983154-8-D8.patch"
             },
             "drupal/blizz_dynamic_entitylist": {
                 "3128363: Use admin theme for Ajax routes": "https://www.drupal.org/files/issues/2020-04-16/blizz-dynamic-entitylist_use-admin-theme-for-ajax_3128363-2.patch",

diff --git a/composer.lock b/composer.lock
diff --git a/config/dev/simplesamlphp_auth.settings.yml b/config/dev/simplesamlphp_auth.settings.yml
@@ -26,4 +26,3 @@ role:
   population: ''
   eval_every_time: false
 autoenablesaml: false
-remove_prefix: true
diff --git a/config/production/simplesamlphp_auth.settings.yml b/config/production/simplesamlphp_auth.settings.yml
@@ -23,7 +23,6 @@ sync:
   mail: true
   user_name: true
 autoenablesaml: false
-remove_prefix: true
 debug: false
 secure: true
 httponly: false

diff --git a/config/staging/simplesamlphp_auth.settings.yml b/config/staging/simplesamlphp_auth.settings.yml
@@ -27,7 +27,6 @@ sync:
   mail: true
   user_name: true
 autoenablesaml: false
-remove_prefix: true
 debug: false
 secure: true
 httponly: false