From de724007060d802bef725e6bf8d6bbf7e22aac65 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 6 Apr 2023 12:42:51 +0200
Subject: [PATCH] oidc: Allow multiple redirectUris

---
 dashboard/src/views/oidc.html | 8 ++++----
 src/oidc.js                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dashboard/src/views/oidc.html b/dashboard/src/views/oidc.html
index 7e7a9233b..b60e46e88 100644
--- a/dashboard/src/views/oidc.html
+++ b/dashboard/src/views/oidc.html
@@ -27,8 +27,8 @@
               <input type="text" id="clientSecret" class="form-control" name="clientSecret" ng-model="clientAdd.secret" required/>
             </div>
             <div class="form-group">
-              <label class="control-label" for="loginRedirectUri">Login callback Url</label>
-              <input type="url" id="loginRedirectUri" class="form-control" name="loginRedirectUri" ng-model="clientAdd.loginRedirectUri" required/>
+              <label class="control-label" for="loginRedirectUri">Login callback Url (comma separated if more than one)</label>
+              <input type="text" id="loginRedirectUri" class="form-control" name="loginRedirectUri" ng-model="clientAdd.loginRedirectUri" required/>
             </div>
             <div class="form-group">
               <label class="control-label" for="logoutRedirectUri">Logout callback Url (optional)</label>
@@ -74,8 +74,8 @@
               <input type="text" id="inputEditClientSecret" class="form-control" name="clientSecret" ng-model="clientEdit.secret" required/>
             </div>
             <div class="form-group">
-              <label class="control-label" for="inputEditLoginRedirectUri">Login callback Url</label>
-              <input type="url" id="inputEditLoginRedirectUri" class="form-control" name="loginRedirectUri" ng-model="clientEdit.loginRedirectUri" required/>
+              <label class="control-label" for="inputEditLoginRedirectUri">Login callback Url (comma separated if more than one)</label>
+              <input type="text" id="inputEditLoginRedirectUri" class="form-control" name="loginRedirectUri" ng-model="clientEdit.loginRedirectUri" required/>
             </div>
             <div class="form-group">
               <label class="control-label" for="inputEditLogoutRedirectUri">Logout callback Url (optional)</label>
diff --git a/src/oidc.js b/src/oidc.js
index 61f396dc3..240322e16 100644
--- a/src/oidc.js
+++ b/src/oidc.js
@@ -249,7 +249,7 @@ class CloudronAdapter {
             const tmp = {
                 client_id: id,
                 client_secret: client.secret,
-                redirect_uris: [ client.loginRedirectUri ],
+                redirect_uris: client.loginRedirectUri.split(',').map(s => s.trim()),
                 id_token_signed_response_alg: client.tokenSignatureAlgorithm || 'RS256'
             };