Skip to content

Commit

Permalink
login - fix thymeleaf integration (reverts a modification from #114)
Browse files Browse the repository at this point in the history
See #114 (comment)

Using RestController will disable thymeleaf template integration,
reverting back to Controller annotation instead.

Tests: runtime in the docker composition provided at the root of the
reppository.
  • Loading branch information
pmauduit committed May 7, 2024
1 parent adea34c commit 3d5bb4a
Showing 1 changed file with 11 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@
*/
package org.georchestra.gateway.app;

import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;

import javax.annotation.PostConstruct;

import lombok.extern.slf4j.Slf4j;
import org.georchestra.gateway.security.GeorchestraGatewaySecurityConfigProperties;
import org.georchestra.gateway.security.GeorchestraGatewaySecurityConfigProperties.Server;
import org.georchestra.gateway.security.GeorchestraUserMapper;
Expand All @@ -46,18 +38,24 @@
import org.springframework.context.support.ReloadableResourceBundleMessageSource;
import org.springframework.core.env.Environment;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.unit.DataSize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ServerWebExchange;

import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Mono;

@RestController
import javax.annotation.PostConstruct;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;

@Controller
@Slf4j
@SpringBootApplication
@EnableConfigurationProperties(GeorchestraGatewaySecurityConfigProperties.class)
Expand Down

0 comments on commit 3d5bb4a

Please sign in to comment.