From 33c19c477657f90c366b93749b6117611e0301dd Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Thu, 8 Feb 2024 18:27:12 +0100
Subject: [PATCH 1/9] Implement configurable index name

---
 app/models/FeatureToggleModel.scala              | 16 +++++++++++++++-
 conf/application.conf                            |  6 ++++++
 .../header-nav/header-nav.component.html         | 13 ++++++++-----
 .../header-nav/header-nav.component.ts           |  8 ++++----
 .../src/app/services/feature-toggle.service.ts   |  3 +++
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/app/models/FeatureToggleModel.scala b/app/models/FeatureToggleModel.scala
index 0780281f..81941d98 100644
--- a/app/models/FeatureToggleModel.scala
+++ b/app/models/FeatureToggleModel.scala
@@ -54,6 +54,8 @@ package object FeatureToggleModel extends Logging {
     private val FEATURE_TOGGLE_RULE_DEPLOYMENT_CUSTOM_SCRIPT = "toggle.rule-deployment.custom-script"
     private val FEATURE_TOGGLE_RULE_DEPLOYMENT_CUSTOM_SCRIPT_SMUI2SOLR_SH_PATH = "toggle.rule-deployment.custom-script-SMUI2SOLR-SH_PATH"
     private val FEATURE_TOGGLE_HEADLINE = "toggle.headline"
+    private val FEATURE_TOGGLE_DEPLOYMENT_LABEL = "toggle.rule-deployment-label"
+    private val FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL = "toggle.rule-deployment-prelive-label"
     private val ACTIVATE_RULE_TAGGING = "toggle.rule-tagging"
     private val PREDEFINED_TAGS_FILE = "toggle.predefined-tags-file"
     private val SMUI_VERSION = "smui.version"
@@ -160,7 +162,11 @@ package object FeatureToggleModel extends Logging {
               }
             }
           )
-        )
+        ),
+        JsFeatureToggle(FEATURE_TOGGLE_DEPLOYMENT_LABEL, new JsStringFeatureToggleValue(
+          appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_LABEL).getOrElse("Solr"))),
+        JsFeatureToggle(FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL, new JsStringFeatureToggleValue(
+          appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL).getOrElse("Solr-test")))
       )
     }
 
@@ -216,6 +222,14 @@ package object FeatureToggleModel extends Logging {
       appConfig.getOptional[Boolean](FEATURE_TOGGLE_RULE_DEPLOYMENT_PRE_LIVE_PRESENT).getOrElse(false)
     }
 
+    def getSmuiRuleDeploymentLabel: String = {
+      appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_LABEL).getOrElse("Solr")
+    }
+
+    def getSmuiRuleDeploymentPreliveLabel: String = {
+      appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL).getOrElse("Solr-test")
+    }
+
   }
 
 }
