From 4b9019538bf3fc1e5d9e2dc15e376885cecd5c5a Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <jamalkm@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:20:19 +0000
Subject: [PATCH] AUTH-528: Fix extra clients (#143)

---
 .travis.yml                                        | 2 +-
 helm/alfresco-identity-service/alfresco-realm.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b8ea74..c5664d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ env:
     - TRAVIS_WAIT_TIMEOUT=${TRAVIS_WAIT_TIMEOUT:-30}
     - BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}
     - HELM_REPO_BASE_URL=https://kubernetes-charts.alfresco.com
-    - HELM_REPO=incubator
+    - HELM_REPO=${HELM_REPO:-incubator}
     - KUBERNETES_VERSION=1.18.4
     - HELM_VERSION=${HELM_VERSION:-3.2.4}
 
diff --git a/helm/alfresco-identity-service/alfresco-realm.json b/helm/alfresco-identity-service/alfresco-realm.json
index de47f6f..0b1e735 100644
--- a/helm/alfresco-identity-service/alfresco-realm.json
+++ b/helm/alfresco-identity-service/alfresco-realm.json
@@ -1307,6 +1307,10 @@
         "microprofile-jwt"
       ]
     }
+    {{- range .Values.realm.alfresco.extraClients }}
+    {{- $noRoles := omit . "clientRoles" -}}
+, {{ $noRoles | toJson }}
+{{- end }}
   ],
   "clientScopes": [
     {
@@ -1792,10 +1796,6 @@
         "display.on.consent.screen": "true"
       }
     }
-{{- range .Values.realm.alfresco.extraClients }}
-{{- $noRoles := omit . "clientRoles" -}}
-, {{ $noRoles | toJson }}
-{{- end }}
   ],
   "defaultDefaultClientScopes": [
     "role_list",