Merge pull request #88 from databucket/3.4.4

v.3.4.4

Author: kslysz

build.gradle

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

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "homepage": ".",
   "name": "databucket",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "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.3</b></Typography>
+                    <Typography color='secondary'>Version: <b>3.4.4</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

@@ -296,7 +296,7 @@ export default function LoginPage() {
         <div className="ContainerClass">
             {<img src={Logo} alt=''/>}
             {paper()}
-            <Typography variant="caption">3.4.3</Typography>
+            <Typography variant="caption">3.4.4</Typography>
             <MessageBox
                 config={messageBox}
                 onClose={() => setMessageBox({...messageBox, open: false})}

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.3")
+                .version("3.4.4")
                 .build();
     }
 }

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

@@ -23,7 +23,6 @@
 import pl.databucket.server.repository.UserRepository;
 import pl.databucket.server.security.TokenProvider;
 import pl.databucket.server.service.ManageUserService;
-import pl.databucket.server.service.data.DataService;
 
 import javax.mail.MessagingException;
 import java.util.*;

src/main/java/pl/databucket/server/service/ManageUserService.java

@@ -134,7 +134,7 @@ public User modifyUser(ManageUserDtoRequest manageUserDtoRequest) {
         User user = userRepository.findByUsername(manageUserDtoRequest.getUsername());
 
         // clear last send email dates when changed email address
-        if (!user.getEmail().equals(manageUserDtoRequest.getEmail())) {
+        if (user.getEmail() != null && !user.getEmail().equals(manageUserDtoRequest.getEmail())) {
             user.setLastSendEmailForgotPasswordLinkDate(null);
             user.setLastSendEmailTempPasswordDate(null);
         }

src/main/resources/application.yaml

@@ -15,6 +15,11 @@ spring:
   jackson:
     date-format: yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 
+recaptcha:
+  enabled: false
+  siteKey: yourSiteKey
+  secretKey: yourSecretKey
+
 logging:
   level:
     root: info

src/main/resources/banner.txt

@@ -7,5 +7,5 @@
     ██████╔╝██║  ██║   ██║   ██║  ██║██████╔╝╚██████╔╝╚██████╗██║  ██╗███████╗   ██║       ██████╔╝
     ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚═╝  ╚═╝╚═════╝  ╚═════╝  ╚═════╝╚═╝  ╚═╝╚══════╝   ╚═╝       ╚═════╝
 
-Databucket version: (v3.4.3)
+Databucket version: (v3.4.4)
 Spring Boot version:${spring-boot.formatted-version}