Fix servlets by adding again init and fix login-core version.

This commit is contained in:
Konstantinos Triantafyllou 2023-07-07 15:10:56 +03:00
parent 970abc0596
commit 78f21ccbd3
5 changed files with 37 additions and 3 deletions

View File

@ -9,9 +9,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dnet-openaire-users</artifactId> <artifactId>dnet-openaire-users</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>2.0.3-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<scm> <scm>
<connection>scm:git:gitea@code-repo.d4science.org:MaDgIK/dnet-openaire-users.git</connection>
<developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/dnet-openaire-users.git</developerConnection> <developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/dnet-openaire-users.git</developerConnection>
<url>https://code-repo.d4science.org/MaDgIK/dnet-openaire-users/</url> <url>https://code-repo.d4science.org/MaDgIK/dnet-openaire-users/</url>
@ -25,7 +24,7 @@
<dependency> <dependency>
<groupId>eu.dnetlib</groupId> <groupId>eu.dnetlib</groupId>
<artifactId>uoa-login-core</artifactId> <artifactId>uoa-login-core</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0)</version> <version>1.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

View File

@ -1,7 +1,10 @@
package eu.dnetlib.openaire.usermanagement; package eu.dnetlib.openaire.usermanagement;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -12,6 +15,12 @@ public class OverviewServlet extends HttpServlet {
@Value("${client-management.url}") @Value("${client-management.url}")
private String url; private String url;
public void init(ServletConfig config) throws ServletException {
super.init(config);
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
config.getServletContext());
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.sendRedirect(url + "/"); response.sendRedirect(url + "/");
} }

View File

@ -1,7 +1,10 @@
package eu.dnetlib.openaire.usermanagement; package eu.dnetlib.openaire.usermanagement;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -12,6 +15,12 @@ public class PersonalTokenServlet extends HttpServlet {
@Value("${client-management.url}") @Value("${client-management.url}")
private String url; private String url;
public void init(ServletConfig config) throws ServletException {
super.init(config);
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
config.getServletContext());
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.sendRedirect(url + "/personal-token"); response.sendRedirect(url + "/personal-token");
} }

View File

@ -1,7 +1,10 @@
package eu.dnetlib.openaire.usermanagement; package eu.dnetlib.openaire.usermanagement;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -13,6 +16,12 @@ public class RegisterServiceServlet extends HttpServlet {
@Value("${client-management.url}") @Value("${client-management.url}")
private String url; private String url;
public void init(ServletConfig config) throws ServletException {
super.init(config);
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
config.getServletContext());
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.sendRedirect(url + "/apis"); response.sendRedirect(url + "/apis");
} }

View File

@ -1,7 +1,9 @@
package eu.dnetlib.openaire.usermanagement; package eu.dnetlib.openaire.usermanagement;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -13,6 +15,12 @@ public class RegisteredServicesServlet extends HttpServlet {
@Value("${client-management.url}") @Value("${client-management.url}")
private String url; private String url;
public void init(ServletConfig config) throws ServletException {
super.init(config);
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
config.getServletContext());
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.sendRedirect(url + "/apis"); response.sendRedirect(url + "/apis");
} }