merge master into develop

docker-compose.yml

@@ -66,10 +66,11 @@ services:
       STREETCODE_Payment__Token: ${PAYMENT_TOKEN}
       STREETCODE_EMAILCONFIGURATION__PASSWORD: ${EMAIL_PASSWORD}
       STREETCODE_RECAPTCHA__SECRETKEY: ${RECAPTCHA_SECRET_KEY}
-      STREETCODE_CORS__AllowedOrigins: '["*"]'
-      STREETCODE_CORS__AllowedHeaders: '["*"]'
-      STREETCODE_CORS__AllowedMethods: '["*"]'
-      STREETCODE_CORS__PreflightMaxAge: 1
+      STREETCODE_CORS__AllowedOrigins: ${CORS_ALLOWED_ORIGINS}
+      STREETCODE_CORS__AllowedHeaders: ${CORS_ALLOWED_HEADERS}
+      STREETCODE_CORS__AllowedMethods: ${CORS_ALLOWED_METHODS}
+      STREETCODE_CORS__ExposedHeaders: ${CORS_EXPOSED_HEADERS}
+      STREETCODE_CORS__PreflightMaxAge: "600"
       STREETCODE_IPRATELIMITING__GENERALRULES__0__LIMIT: 500
       ASPNETCORE_ENVIRONMENT: ${SWAGGER_APP_ENVIRONMENT}
     volumes:
@@ -81,6 +82,8 @@ services:
       interval: 30s
       timeout: 10s
       retries: 5
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     logging:
       driver: loki
       options:

src/app/common/components/ContactForm/ContactForm.component.tsx

@@ -18,7 +18,7 @@ interface Props {
 const ContactForm = forwardRef((customClass: Props, ref) => {
     const [formData, setFormData] = useState({ email: '', message: '' });
     const [isVerified, setIsVerified] = useState(false);
-    const [messageApi, messageContextHolder] = message.useMessage();
+    const [messageApi, messageContextHolder] = message.useMessage({maxCount: 3});
     const [form] = Form.useForm();
     const recaptchaRef = useRef<ReCAPTCHA>(null);
     const siteKey = window._env_.RECAPTCHA_SITE_KEY;
@@ -30,6 +30,10 @@ const ContactForm = forwardRef((customClass: Props, ref) => {
         setIsVerified(true);
     };
 
+    const handleExpiration = () => {
+        setIsVerified(false);
+    };
+
     useImperativeHandle(ref, () => ({
         clearModal() {
             form.resetFields();
@@ -133,6 +137,7 @@ const ContactForm = forwardRef((customClass: Props, ref) => {
                         className="required-captcha"
                         sitekey={siteKey ? siteKey : ""}
                         onChange={handleVerify}
+                        onExpired={handleExpiration}
                         ref={recaptchaRef}
                     />
                 </div>

src/app/common/components/modals/Partners/PartnersModal.component.tsx

@@ -24,7 +24,7 @@ const PartnersModal = () => {
     const { setModal, modalsState: { partners } } = modalStore;
     const [form] = Form.useForm();
     const [formData, setFormData] = useState({ email: '', message: '' });
-    const [messageApi, messageContextHolder] = message.useMessage();
+    const [messageApi, messageContextHolder] = message.useMessage({maxCount: 3});
     const [isVerified, setIsVerified] = useState(false);
     const recaptchaRef = useRef<ReCAPTCHA>(null);
     const siteKey = window._env_.RECAPTCHA_SITE_KEY;
@@ -72,6 +72,10 @@ const PartnersModal = () => {
         setIsVerified(true);
     };
 
+    const handleExpiration = () => {
+        setIsVerified(false);
+    };
+
     const successMessage = () => {
         messageApi.open({
             type: 'success',
@@ -174,6 +178,7 @@ const PartnersModal = () => {
                                 className="required-input"
                                 sitekey={siteKey ? siteKey : ""}
                                 onChange={handleVerify}
+                                onExpired={handleExpiration}
                                 ref={recaptchaRef}
                             />
                         </div>

src/app/common/constants/api-routes.constants.ts

@@ -199,8 +199,9 @@ export const API_ROUTES = {
         DELETE: 'coordinate/delete',
     },
     USERS: {
-        LOGIN: 'user/login',
-        REFRESH_TOKEN: 'user/refreshToken',
+        LOGIN: 'auth/login',
+        REFRESH_TOKEN: 'auth/refreshToken',
+        REGISTER: 'auth/register',
     },
     EMAIL: {
         SEND: 'email/send',

templates/default.conf.template

@@ -2,28 +2,38 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name $FRONTEND_SERVER_NAME;
+    server_name $FRONTEND_SERVER_NAME www.$FRONTEND_SERVER_NAME;
+    server_tokens off;
 
     location /.well-known/acme-challenge/ {
         root /var/www/certbot;
     }
 
-    return 301 https://$FRONTEND_SERVER_NAME;
+
+    location / {
+    return 301 https://$FRONTEND_SERVER_NAME$request_uri;
+    }
 }
 
 server {
     listen 80;
     listen [::]:80;
 
-    server_name $BACKEND_SERVER_NAME;
+    server_name $BACKEND_SERVER_NAME www.$BACKEND_SERVER_NAME;
+    server_tokens off;
+
 
     location /.well-known/acme-challenge/ {
         root /var/www/certbot;
     }
-
-    return 301 https://$BACKEND_SERVER_NAME;
+
+
+    location / {
+    return 301 https://$BACKEND_SERVER_NAME$request_uri;
+    }
 }
 
+
 server {
     listen 443 ssl http2;
     server_name $FRONTEND_SERVER_NAME;
@@ -61,4 +71,4 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
-}
+}