Merge branch 'master' into bugfix_database_downgrade_and_upgrade_again

backend/src/graphql/resolver/UserResolver.ts

@@ -554,7 +554,7 @@ export class UserResolver {
     await queryRunner.startTransaction('READ UNCOMMITTED')
 
     try {
-      if (coinanimation) {
+      if (coinanimation !== null && coinanimation !== undefined) {
         queryRunner.manager
           .getCustomRepository(UserSettingRepository)
           .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString())

frontend/src/locales/de.json

@@ -46,6 +46,7 @@
     "change-password": "Fehler beim Ändern des Passworts",
     "error": "Fehler",
     "no-account": "Leider konnten wir keinen Account finden mit diesen Daten!",
+    "no-email-verify": "Die Email wurde noch nicht bestätigt, bitte überprüfe deine Emails und klicke auf den Aktivierungslink!",
     "session-expired": "Sitzung abgelaufen!"
   },
   "form": {
@@ -180,9 +181,12 @@
       "uppercase": "Ein Großbuchstabe erforderlich."
     },
     "thx": {
+      "activateEmail": "Deine Email wurde noch nicht aktiviert, bitte überprüfe deine Email und Klicke den Aktivierungslink!",
       "checkEmail": "Deine Email würde erfolgreich verifiziert.",
       "email": "Wir haben dir eine eMail gesendet.",
-      "register": "Du bist jetzt registriert.",
+      "emailActivated": "Danke dass Du deine Email bestätigt hast.",
+      "errorTitle": "Achtung!",
+      "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.",
       "reset": "Dein Passwort wurde geändert.",
       "title": "Danke!"
     }

frontend/src/locales/en.json

@@ -46,6 +46,7 @@
     "change-password": "Error while changing password",
     "error": "Error",
     "no-account": "Unfortunately we could not find an account to the given data!",
+    "no-email-verify": "Your email is not activated yet, please check your emails and click the activation link!",
     "session-expired": "The session expired"
   },
   "form": {
@@ -180,9 +181,12 @@
       "uppercase": "One uppercase letter required."
     },
     "thx": {
+      "activateEmail": "Your email has not been activated yet, please check your emails and click the activation link!",
       "checkEmail": "Your email has been successfully verified.",
       "email": "We have sent you an email.",
-      "register": "You are registred now.",
+      "emailActivated": "Thank you your email has been activated.",
+      "errorTitle": "Attention!",
+      "register": "You are registered now, please check your emails and click the activation link.",
       "reset": "Your password has been changed.",
       "title": "Thank you!"
     }

frontend/src/routes/routes.js

@@ -47,7 +47,7 @@ const routes = [
     path: '/thx/:comingFrom',
     component: () => import('../views/Pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['password', 'reset', 'register']
+      const validFrom = ['password', 'reset', 'register', 'login']
       if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {

frontend/src/views/Pages/Login.vue

@@ -104,9 +104,14 @@ export default {
           this.$router.push('/overview')
           loader.hide()
         })
-        .catch(() => {
+        .catch((error) => {
+          if (!error.message.includes('user email not validated')) {
+            this.$toasted.error(this.$t('error.no-account'))
+          } else {
+            // : this.$t('error.no-email-verify')
+            this.$router.push('/thx/login')
+          }
           loader.hide()
-          this.$toasted.error(this.$t('error.no-account'))
         })
     },
   },

frontend/src/views/Pages/Register.vue

@@ -161,6 +161,7 @@ import InputEmail from '../../components/Inputs/InputEmail.vue'
 import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue'
 import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue'
 import { registerUser } from '../../graphql/mutations'
+import { localeChanged } from 'vee-validate'
 import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
 
 export default {
@@ -189,6 +190,9 @@ export default {
   methods: {
     updateLanguage(e) {
       this.language = e
+      this.$store.commit('language', this.language)
+      this.$i18n.locale = this.language
+      localeChanged(this.language)
     },
     getValidationState({ dirty, validated, valid = null }) {
       return dirty || validated ? valid : null

frontend/src/views/Pages/thx.vue

@@ -4,10 +4,12 @@
     <div class="header py-7 py-lg-8 pt-lg-9">
       <b-container>
         <div class="header-body text-center mb-7">
-          <p class="h1">{{ $t('site.thx.title') }}</p>
+          <p class="h1">{{ $t(displaySetup.headline) }}</p>
           <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
           <hr />
-          <b-button :to="displaySetup.linkTo">{{ $t(displaySetup.button) }}</b-button>
+          <b-button v-if="displaySetup.linkTo" :to="displaySetup.linkTo">
+            {{ $t(displaySetup.button) }}
+          </b-button>
         </div>
       </b-container>
     </div>
@@ -17,25 +19,33 @@
 <script>
 const textFields = {
   password: {
+    headline: 'site.thx.title',
     subtitle: 'site.thx.email',
     button: 'login',
     linkTo: '/login',
   },
   reset: {
+    headline: 'site.thx.title',
     subtitle: 'site.thx.reset',
     button: 'login',
     linkTo: '/login',
   },
   register: {
+    headline: 'site.thx.title',
     subtitle: 'site.thx.register',
     button: 'site.login.signin',
     linkTo: '/overview',
   },
   checkEmail: {
+    headline: 'site.thx.title',
     subtitle: 'site.thx.checkEmail',
     button: 'login',
     linkTo: '/login',
   },
+  login: {
+    headline: 'site.thx.errorTitle',
+    subtitle: 'site.thx.activateEmail',
+  },
 }
 
 export default {

login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp

@@ -147,7 +147,6 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
 		infos.add("set user.group_id to default group_id = 1");
 	case USER_NO_PRIVATE_KEY:
 	case USER_COMPLETE:
-	case USER_EMAIL_NOT_ACTIVATED:
 		result->set("state", "success");
 		result->set("user", session->getNewUser()->getJson());
 		result->set("session_id", session->getHandle());
@@ -158,6 +157,10 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
 		AWAIT(hasElopageTask)
 		result->set("hasElopage", hasElopageTask->hasElopage());
 		return result;
+	case USER_EMAIL_NOT_ACTIVATED:
+		result->set("state", "processing");
+		result->set("msg", "user email not validated");
+		break;
 	default: 
 		result->set("state", "error");
 		result->set("msg", "unknown user state");