diff --git a/conf/application.conf b/conf/application.conf
index 2d99c368..21fdb1bf 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -89,6 +89,12 @@ toggle.rule-deployment.custom-script-SMUI2SOLR-SH_PATH=${?SMUI_TOGGLE_DEPL_CUSTO
 toggle.headline="Search Management UI"
 toggle.headline=${?SMUI_HEADLINE}
 
+toggle.rule-deployment-label="Solr"
+toggle.rule-deployment-label=${?SMUI_TOGGLE_DEPL_NAME}
+
+toggle.deploy-prelive-fn-label="Solr-test"
+toggle.deploy-prelive-fn-label=${?SMUI_TOGGLE_PRELIVE_NAME}
+
 toggle.rule-tagging=false
 toggle.rule-tagging=${?SMUI_RULE_TAGGING_ACTIVE}
 
diff --git a/frontend/src/app/components/header-nav/header-nav.component.html b/frontend/src/app/components/header-nav/header-nav.component.html
index feccbf02..f946854c 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.html
+++ b/frontend/src/app/components/header-nav/header-nav.component.html
@@ -76,7 +76,7 @@
     </ul>
 
     <div *ngIf="hideSolrIndexSelector()">
-      In order to push the rules, <a routerLink="/admin">please create a Solr collection first</a>.
+      In order to push the rules, <a routerLink="/admin">please create a rules collection first</a>.
     </div>
     <div
       *ngIf="currentSolrIndexId && currentSolrIndexId !== '-1'"
@@ -85,7 +85,10 @@
 
     <div class="depl-info-container border-left border-right pl-2">
       <ng-container *ngFor="let singleDeploymentInfo of deploymentLogInfo; index as idxDeploy">
-        <span class="depl-info-row-instance"><b>{{ singleDeploymentInfo.targetSystem }}</b> deployment:</span>
+        <span class="depl-info-row-instance">
+          <b>{{ (singleDeploymentInfo.targetSystem == 'PRELIVE' ?
+                  featureToggleService.getSync('toggle.rule-deployment-prelive-label') :
+                  featureToggleService.getSync('toggle.rule-deployment-label'))}}</b> deployment:</span>
         <span class="depl-info-row-datetime"><b>{{ singleDeploymentInfo.formattedDateTime }}</b></span>
         <span class="depl-info-row-result">
           <b
@@ -166,9 +169,9 @@
   </div>
 </app-smui-modal>
 
-<app-smui-modal id="confirm-publish-live" title="Confirm publish to LIVE">
+<app-smui-modal id="confirm-publish-live" title="Confirm publish to {{ featureToggleService.getSync('toggle.rule-deployment-label') }}">
   <div content>
-    <p>Are you sure to publish current Search Rules to LIVE?</p>
+    <p>Are you sure to publish current Search Rules to {{ featureToggleService.getSync('toggle.rule-deployment-label') }}?</p>
   </div>
   <div footer class="btn-toolbar">
     <button
@@ -177,7 +180,7 @@
       (click)="requestPublishRulesTxtToSolr('LIVE')"
     >
       <i class="fa fa-thumbs-up smui-icon"></i>
-      Yes, publish to LIVE
+      Yes, publish to {{ featureToggleService.getSync('toggle.rule-deployment-label') }}
     </button>
     <button
       class="btn btn-danger"
diff --git a/frontend/src/app/components/header-nav/header-nav.component.ts b/frontend/src/app/components/header-nav/header-nav.component.ts
index 8b14fbde..e561cb51 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.ts
+++ b/frontend/src/app/components/header-nav/header-nav.component.ts
@@ -103,14 +103,14 @@ export class HeaderNavComponent implements OnInit {
 
   public publishToPreliveButtonText(): string {
     return this.deploymentRunningForStage === 'PRELIVE'
-      ? 'Pushing to Solr...'
-      : 'Push Config to Solr';
+      ? 'Publishing to ' + this.featureToggleService.getSync('toggle.rule-deployment-prelive-label') + '...'
+      : 'Publish to ' + this.featureToggleService.getSync('toggle.rule-deployment-prelive-label') + '';
   }
 
   public publishToLiveButtonText(): string {
     return this.deploymentRunningForStage === 'LIVE'
-      ? 'Publishing to LIVE...'
-      : 'Publish to LIVE';
+      ? 'Publishing to ' + this.featureToggleService.getSync('toggle.rule-deployment-label') + '...'
+      : 'Publish to ' + this.featureToggleService.getSync('toggle.rule-deployment-label') + '';
   }
 
   public publishSolrConfig() {
diff --git a/frontend/src/app/services/feature-toggle.service.ts b/frontend/src/app/services/feature-toggle.service.ts
index 27e942ce..bba4fa7b 100644
--- a/frontend/src/app/services/feature-toggle.service.ts
+++ b/frontend/src/app/services/feature-toggle.service.ts
@@ -9,6 +9,9 @@ const FEATURE_TOGGLE_UI_LIST_LIMIT_ITEMS_TO = 'toggle.ui-list.limit-items-to';
 const FEATURE_ACTIVATE_SPELLING = 'toggle.activate-spelling';
 const FEATURE_ACTIVATE_EVENTHISTORY = 'toggle.activate-eventhistory';
 const FEATURE_CUSTOM_UP_DOWN_MAPPINGS = 'toggle.ui-concept.custom.up-down-dropdown-mappings';
+const FEATURE_TOGGLE_DEPLOYMENT_LABEL = "toggle.rule-deployment-label";
+const FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL = "toggle.rule-deployment-prelive-label";
+
 
 @Injectable({
   providedIn: 'root'

From b77af8cdd0051cac5b4feac2a1b66def212abfd3 Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Thu, 8 Feb 2024 18:34:29 +0100
Subject: [PATCH 2/9] Additional removals of hardcoded solr labels

---
 app/models/SearchManagementRepository.scala | 6 +++---
 conf/application.conf                       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/SearchManagementRepository.scala b/app/models/SearchManagementRepository.scala
index 0a98be15..aa8b6771 100644
--- a/app/models/SearchManagementRepository.scala
+++ b/app/models/SearchManagementRepository.scala
@@ -48,17 +48,17 @@ class SearchManagementRepository @Inject()(dbapi: DBApi, toggleService: FeatureT
     val solrIndexIdId = SolrIndexId(solrIndexId)
     val inputTags = InputTag.loadAll.filter(_.solrIndexId== Option(solrIndexIdId))
     if (inputTags.size > 0) {
-      throw new Exception("Can't delete Solr Index that has " + inputTags.size + "tags existing");
+      throw new Exception("Can't delete rules collection that has " + inputTags.size + "tags existing");
     }
 
     val canonicalSpellings = CanonicalSpelling.loadAllForIndex(solrIndexIdId)
     if (canonicalSpellings.size > 0) {
-      throw new Exception("Can't delete Solr Index that has " + canonicalSpellings.size + " canonical spellings existing");
+      throw new Exception("Can't delete rules collection that has " + canonicalSpellings.size + " canonical spellings existing");
     }
 
     val searchInputs = SearchInput.loadAllForIndex(solrIndexIdId)
     if (searchInputs.size > 0) {
-      throw new Exception("Can't delete Solr Index that has " + searchInputs.size + " inputs existing");
+      throw new Exception("Can't delete rules collection that has " + searchInputs.size + " inputs existing");
     }
 
     // TODO consider reconfirmation and deletion of history entries (if some exist) (see https://github.com/querqy/smui/issues/97)
diff --git a/conf/application.conf b/conf/application.conf
index 21fdb1bf..e70abd81 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -92,7 +92,7 @@ toggle.headline=${?SMUI_HEADLINE}
 toggle.rule-deployment-label="Solr"
 toggle.rule-deployment-label=${?SMUI_TOGGLE_DEPL_NAME}
 
-toggle.deploy-prelive-fn-label="Solr-test"
+toggle.deploy-prelive-fn-label="Solr-PRELIVE"
 toggle.deploy-prelive-fn-label=${?SMUI_TOGGLE_PRELIVE_NAME}
 
 toggle.rule-tagging=false

From 8717cf71d549fdab6194c20e7b61091c1f084952 Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Tue, 20 Feb 2024 16:56:17 +0100
Subject: [PATCH 3/9] Update default config values

---
 app/models/FeatureToggleModel.scala | 4 ++--
 conf/application.conf               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/FeatureToggleModel.scala b/app/models/FeatureToggleModel.scala
index 81941d98..d7121730 100644
--- a/app/models/FeatureToggleModel.scala
+++ b/app/models/FeatureToggleModel.scala
@@ -223,11 +223,11 @@ package object FeatureToggleModel extends Logging {
     }
 
     def getSmuiRuleDeploymentLabel: String = {
-      appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_LABEL).getOrElse("Solr")
+      appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_LABEL).getOrElse("LIVE")
     }
 
     def getSmuiRuleDeploymentPreliveLabel: String = {
-      appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL).getOrElse("Solr-test")
+      appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL).getOrElse("PRELIVE")
     }
 
   }
diff --git a/conf/application.conf b/conf/application.conf
index e70abd81..3930c316 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -89,10 +89,10 @@ toggle.rule-deployment.custom-script-SMUI2SOLR-SH_PATH=${?SMUI_TOGGLE_DEPL_CUSTO
 toggle.headline="Search Management UI"
 toggle.headline=${?SMUI_HEADLINE}
 
-toggle.rule-deployment-label="Solr"
+toggle.rule-deployment-label="LIVE"
 toggle.rule-deployment-label=${?SMUI_TOGGLE_DEPL_NAME}
 
-toggle.deploy-prelive-fn-label="Solr-PRELIVE"
+toggle.deploy-prelive-fn-label="PRELIVE"
 toggle.deploy-prelive-fn-label=${?SMUI_TOGGLE_PRELIVE_NAME}
 
 toggle.rule-tagging=false

From 04265332b1004186dea2c41802c7e029c60c8f5c Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Tue, 20 Feb 2024 17:10:44 +0100
Subject: [PATCH 4/9] Update default config values

---
 app/models/FeatureToggleModel.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/FeatureToggleModel.scala b/app/models/FeatureToggleModel.scala
index d7121730..3d2de0b9 100644
--- a/app/models/FeatureToggleModel.scala
+++ b/app/models/FeatureToggleModel.scala
@@ -164,9 +164,9 @@ package object FeatureToggleModel extends Logging {
           )
         ),
         JsFeatureToggle(FEATURE_TOGGLE_DEPLOYMENT_LABEL, new JsStringFeatureToggleValue(
-          appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_LABEL).getOrElse("Solr"))),
+          appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_LABEL).getOrElse("LIVE"))),
         JsFeatureToggle(FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL, new JsStringFeatureToggleValue(
-          appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL).getOrElse("Solr-test")))
+          appConfig.getOptional[String](FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL).getOrElse("PRELIVE")))
       )
     }
 

