Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: secure cookies often are not set by the cookie plugin #7261

Merged
merged 3 commits into from
Apr 5, 2024
Merged

fix: secure cookies often are not set by the cookie plugin #7261

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04b6b92
fix: secure cookies often are not set by the cookie plugin
dtarnawsky Feb 15, 2024
f8b7942
Merge branch 'main' into main
markemer Mar 19, 2024
983f488
Merge branch 'main' into main
dtarnawsky Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 14 additions & 11 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/CapacitorCookieManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
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