Fix interceptor

This commit is contained in:
Paulo Gustavo Veiga 2024-01-15 15:42:04 -08:00
parent 3a9aad02cf
commit 5fe3bb082a
3 changed files with 32 additions and 3 deletions

View File

@ -1,17 +1,43 @@
/*
* Copyright [2022] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.wisemapping.config.common; package com.wisemapping.config.common;
import com.wisemapping.filter.RequestPropertiesInterceptor; import com.wisemapping.filter.RequestPropertiesInterceptor;
import com.wisemapping.filter.UserLocaleInterceptor; import com.wisemapping.filter.UserLocaleInterceptor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Component @Component
@ComponentScan("com.wisemapping.filter")
public class InterceptorsConfig implements WebMvcConfigurer { public class InterceptorsConfig implements WebMvcConfigurer {
@Autowired
private UserLocaleInterceptor userLocaleInterceptor;
@Autowired
private RequestPropertiesInterceptor requestPropertiesInterceptor;
@Override @Override
public void addInterceptors(@NotNull final InterceptorRegistry registry) { public void addInterceptors(@NotNull final InterceptorRegistry registry) {
registry.addInterceptor(new UserLocaleInterceptor()); registry.addInterceptor(userLocaleInterceptor);
registry.addInterceptor(new RequestPropertiesInterceptor()); registry.addInterceptor(requestPropertiesInterceptor);
} }
} }

View File

@ -20,12 +20,14 @@ package com.wisemapping.filter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@Component
public class RequestPropertiesInterceptor implements HandlerInterceptor { public class RequestPropertiesInterceptor implements HandlerInterceptor {
@Value("${google.analytics.enabled}") @Value("${google.analytics.enabled}")
private Boolean analyticsEnabled; private Boolean analyticsEnabled;

View File

@ -21,6 +21,7 @@ package com.wisemapping.filter;
import com.wisemapping.model.User; import com.wisemapping.model.User;
import com.wisemapping.security.Utils; import com.wisemapping.security.Utils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.i18n.SessionLocaleResolver; import org.springframework.web.servlet.i18n.SessionLocaleResolver;
@ -28,7 +29,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
import java.util.Locale; import java.util.Locale;
@Component
public class UserLocaleInterceptor implements HandlerInterceptor { public class UserLocaleInterceptor implements HandlerInterceptor {
@Override @Override