From 7340a0c1aa3cf62fe9297ec3db479d56866f5322 Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Tue, 20 Feb 2024 18:42:40 +0100
Subject: [PATCH 5/9] Fix when prelive present = false

---
 .../src/app/components/header-nav/header-nav.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/components/header-nav/header-nav.component.html b/frontend/src/app/components/header-nav/header-nav.component.html
index f946854c..9e097fa7 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.html
+++ b/frontend/src/app/components/header-nav/header-nav.component.html
@@ -113,6 +113,9 @@
       </div>
       <div class="btn-group">
         <button
+          *ngIf="
+            featureToggleService.getSyncToggleRuleDeploymentPreLivePresent()
+          "
           type="button"
           class="btn btn-outline-primary"
           (click)="publishSolrConfig()"
@@ -125,9 +128,6 @@
           {{ publishToPreliveButtonText() }}
         </button>
         <button
-          *ngIf="
-            featureToggleService.getSyncToggleRuleDeploymentPreLivePresent()
-          "
           type="button"
           class="btn btn-outline-danger"
           (click)="modalService.open('confirm-publish-live')"

From 2f47c0482e5b8d8686b891728b6bd9f700f78e4c Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 20 Feb 2024 13:14:03 -0500
Subject: [PATCH 6/9] bump version

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 2ef20065..085a7ed6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.GitBranchPrompt
 
 name := "search-management-ui"
