Commit e946d06c authored by Jie Yuan's avatar Jie Yuan
Browse files

make the urls consistent

parent 445388f9
......@@ -32,7 +32,7 @@ import svmon.utils.ScheduledTasks;
@RestController
@CrossOrigin(origins={"https://svmon-dev.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200","https://svmon.eudat.eu"},maxAge=3600)
@CrossOrigin(origins={"https://svmon-dev-test.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200"},maxAge=3600)
public class AAILoginService {
@Autowired
......@@ -108,7 +108,7 @@ public class AAILoginService {
public RedirectView AAIAuthenticateUser(Principal currentUser ) {
if(currentUser == null) {
RedirectView redirectV = new RedirectView("https://svmon-dev.scc.kit.edu:443/login");
RedirectView redirectV = new RedirectView("https://svmon-dev-test.scc.kit.edu:443/login");
return redirectV;
}
//System.out.println(currentUser.getName());
......@@ -156,7 +156,7 @@ public class AAILoginService {
String jwt = tokenProvider.generateToken(authentication);
JwtAuthenticationResponse jwtResp = new JwtAuthenticationResponse(jwt);
RedirectView redirectV = new RedirectView("https://svmon-dev.scc.kit.edu:443/aailogin");
RedirectView redirectV = new RedirectView("https://svmon-dev-test.scc.kit.edu:443/aailogin");
redirectV.addStaticAttribute("TokenType", jwtResp.getTokenType());
redirectV.addStaticAttribute("AccessToken", jwtResp.getAccessToken());
return redirectV;
......@@ -164,7 +164,7 @@ public class AAILoginService {
RedirectView redirectV = new RedirectView("https://svmon-dev.scc.kit.edu:443/dashboard");
RedirectView redirectV = new RedirectView("https://svmon-dev-test.scc.kit.edu:443/dashboard");
return redirectV;
}
......
......@@ -52,7 +52,7 @@ import svmon.security.JwtTokenProvider;
@RestController
@RequestMapping("/api/auth")
@CrossOrigin(origins={"https://svmon-dev.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200","https://svmon.eudat.eu"},maxAge=3600)
@CrossOrigin(origins={"https://svmon-dev-test.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200"},maxAge=3600)
public class AuthController {
private static final String Optional = null;
......
......@@ -37,7 +37,7 @@ import svmon.utils.ScheduledTasks;
/** This means URL's start with /demo (after Application path) **/
@RequestMapping(path="/api/hostName")
@RestController
@CrossOrigin(origins={"https://svmon-dev.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200","https://svmon.eudat.eu"},maxAge=3600)
@CrossOrigin(origins={"https://svmon-dev-test.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200"},maxAge=3600)
public class HostNameEndpoint {
@Autowired
......
......@@ -55,7 +55,7 @@ import svmon.utils.ScheduledTasks;
/** This means URL's start with /demo (after Application path) **/
@RequestMapping(path="/api/serviceComponent")
@RestController
@CrossOrigin(origins={"https://svmon-dev.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200","https://svmon.eudat.eu"},maxAge=3600)
@CrossOrigin(origins={"https://svmon-dev-test.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200"},maxAge=3600)
public class ServiceComponentEndpoint {
@Autowired
......
......@@ -50,7 +50,7 @@ import svmon.model.HostName;
@RequestMapping(path="/api/sites")
/** This means that this class is a Rest Controller **/
@RestController
@CrossOrigin(origins={"https://svmon-dev.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200","https://svmon.eudat.eu"},maxAge=3600)
@CrossOrigin(origins={"https://svmon-dev-test.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200"},maxAge=3600)
public class SiteEndpoint {
@Autowired
......
......@@ -37,7 +37,7 @@ import svmon.payload.UserSummary;
@RestController
@RequestMapping("/api/user")
@CrossOrigin(origins={"https://svmon-dev.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200","https://svmon.eudat.eu"},maxAge=3600)
@CrossOrigin(origins={"https://svmon-dev-test.scc.kit.edu","http://localhost:4200","http://141.52.74.125:4200"},maxAge=3600)
public class UserRegistrationRestController {
public static final Logger logger =
LoggerFactory.getLogger(UserRegistrationRestController.class);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment