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

CB-5559 include root uri in redirect urls #2950

Merged
merged 2 commits into from
Oct 1, 2024
Merged

CB-5559 include root uri in redirect urls #2950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d2cd95
CB-5559 include root uri in redirect urls
yagudin10 Sep 30, 2024
fb3b051
Merge branch 'devel' into CB-5559-root-uri-oidc-single-sign-on
dariamarutkina Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...undles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public String getSignInLink() throws DBException {
}

private String buildRedirectUrl(String baseUrl) {
return baseUrl + "?" + CBAuthConstants.CB_REDIRECT_URL_REQUEST_PARAM + "=" + WebAppUtils.getWebApplication().getServerURL();
return baseUrl + "?" + CBAuthConstants.CB_REDIRECT_URL_REQUEST_PARAM + "=" + WebAppUtils.getFullServerUrl();
}

@Property
Expand Down
11 changes: 11 additions & 0 deletions server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@

import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class WebAppUtils {
private static final Log log = Log.getLog(WebAppUtils.class);
Expand Down Expand Up @@ -269,4 +271,13 @@
}
}

@NotNull

Check warning on line 274 in server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java

View check run for this annotation

Jenkins-CI-integration / CheckStyle Java Report

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java#L274 

Missing a Javadoc comment.
public static String getFullServerUrl() {
WebApplication application = WebAppUtils.getWebApplication();
return Stream.of(application.getServerURL(), application.getRootURI())
.map(WebAppUtils::removeSideSlashes)
.filter(CommonUtils::isNotEmpty)
.collect(Collectors.joining("/"));
}

}