-version := "4.0.5"
+version := "4.0.9"
 maintainer := "Contact productful.io <hello@productful.io>"
 
 scalaVersion := "2.12.17"

From 7c748c5d15280dfc933b1ec6c5e4d03f361a1e0f Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Tue, 20 Feb 2024 14:05:23 +0100
Subject: [PATCH 7/9] Enable basic auth from configured user/password

---
 .../ConfiguredBasicAuthAuthenticator.scala    | 30 +++++++++++++++++++
 app/modules/SecurityModule.scala              | 30 +++++++++++++------
 conf/application.conf                         |  8 +++++
 3 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 app/modules/ConfiguredBasicAuthAuthenticator.scala

diff --git a/app/modules/ConfiguredBasicAuthAuthenticator.scala b/app/modules/ConfiguredBasicAuthAuthenticator.scala
new file mode 100644
index 00000000..c13badf9
--- /dev/null
+++ b/app/modules/ConfiguredBasicAuthAuthenticator.scala
@@ -0,0 +1,30 @@
+package modules
+
+import org.pac4j.core.context.WebContext
+import org.pac4j.core.context.session.SessionStore
+import org.pac4j.core.credentials.{Credentials, UsernamePasswordCredentials}
+import org.pac4j.core.credentials.authenticator.Authenticator
+import org.pac4j.core.exception.CredentialsException
+import org.pac4j.core.profile.CommonProfile
+import org.pac4j.core.util.{CommonHelper, Pac4jConstants}
+
+
+case class ConfiguredBasicAuthAuthenticator(validUserId: String, validPassword: String) extends Authenticator {
+
+  override def validate(credentials: Credentials, context: WebContext, sessionStore: SessionStore): Unit = {
+    if (credentials == null) throw new CredentialsException("No credential")
+    val userCredentials = credentials.asInstanceOf[UsernamePasswordCredentials]
+    val username = userCredentials.getUsername()
+    val password = userCredentials.getPassword()
+    if (CommonHelper.isBlank(username)) throw new CredentialsException("Username cannot be blank")
+    if (CommonHelper.isBlank(password)) throw new CredentialsException("Password cannot be blank")
+    if (CommonHelper.areNotEquals(username, validUserId)) throw new CredentialsException("Username : '" + username + "' does not match valid user")
+    if (CommonHelper.areNotEquals(password, validPassword)) throw new CredentialsException("Password does not match valid password")
+    val profile = new CommonProfile
+    profile.setId(username)
+    profile.addAttribute(Pac4jConstants.USERNAME, username)
+    userCredentials.setUserProfile(profile)
+  }
+
+}
+
diff --git a/app/modules/SecurityModule.scala b/app/modules/SecurityModule.scala
index 3585c3af..71fb2219 100644
--- a/app/modules/SecurityModule.scala
+++ b/app/modules/SecurityModule.scala
@@ -1,11 +1,12 @@
 package modules
 
 import com.google.inject.{AbstractModule, Provides}
