Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix allowed domains breaking OAuth (#8953)

Browse Source 
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
This commit is contained in:
Shrikant Sharat Kandula 2021-11-02 10:57:41 +05:30 committed by GitHub
parent 77e3c4f4db
commit d5ec98f7cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java
View File

@ -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;