Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

Compute base url in webapp

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-10 11:59:21 +02:00
parent 6bc41cee0a
commit 8c675f5dd8
8 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -114,6 +114,7 @@ import sonia.scm.web.cgi.CGIExecutorFactory;
import sonia.scm.web.cgi.DefaultCGIExecutorFactory;
import sonia.scm.web.filter.AuthenticationFilter;
import sonia.scm.web.filter.LoggingFilter;
import sonia.scm.web.protocol.HttpProtocolServlet;
import sonia.scm.web.security.AdministrationContext;
import sonia.scm.web.security.DefaultAdministrationContext;
@@ -322,7 +323,7 @@ public class ScmServletModule extends ServletModule
bind(TemplateEngineFactory.class);
bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class);
filter("/repo/*").through(AuthenticationFilter.class);
filter(HttpProtocolServlet.PATTERN).through(AuthenticationFilter.class);
// bind events
// bind(LastModifiedUpdateListener.class);

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
View File

@@ -67,6 +67,6 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
}
private Link createProtocolLink(ScmProtocol protocol, Repository repository) {
return Link.linkBuilder("protocol", protocol.getUrl(repository, uriInfoStore.get())).withName(protocol.getType()).build();
return Link.linkBuilder("protocol", protocol.getUrl(repository, uriInfoStore.get().getBaseUri().resolve("../.."))).withName(protocol.getType()).build();
}
}

3
scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
View File

@@ -28,7 +28,8 @@ import java.util.Optional;
@Slf4j
public class HttpProtocolServlet extends HttpServlet {
public static final String PATTERN = "/repo/*";
public static final String PATH = "/repo";
public static final String PATTERN = PATH + "/*";
private final RepositoryServiceFactory serviceFactory;