-import org.pac4j.core.client.Clients
+import org.pac4j.core.client.{Client, Clients}
 import org.pac4j.core.client.direct.AnonymousClient
 import org.pac4j.core.config.Config
 import org.pac4j.core.context.session.SessionStore
 import org.pac4j.core.profile.CommonProfile
+import org.pac4j.http.client.direct.DirectBasicAuthClient
 import org.pac4j.play.scala.{DefaultSecurityComponents, Pac4jScalaTemplateHelper, SecurityComponents}
 import org.pac4j.play.store.{PlayCookieSessionStore, ShiroAesDataEncrypter}
 import org.pac4j.play.{CallbackController, LogoutController}
@@ -43,16 +44,24 @@ class SecurityModule(environment: Environment, configuration: Configuration) ext
   @Provides
   def provideConfig(): Config = {
     val maybeConfiguredClientName = configuration.getOptional[String](ConfigKeyAuthClient).filter(_.nonEmpty)
-    val authClientOpt = maybeConfiguredClientName.map {
-      case "SAML2Client" => createSaml2Client(s"$ConfigKeyPrefixClientConfig.SAML2Client")
+    val config: Option[Config] = maybeConfiguredClientName.map {
+      case "DirectBasicAuthClient" => createConfiguredDirectBasicAuthConfig(s"$ConfigKeyPrefixClientConfig.ConfiguredDirectBasicAuthClient")
+      case "SAML2Client" => createSaml2Config(s"$ConfigKeyPrefixClientConfig.SAML2Client")
       case other => throw new RuntimeException(s"Unsupported auth client config value: $other")
     }
-    val allClients = authClientOpt.toSeq :+ new AnonymousClient()
-    // callback URL path as configured in `routes`
-    val clients = new Clients(s"$baseUrl/callback", allClients:_*)
-    new Config(clients)
+    config match {
+      case Some(config) => config
+      case None => throw new RuntimeException(s"Failed configuring auth client")
+    }
+  }
+
+  private def createConfiguredDirectBasicAuthConfig(keyPrefix: String): Config = {
+    val username = configuration.get[String](s"$keyPrefix.username")
+    val password = configuration.get[String](s"$keyPrefix.password")
+    new Config(new DirectBasicAuthClient(ConfiguredBasicAuthAuthenticator(username, password)))
   }
-  private def createSaml2Client(keyPrefix: String): SAML2Client = {
+
+  private def createSaml2Config(keyPrefix: String): Config = {
     val cfg = new SAML2Configuration(
       configuration.get[String](s"$keyPrefix.keystore"),
       configuration.get[String](s"$keyPrefix.keystorePassword"),
@@ -62,7 +71,10 @@ class SecurityModule(environment: Environment, configuration: Configuration) ext
     cfg.setServiceProviderEntityId(configuration.get[String](s"$keyPrefix.serviceProviderEntityId"))
     cfg.setServiceProviderMetadataPath(configuration.get[String](s"$keyPrefix.serviceProviderMetadataPath"))
     cfg.setMaximumAuthenticationLifetime(configuration.get[Long](s"$keyPrefix.maximumAuthenticationLifetime"))
-    new SAML2Client(cfg)
+    val allClients = Option(new SAML2Client(cfg)).toSeq :+ new AnonymousClient()
+    // callback URL path as configured in `routes`
+    val clients = new Clients(s"$baseUrl/callback", allClients:_*)
+    new Config(clients)
   }
 
 }
diff --git a/conf/application.conf b/conf/application.conf
index 3930c316..c94308d9 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -179,6 +179,7 @@ play.http.session.maxAge = ${?SMUI_SESSION_MAXAGE}
 
 # This defines the pac4j client to use for authentication. Uses the well-defined pac4j names (OidcClient,
 # DirectBasicAuthClient...), currently supported:
+# - DirectBasicAuthClient
 # - SAML2Client
 # If no or empty value is set, no authentication is used.
 smui.auth.client = ""
@@ -224,6 +225,13 @@ smui.auth.clients.SAML2Client {
     maximumAuthenticationLifetime = ${?SMUI_SAML_MAXIMUM_AUTHENTICATION_LIFETIME}
 }
 
+# The DirectBasicAuthClient configuration which is used *only* when the DirectBasicAuthClient is configured as smui.auth.client
+smui.auth.clients.ConfiguredDirectBasicAuthClient {
+    username = "smui_user"
+    username = ${?SMUI_BASIC_AUTH_PASS}
+    password = "smui_pass"
+    password = ${?SMUI_BASIC_AUTH_PASS}
+}
 
 # pac4j rules for configuring the pac4j SecurityFilter
 pac4j.security.rules = [

From 07496de2862d0e60c4470f3db1bb27fbde4ac234 Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Tue, 20 Feb 2024 16:26:04 +0100
Subject: [PATCH 8/9] Re-enable admin button in menu bar (issue 126 not
 reproducible)

---
 .../src/app/components/header-nav/header-nav.component.html  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/app/components/header-nav/header-nav.component.html b/frontend/src/app/components/header-nav/header-nav.component.html
index 9e097fa7..be10b907 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.html
+++ b/frontend/src/app/components/header-nav/header-nav.component.html
@@ -55,10 +55,6 @@
         >Report</a
         >
       </li>
-      <!--
-
-        TODO Fix https://github.com/querqy/smui/issues/126 and reactivate Admin panel access
-
       <li class="nav-item">
         <a
           class="nav-link"
@@ -67,7 +63,6 @@
         >Admin</a
         >
       </li>
-      -->
       <li>
         <button class="btn btn-outline-secondary" (click)="openHelpModal()">
           <i class="fa fa-info-circle" aria-hidden="true"></i> Help

From e3377d38057ff8989cd03b7dbe2abde6f3a97ebf Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Tue, 20 Feb 2024 18:30:48 +0100
Subject: [PATCH 9/9] Fix test with RuntimeException

---
 app/modules/SecurityModule.scala | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/modules/SecurityModule.scala b/app/modules/SecurityModule.scala
index 71fb2219..8af1d785 100644
--- a/app/modules/SecurityModule.scala
+++ b/app/modules/SecurityModule.scala
@@ -49,10 +49,7 @@ class SecurityModule(environment: Environment, configuration: Configuration) ext
       case "SAML2Client" => createSaml2Config(s"$ConfigKeyPrefixClientConfig.SAML2Client")
       case other => throw new RuntimeException(s"Unsupported auth client config value: $other")
     }
-    config match {
-      case Some(config) => config
-      case None => throw new RuntimeException(s"Failed configuring auth client")
-    }
+    config.getOrElse(new Config())
   }
 
   private def createConfiguredDirectBasicAuthConfig(keyPrefix: String): Config = {