From 1979bfaef04ac7fce3250d4ce861fdd0e8b1be8d Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Wed, 21 Feb 2024 10:15:39 +0100
Subject: [PATCH 1/5] Fix retrieval of name for prelive environment

---
 app/models/FeatureToggleModel.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/FeatureToggleModel.scala b/app/models/FeatureToggleModel.scala
index 3d2de0b..48c14ef 100644
--- a/app/models/FeatureToggleModel.scala
+++ b/app/models/FeatureToggleModel.scala
@@ -55,7 +55,7 @@ package object FeatureToggleModel extends Logging {
     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 FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL = "toggle.deploy-prelive-fn-label"
     private val ACTIVATE_RULE_TAGGING = "toggle.rule-tagging"
     private val PREDEFINED_TAGS_FILE = "toggle.predefined-tags-file"
     private val SMUI_VERSION = "smui.version"

From a351ac1177a0d213c3fa7ef56346bcd201c273dc Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Wed, 21 Feb 2024 10:32:45 +0100
Subject: [PATCH 2/5] Update version and fix additional variable labels

---
 build.sbt                                                     | 2 +-
 .../src/app/components/header-nav/header-nav.component.html   | 2 +-
 .../src/app/components/header-nav/header-nav.component.ts     | 4 ++--
 frontend/src/app/services/feature-toggle.service.ts           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 085a7ed..be2be9e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.GitBranchPrompt
 
 name := "search-management-ui"
-version := "4.0.9"
+version := "4.0.10"
 maintainer := "Contact productful.io <hello@productful.io>"
 
 scalaVersion := "2.12.17"
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 be10b90..38aa795 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.html
+++ b/frontend/src/app/components/header-nav/header-nav.component.html
@@ -82,7 +82,7 @@
       <ng-container *ngFor="let singleDeploymentInfo of deploymentLogInfo; index as idxDeploy">
         <span class="depl-info-row-instance">
           <b>{{ (singleDeploymentInfo.targetSystem == 'PRELIVE' ?
-                  featureToggleService.getSync('toggle.rule-deployment-prelive-label') :
+                  featureToggleService.getSync('toggle.deploy-prelive-fn-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">
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 e561cb5..7f938a1 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.ts
+++ b/frontend/src/app/components/header-nav/header-nav.component.ts
@@ -103,8 +103,8 @@ export class HeaderNavComponent implements OnInit {
 
   public publishToPreliveButtonText(): string {
     return this.deploymentRunningForStage === 'PRELIVE'
-      ? 'Publishing to ' + this.featureToggleService.getSync('toggle.rule-deployment-prelive-label') + '...'
-      : 'Publish to ' + this.featureToggleService.getSync('toggle.rule-deployment-prelive-label') + '';
+      ? 'Publishing to ' + this.featureToggleService.getSync('toggle.deploy-prelive-fn-label') + '...'
+      : 'Publish to ' + this.featureToggleService.getSync('toggle.deploy-prelive-fn-label') + '';
   }
 
   public publishToLiveButtonText(): string {
diff --git a/frontend/src/app/services/feature-toggle.service.ts b/frontend/src/app/services/feature-toggle.service.ts
index bba4fa7..a9a518c 100644
--- a/frontend/src/app/services/feature-toggle.service.ts
+++ b/frontend/src/app/services/feature-toggle.service.ts
@@ -10,7 +10,7 @@ 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";
+const FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL = "toggle.deploy-prelive-fn-label";
 
 
 @Injectable({

From 71c10d9b3d81b78573ab893ee017ee5f4797fea0 Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Wed, 21 Feb 2024 11:40:02 +0100
Subject: [PATCH 3/5] Add service method with the declared toggle name constant

---
 .../components/header-nav/header-nav.component.html    | 10 +++++-----
 .../app/components/header-nav/header-nav.component.ts  |  8 ++++----
 frontend/src/app/services/feature-toggle.service.ts    |  8 ++++++++
 3 files changed, 17 insertions(+), 9 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 38aa795..c523e02 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.html
+++ b/frontend/src/app/components/header-nav/header-nav.component.html
@@ -82,8 +82,8 @@
       <ng-container *ngFor="let singleDeploymentInfo of deploymentLogInfo; index as idxDeploy">
         <span class="depl-info-row-instance">
           <b>{{ (singleDeploymentInfo.targetSystem == 'PRELIVE' ?
-                  featureToggleService.getSync('toggle.deploy-prelive-fn-label') :
-                  featureToggleService.getSync('toggle.rule-deployment-label'))}}</b> deployment:</span>
+                  featureToggleService.getSyncToggleDeploymentLabel('PRELIVE') :
+                  featureToggleService.getSyncToggleDeploymentLabel('LIVE'))}}</b> deployment:</span>
         <span class="depl-info-row-datetime"><b>{{ singleDeploymentInfo.formattedDateTime }}</b></span>
         <span class="depl-info-row-result">
           <b
@@ -164,9 +164,9 @@
   </div>
 </app-smui-modal>
 
-<app-smui-modal id="confirm-publish-live" title="Confirm publish to {{ featureToggleService.getSync('toggle.rule-deployment-label') }}">
+<app-smui-modal id="confirm-publish-live" title="Confirm publish to {{ featureToggleService.getSyncToggleDeploymentLabel('LIVE') }}">
   <div content>
-    <p>Are you sure to publish current Search Rules to {{ featureToggleService.getSync('toggle.rule-deployment-label') }}?</p>
+    <p>Are you sure to publish current Search Rules to {{ featureToggleService.getSyncToggleDeploymentLabel('LIVE') }}?</p>
   </div>
   <div footer class="btn-toolbar">
     <button
@@ -175,7 +175,7 @@
       (click)="requestPublishRulesTxtToSolr('LIVE')"
     >
       <i class="fa fa-thumbs-up smui-icon"></i>
-      Yes, publish to {{ featureToggleService.getSync('toggle.rule-deployment-label') }}
+      Yes, publish to {{ featureToggleService.getSyncToggleDeploymentLabel('LIVE') }}
     </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 7f938a1..b60524a 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'
-      ? 'Publishing to ' + this.featureToggleService.getSync('toggle.deploy-prelive-fn-label') + '...'
-      : 'Publish to ' + this.featureToggleService.getSync('toggle.deploy-prelive-fn-label') + '';
+      ? 'Publishing to ' + this.featureToggleService.getSyncToggleDeploymentLabel('PRELIVE') + '...'
+      : 'Publish to ' + this.featureToggleService.getSyncToggleDeploymentLabel('PRELIVE') + '';
   }
 
   public publishToLiveButtonText(): string {
     return this.deploymentRunningForStage === 'LIVE'
-      ? 'Publishing to ' + this.featureToggleService.getSync('toggle.rule-deployment-label') + '...'
-      : 'Publish to ' + this.featureToggleService.getSync('toggle.rule-deployment-label') + '';
+      ? 'Publishing to ' + this.featureToggleService.getSyncToggleDeploymentLabel('LIVE') + '...'
+      : 'Publish to ' + this.featureToggleService.getSyncToggleDeploymentLabel('LIVE') + '';
   }
 
   public publishSolrConfig() {
diff --git a/frontend/src/app/services/feature-toggle.service.ts b/frontend/src/app/services/feature-toggle.service.ts
index a9a518c..fa4e4c8 100644
--- a/frontend/src/app/services/feature-toggle.service.ts
+++ b/frontend/src/app/services/feature-toggle.service.ts
@@ -90,4 +90,12 @@ export class FeatureToggleService {
     }
   }
 
+  getSyncToggleDeploymentLabel(stage: string): any {
+    const s =
+      (stage == 'PRELIVE') ?
+        FEATURE_TOGGLE_DEPLOYMENT_PRELIVE_LABEL :
+        FEATURE_TOGGLE_DEPLOYMENT_LABEL;
+    return this.getSync(s);
+  }
+
 }

From b76605b2f2f4812056d37c781a658a2d50bcafc8 Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Thu, 22 Feb 2024 14:03:59 +0100
Subject: [PATCH 4/5] Make basic auth username checking case insensitive

---
 app/modules/ConfiguredBasicAuthAuthenticator.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/modules/ConfiguredBasicAuthAuthenticator.scala b/app/modules/ConfiguredBasicAuthAuthenticator.scala
index c13badf..f8c64dc 100644
--- a/app/modules/ConfiguredBasicAuthAuthenticator.scala
+++ b/app/modules/ConfiguredBasicAuthAuthenticator.scala
@@ -18,7 +18,7 @@ case class ConfiguredBasicAuthAuthenticator(validUserId: String, validPassword:
     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(username.toLowerCase, validUserId.toLowerCase)) 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)

From 0facfb983a8f0f85c9a8b981977ecaac54ed298e Mon Sep 17 00:00:00 2001
From: paulb <paul@search-solutions.net>
Date: Thu, 22 Feb 2024 14:40:34 +0100
Subject: [PATCH 5/5] build version +1

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

diff --git a/build.sbt b/build.sbt
index be2be9e..a2459cc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.GitBranchPrompt
 
 name := "search-management-ui"
-version := "4.0.10"
+version := "4.0.11"
 maintainer := "Contact productful.io <hello@productful.io>"
 
 scalaVersion := "2.12.17"