Skip to content

Commit

Permalink
fix: secure cookies often are not set by the cookie plugin (#7261)
Browse files Browse the repository at this point in the history
Co-authored-by: Mark Anderson <mark@ionic.io>
  • Loading branch information
dtarnawsky and markemer committed Apr 5, 2024
1 parent fbfb778 commit cda1886
Showing 1 changed file with 14 additions and 11 deletions.
Expand Up @@ -52,23 +52,26 @@ public void removeSessionCookies() {
}

public String getSanitizedDomain(String url) throws URISyntaxException {
if (url == null || url.isEmpty()) {
if (this.serverUrl != null && !this.serverUrl.isEmpty() && (url == null || url.isEmpty() || this.serverUrl.contains(url))) {
url = this.serverUrl;
} else if (this.localUrl != null && !this.localUrl.isEmpty() && (url == null || url.isEmpty() || this.localUrl.contains(url))) {
url = this.localUrl;
} else try {
URI uri = new URI(url);
String scheme = uri.getScheme();
if (scheme == null || scheme.isEmpty()) {
url = "https://" + url;
}
} catch (URISyntaxException e) {
Logger.error(TAG, "Failed to get scheme from URL.", e);
}

try {
new URI(url);
} catch (Exception ignored) {
url = this.localUrl;

try {
new URI(url);
} catch (Exception error) {
Logger.error(TAG, "Failed to get sanitized URL.", error);
throw error;
}
} catch (Exception error) {
Logger.error(TAG, "Failed to get sanitized URL.", error);
throw error;
}

return url;
}

Expand Down

0 comments on commit cda1886

Please sign in to comment.