Merge pull request #84 from databucket/3.4.3

v.3.4.3

Author: kslysz

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'pl.databucket'
-version = '3.4.2'
+version = '3.4.3'
 targetCompatibility = 8
 sourceCompatibility = 8
 

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "homepage": ".",
   "name": "databucket",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "private": true,
   "dependencies": {
     "@material-ui/core": "4.12.4",

frontend/src/components/dialogs/InfoDialog.jsx

@@ -62,7 +62,7 @@ export default function InfoDialog() {
             >
                 <img style={{marginLeft: '100px', marginTop: '20px'}} src={DatabucketLogo} alt='' width='399' height='65'/>
                 <div style={{margin: '20px'}}>
-                    <Typography color='secondary'>Version: <b>3.4.2</b></Typography>
+                    <Typography color='secondary'>Version: <b>3.4.3</b></Typography>
                     <Link target='_blank' href='https://www.databucket.pl' color="primary">www.databucket.pl</Link><br/>
                     <Link target='_blank' href='https://github.com/databucket/databucket-server' color="textSecondary">Source code</Link><br/>
                     <Link target='_blank' href='https://github.com/databucket/databucket-server/wiki' color="textSecondary">Documentation</Link><br/>

frontend/src/components/public/LoginPage.jsx

@@ -273,7 +273,12 @@ export default function LoginPage() {
                 return getProjectsPaper();
             case 2:
                 const pathname = getPathname();
-                if (pathname != null && pathname !== "null") {
+                if (pathname != null
+                    && pathname !== "null"
+                    && !pathname.includes("confirmation")
+                    && !pathname.includes("forgot-password")
+                    && !pathname.includes("sign-up")
+                ) {
                     setPathname(null);
                     return redirectTo(pathname)
                 } else {
@@ -291,7 +296,7 @@ export default function LoginPage() {
         <div className="ContainerClass">
             {<img src={Logo} alt=''/>}
             {paper()}
-            <Typography variant="caption">3.4.2</Typography>
+            <Typography variant="caption">3.4.3</Typography>
             <MessageBox
                 config={messageBox}
                 onClose={() => setMessageBox({...messageBox, open: false})}

frontend/src/components/public/SignUpPage.jsx

@@ -10,7 +10,7 @@ import Link from "@material-ui/core/Link";
 import {Redirect} from "react-router-dom";
 import {validateEmail} from "../../utils/Misc";
 import {getBaseUrl, getContextPath} from "../../utils/UrlBuilder";
-import {handleLoginErrors} from "../../utils/FetchHelper";
+import {handleErrors, handleLoginErrors} from "../../utils/FetchHelper";
 
 export default function SignUpPage() {
 
@@ -83,6 +83,7 @@ export default function SignUpPage() {
     }
 
     const submitData = token => {
+        let errorResp = false;
         const payload = {
             username: username,
             email: email,
@@ -96,15 +97,20 @@ export default function SignUpPage() {
             body: JSON.stringify(payload),
             headers: {'Content-Type': 'application/json'}
         })
-            .then(handleLoginErrors)
-            .then(res => res.json())
-            .then(res => {
-                setLoading(false);
-                setMessageBox({open: true, severity: 'info', title: 'Send confirmation email', message: ""});
-            })
+            .then(handleErrors)
             .catch(error => {
+                errorResp = true;
                 setLoading(false);
                 setMessageBox({open: true, severity: 'error', title: 'Registration failed', message: error});
+            })
+            .then(() => {
+                if (!errorResp) {
+                    setLoading(false);
+                    setMessageBox({open: true, severity: 'info', title: 'Send confirmation email', message: ""});
+                    setTimeout(() => {
+                        setBack(true);
+                    }, 6000)
+                }
             });
     }
 

frontend/src/route/AppRouter.js

@@ -1,5 +1,5 @@
 import React from "react";
-import {BrowserRouter, Redirect, Switch} from 'react-router-dom';
+import {BrowserRouter, Redirect, Route, Switch} from 'react-router-dom';
 import LoginPage from '../components/public/LoginPage';
 import NotFoundPage from '../components/NotFoundPage';
 import PublicRoute from './PublicRoute'
@@ -27,9 +27,9 @@ export default function AppRouter() {
             <Switch>
                 <Redirect exact from='/' to={getProjectDataPath()}/>
                 <PublicRoute exact restricted={true} path="/login" component={LoginPage}/>
-                <PublicRoute exact restricted={true} path="/forgot-password" component={ForgotPasswordPage}/>
-                <PublicRoute exact restricted={true} path="/sign-up" component={SignUpPage}/>
-                <PublicRoute exact restricted={true} path="/confirmation/*" component={ConfirmationPage}/>
+                <Route exact restricted={true} path="/forgot-password" component={ForgotPasswordPage}/>
+                <Route exact restricted={true} path="/sign-up" component={SignUpPage}/>
+                <Route path="/confirmation/*" component={ConfirmationPage}/>
                 <ChangePasswordRoute exact path="/change-password" component={ChangePasswordPage}/>
                 <ManagementRoute path="/management" component={_ManagementTabs}/>
                 <ProjectRoute path="/project" component={_ProjectRouteInternal}/>

src/main/java/pl/databucket/server/configuration/SwaggerConfiguration.java

@@ -48,7 +48,7 @@ public Docket confDataContext() {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("Databucket API")
-                .version("3.4.2")
+                .version("3.4.3")
                 .build();
     }
 }

src/main/java/pl/databucket/server/controller/PublicController.java

@@ -225,7 +225,7 @@ public ResponseEntity<?> signUp(@RequestBody SignUpDtoRequest signUpDtoRequest)
                 return exceptionFormatter.customPublicException("Given email already exists", HttpStatus.CONFLICT);
 
             manageUserService.signUpUser(signUpDtoRequest);
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+            return exceptionFormatter.responseMessage("An account has been created for a new user", HttpStatus.CREATED);
         } catch (MessagingException | MailSendException e) {
             return exceptionFormatter.customException("Mail service exception!", HttpStatus.SERVICE_UNAVAILABLE);
         } catch (Exception e) {

src/main/java/pl/databucket/server/exception/ExceptionFormatter.java

@@ -53,4 +53,10 @@ public ResponseEntity<Map<String, Object>> customPublicException(String message,
         return new ResponseEntity<>(response, status);
     }
 
+    public ResponseEntity<Map<String, Object>> responseMessage(String message, HttpStatus status) {
+        Map<String, Object> response = new HashMap<>();
+        response.put("message", message);
+        return new ResponseEntity<>(response, status);
+    }
+
 }

src/main/java/pl/databucket/server/security/WebSecurityConfig.java

@@ -58,6 +58,9 @@ protected void configure(HttpSecurity http) throws Exception {
                         "/actuator/**",
                         "/**/favicon.ico",
                         "/login",
+                        "/confirmation/**",
+                        "/forgot-password",
+                        "/sign-up",
                         "/change-password",
                         "/project",
                         "/project/**",