From d5ec98f7cb13a276491d81e60db9d73ab2a460b3 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Tue, 2 Nov 2021 10:57:41 +0530
Subject: [PATCH] Fix allowed domains breaking OAuth (#8953)

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
---
 .../appsmith/server/configurations/CommonConfig.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
index 4489e7a134..5177b583b2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
@@ -19,6 +19,7 @@ import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -82,10 +83,12 @@ public class CommonConfig {
 
     public List<String> getOauthAllowedDomains() {
         if (allowedDomainsForOauth == null) {
-            allowedDomainsForOauth = StringUtils.hasText(allowedDomainsForOauthString)
-                    ? Arrays.asList(allowedDomainsForOauthString.trim().split("\\s*,[,\\s]*"))
-                    : new ArrayList<>();
-            allowedDomainsForOauth.addAll(getAllowedDomains());
+            final Set<String> domains = new HashSet<>();
+            if (StringUtils.hasText(allowedDomainsForOauthString)) {
+                domains.addAll(Arrays.asList(allowedDomainsForOauthString.trim().split("\\s*,[,\\s]*")));
+            }
+            domains.addAll(getAllowedDomains());
+            allowedDomainsForOauth = new ArrayList<>(domains);
         }
 
         return allowedDomainsForOauth;