From e88a5c18af1b4f1ca70d34d6ea84fc4b6bb4e700 Mon Sep 17 00:00:00 2001 From: jrockwei Date: Wed, 31 Mar 2021 13:49:11 -0500 Subject: [PATCH] IN-151 Remove patch for simplesamlphp_auth prefix --- composer.json | 3 +-- composer.lock | 3 +-- config/dev/simplesamlphp_auth.settings.yml | 1 - config/production/simplesamlphp_auth.settings.yml | 1 - config/staging/simplesamlphp_auth.settings.yml | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 496743d05..ebe0151aa 100644 --- 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 index d680f0320..59fc1e197 100644 --- a/composer.lock +++ b/composer.lock @@ -8781,8 +8781,7 @@ } }, "patches_applied": { - "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" } }, diff --git a/config/dev/simplesamlphp_auth.settings.yml b/config/dev/simplesamlphp_auth.settings.yml index c246f521a..dbe31d062 100644 --- 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 index c6127192a..ccc6798b2 100644 --- 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 index 2dd84134e..ecff1d7c4 100644 --- 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