From 1023e8932a29ab5028854a0424dd6aa1aac3d786 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 20 Apr 2021 20:38:40 +0200 Subject: [PATCH 01/67] check API to reset password --- configs/login_server/grd_login.properties | 2 +- frontend/src/apis/loginAPI.js | 18 +++- frontend/src/routes/routes.js | 2 +- frontend/src/views/Pages/ResetPassword.vue | 117 +++++++++++---------- 4 files changed, 83 insertions(+), 56 deletions(-) diff --git a/configs/login_server/grd_login.properties b/configs/login_server/grd_login.properties index 47dc81229..f14568a16 100644 --- a/configs/login_server/grd_login.properties +++ b/configs/login_server/grd_login.properties @@ -22,7 +22,7 @@ loginServer.db.user = root loginServer.db.password = loginServer.db.port = 3306 -frontend.checkEmailPath = http://localhost/account/checkEmail +frontend.checkEmailPath = http://localhost/reset email.disable = true diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js index 91020ddbb..a095b0b87 100644 --- a/frontend/src/apis/loginAPI.js +++ b/frontend/src/apis/loginAPI.js @@ -64,7 +64,6 @@ const loginAPI = { return apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload) }, sendEmail: async (email, email_text = 7, email_verification_code_type = 'resetPassword') => { - //console.log('api email', email) const payload = { email, email_text, @@ -72,6 +71,23 @@ const loginAPI = { } return apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', payload) }, + loginViaEmailVerificationCode: async (optin) => { + return apiGet( + CONFIG.LOGIN_API_URL + + 'loginViaEmailVerificationCode?emailVerificationCode=' + + optin + ) + }, + changePassword: async (session_id, email, password) => { + const payload = { + session_id, + email, + 'update': { + 'User.password': password, + }, + } + return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) + } } export default loginAPI diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index adae0be07..bfaff9de6 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -59,7 +59,7 @@ const routes = [ component: () => import('../views/Pages/ForgotPassword.vue'), }, { - path: '/reset', + path: '/reset/:optin', component: () => import('../views/Pages/ResetPassword.vue'), }, { path: '*', component: NotFound }, diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index 145fba404..3646e89da 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -1,5 +1,5 @@ From 4862faf3395ff660a5076cd9b8491dd433525d58 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 20 Apr 2021 20:43:09 +0200 Subject: [PATCH 02/67] linting --- frontend/src/apis/loginAPI.js | 10 +- frontend/src/views/Pages/ResetPassword.vue | 125 ++++++++++----------- 2 files changed, 66 insertions(+), 69 deletions(-) diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js index a095b0b87..a31a4062e 100644 --- a/frontend/src/apis/loginAPI.js +++ b/frontend/src/apis/loginAPI.js @@ -73,21 +73,19 @@ const loginAPI = { }, loginViaEmailVerificationCode: async (optin) => { return apiGet( - CONFIG.LOGIN_API_URL - + 'loginViaEmailVerificationCode?emailVerificationCode=' - + optin + CONFIG.LOGIN_API_URL + 'loginViaEmailVerificationCode?emailVerificationCode=' + optin, ) }, changePassword: async (session_id, email, password) => { const payload = { session_id, email, - 'update': { + update: { 'User.password': password, }, } - return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) - } + return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) + }, } export default loginAPI diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index 3646e89da..395f6e2a1 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -91,68 +91,67 @@ From daca2314ba7da5490df81d64db68d82c9141ca60 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 22 Apr 2021 12:58:09 +0200 Subject: [PATCH 03/67] remove reset button --- frontend/src/views/Pages/Login.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index a9c5f0f09..8d6925542 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -53,7 +53,7 @@ - +
- - reset - @@ -114,6 +111,7 @@ export default { methods: { async onSubmit() { const result = await loginAPI.login(this.model.email, this.model.password) + console.log(result.data) if (result.success) { this.$store.dispatch('login', { session_id: result.result.data.session_id, From 33f9c58268a1b9c8cab7350fc9f253679b539bff Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 16:52:14 +0200 Subject: [PATCH 04/67] fix } which don't belong there --- community_server/src/Controller/AppRequestsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 37dd04d92..80cc6c202 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -317,7 +317,6 @@ class AppRequestsController extends AppController $gdtSum = intval($gdtEntries['data']['sum']); } else { $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id'] ? $user['id'] : 0); - } } From 0c68dbde9da5fd17fc060b113d7fe3b87fd6e379 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 16:56:05 +0200 Subject: [PATCH 05/67] fixing wrong var name --- frontend/src/apis/communityAPI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index 4af1ea901..d675a65bf 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -36,7 +36,7 @@ const communityAPI = { return apiGet(CONFIG.COMMUNITY_API_URL + 'getBalance/' + session_id) }, transactions: async (session_id) => { - return apiGet(CONFIG.COMMUNITY_API__URL + 'listTransactions/1/25/ASC/' + session_id) + return apiGet(CONFIG.COMMUNITY_API_URL + 'listTransactions/1/25/ASC/' + session_id) }, /*create: async (session_id, email, amount, memo, target_date = new Date() ) => { const payload = { @@ -57,7 +57,7 @@ const communityAPI = { memo, auto_sign: true, } - return apiPost(CONFIG.COMMUNITY_API__URL + 'sendCoins/', payload) + return apiPost(CONFIG.COMMUNITY_API_URL + 'sendCoins/', payload) }, } From 8e1d1aa0aef1a24f886e382ccfd7f5b490ece3cb Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 17:00:20 +0200 Subject: [PATCH 06/67] fix handlung of empty transactions list --- .../src/Controller/AppRequestsController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 80cc6c202..9419cf28e 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -329,11 +329,13 @@ class AppRequestsController extends AppController ->page($page) ; $decay = true; - $transactions = $transactionsTable->listTransactionsHumanReadable($stateUserTransactionsQuery->toArray(), $user, $decay); + $transactions = []; + if($stateUserTransactionsQuery->count() > 0) { + $transactions = $transactionsTable->listTransactionsHumanReadable($stateUserTransactionsQuery->toArray(), $user, $decay); - - if($orderDirection == 'DESC') { - $transactions = array_reverse($transactions); + if($orderDirection == 'DESC') { + $transactions = array_reverse($transactions); + } } return $this->returnJson([ 'state' => 'success', From 5de88f3a42dda18d734e9dd5de499634155725d0 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 22 Apr 2021 19:04:32 +0200 Subject: [PATCH 07/67] Revert "update login-server build, allow create user without group" This reverts commit db15f9c4381fa2ac9c1cc88b9ecaf74cac394240. --- docker-compose.override.yml | 23 ++----------- docker-compose.yml | 3 +- docu/login_server.api.md | 2 -- login_server/Dockerfile.debug | 34 ++++++++++++------- login_server/Dockerfiles/build_and_run.sh | 18 ++-------- .../src/cpp/JSONInterface/JsonCreateUser.cpp | 25 ++++---------- 6 files changed, 35 insertions(+), 70 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b3c399d3a..7dad57d93 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -32,30 +32,14 @@ services: - SYS_PTRACE volumes: - ./logs:/var/log/grd_login - - ./login_server/src:/code/src - - ./configs/login_server:/etc/grd_login - - login_build:/code/build - conan:/root/.conan - ######################################################### ## COMMUNITY SERVER (cakephp with php-fpm) ############## ######################################################### - community-server: - build: - context: . - dockerfile: ./community_server/Dockerfile - environment: - - DB_PASSWORD='' - - DB_USER='root' - - DB_DATABASE='gradido_community' - depends_on: - - mariadb - networks: - - internal-net - volumes: - - ./community_server/config/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini - - ./community_server/src:/var/www/cakephp/src + #community-server: + # volumes: + # - ./community_server ######################################################### @@ -100,6 +84,5 @@ services: volumes: frontend_node_modules: - login_build: conan: diff --git a/docker-compose.yml b/docker-compose.yml index 8b5bf33de..3ac176d9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,6 +65,7 @@ services: - 1201:1201 volumes: - ./configs/login_server:/etc/grd_login + - login_build:/code/build_vol ######################################################### ## NGINX ################################################ @@ -130,4 +131,4 @@ networks: volumes: db_vol: - + login_build: diff --git a/docu/login_server.api.md b/docu/login_server.api.md index 27d83c06a..025e04094 100644 --- a/docu/login_server.api.md +++ b/docu/login_server.api.md @@ -96,7 +96,6 @@ with: "first_name":"Max", "last_name":"Musterman" , "emailType": 2, - "group_id": 1, "password":"123abcDE&", "login_after_register":true } @@ -105,7 +104,6 @@ with: - `emailType`: control email-text sended with email verification code - 2: default, if user has registered directly - 5: if user was registered by an admin -- `group_id`: group id of group to which user will join (id from login_server) - `login_after_register`: if set to true auto-login after create user was successfull, means session cookie is set and session_id returned ### Response diff --git a/login_server/Dockerfile.debug b/login_server/Dockerfile.debug index bb65996fb..f1b235e4e 100644 --- a/login_server/Dockerfile.debug +++ b/login_server/Dockerfile.debug @@ -1,32 +1,42 @@ ######################################################################################################### -# debug build preparation +# Build debug ######################################################################################################### -From conanio/gcc9 as build_debug_preparation -USER root +From gradido/login_dependencies:stage2 as debug ENV DOCKER_WORKDIR="/code" - -RUN mkdir -p ${DOCKER_WORKDIR} + +USER root + WORKDIR ${DOCKER_WORKDIR} +COPY . . -COPY . . +RUN chmod +x unix_parse_proto.sh +RUN chmod +x compile_pot.sh + +RUN ./compile_pot.sh +RUN ./unix_parse_proto.sh -RUN cd dependencies/mariadb-connector-c && \ - mkdir build && \ - cd build && \ - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF .. ######################################################################################################### # run debug ######################################################################################################### -FROM build_debug_preparation as login_server_debug +FROM debug as login_server_debug ENV DOCKER_WORKDIR="/code" +#RUN apt-get update && \ +# apt-get install -y --no-install-recommends gdb && \ +# apt-get autoclean && \ +# apt-get autoremove && \ +# apt-get clean && \ +# rm -rf /var/lib/apt/lists/* + +VOLUME /var/log/grd_login +VOLUME /code/src EXPOSE 1200 EXPOSE 1201 WORKDIR ${DOCKER_WORKDIR} RUN chmod +x ./Dockerfiles/build_and_run.sh -CMD ./Dockerfiles/build_and_run.sh; ./build/bin/Gradido_LoginServer +CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer diff --git a/login_server/Dockerfiles/build_and_run.sh b/login_server/Dockerfiles/build_and_run.sh index e18dcd17d..59408daca 100644 --- a/login_server/Dockerfiles/build_and_run.sh +++ b/login_server/Dockerfiles/build_and_run.sh @@ -1,21 +1,7 @@ #!/bin/bash +cp build/conan* build_vol/ +cd build_vol -cd build -conan install .. --build=missing -s build_type=Debug -cmake -DCMAKE_BUILD_TYPE=Debug .. -make -j${CPU_COUNT} protoc grpc_cpp_plugin -cd .. - -if [ ! -d "./src/cpp/proto/hedera" ] ; then -#if [ ! -f "./src/cpp/proto/gradido/TransactionBody.pb.h"] ; then - chmod +x unix_parse_proto.sh - ./unix_parse_proto.sh -fi -chmod +x compile_pot.sh - -./compile_pot.sh - -cd build cmake -DCMAKE_BUILD_TYPE=Debug .. make -j$(nproc) Gradido_LoginServer #echo "building done" diff --git a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp index c66d10c8d..f0a6ee7e9 100644 --- a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp +++ b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp @@ -17,12 +17,11 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) std::string password; bool login_after_register = false; int emailType; - int group_id = 1; - bool group_was_not_set = false; + int group_id; auto em = EmailManager::getInstance(); auto sm = SessionManager::getInstance(); - printf("enter\n"); + // if is json object if (params.type() == typeid(Poco::JSON::Object::Ptr)) { Poco::JSON::Object::Ptr paramJsonObject = params.extract(); @@ -36,11 +35,7 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) paramJsonObject->get("first_name").convert(first_name); paramJsonObject->get("last_name").convert(last_name); paramJsonObject->get("emailType").convert(emailType); - auto group_id_obj = paramJsonObject->get("group_id"); - - if(!group_id_obj.isEmpty()) { - group_id_obj.convert(group_id); - } + paramJsonObject->get("group_id").convert(group_id); if ((ServerConfig::g_AllowUnsecureFlags & ServerConfig::UNSECURE_PASSWORD_REQUESTS)) { paramJsonObject->get("password").convert(password); @@ -80,10 +75,6 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) } // create user - if(!group_id) { - group_id = 1; - group_was_not_set = true; - } user = controller::User::create(email, first_name, last_name, group_id); auto userModel = user->getModel(); Session* session = nullptr; @@ -102,7 +93,7 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) UniLib::controller::TaskPtr create_authenticated_encrypten_key = new AuthenticatedEncryptionCreateKeyTask(user, password); create_authenticated_encrypten_key->scheduleTask(create_authenticated_encrypten_key); } - + auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); auto emailOptInModel = emailOptIn->getModel(); if (!emailOptInModel->insertIntoDB(false)) { @@ -114,14 +105,10 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) if (login_after_register && session) { Poco::JSON::Object* result = stateSuccess(); - if(group_was_not_set) { - Poco::JSON::Array infos; - infos.add("group_id was not set, use 1 as default!"); - result->set("info", infos); - } + result->set("session_id", session->getHandle()); return result; } return stateSuccess(); -} +} \ No newline at end of file From c463a15db2a38f0b841e01fd14a29f56f2eea5f0 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 19:09:04 +0200 Subject: [PATCH 08/67] use again prebuild dependencies, but with code mounted from filesystem --- docker-compose.override.yml | 4 +-- login_server/Dockerfile.debug | 34 +++++++++++++++-------- login_server/Dockerfiles/build_and_run.sh | 13 +++++++++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b3c399d3a..44299b54c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -34,7 +34,7 @@ services: - ./logs:/var/log/grd_login - ./login_server/src:/code/src - ./configs/login_server:/etc/grd_login - - login_build:/code/build + - login_build_conan:/code/build_vol - conan:/root/.conan @@ -100,6 +100,6 @@ services: volumes: frontend_node_modules: - login_build: + login_build_conan: conan: diff --git a/login_server/Dockerfile.debug b/login_server/Dockerfile.debug index bb65996fb..f1b235e4e 100644 --- a/login_server/Dockerfile.debug +++ b/login_server/Dockerfile.debug @@ -1,32 +1,42 @@ ######################################################################################################### -# debug build preparation +# Build debug ######################################################################################################### -From conanio/gcc9 as build_debug_preparation -USER root +From gradido/login_dependencies:stage2 as debug ENV DOCKER_WORKDIR="/code" - -RUN mkdir -p ${DOCKER_WORKDIR} + +USER root + WORKDIR ${DOCKER_WORKDIR} +COPY . . -COPY . . +RUN chmod +x unix_parse_proto.sh +RUN chmod +x compile_pot.sh + +RUN ./compile_pot.sh +RUN ./unix_parse_proto.sh -RUN cd dependencies/mariadb-connector-c && \ - mkdir build && \ - cd build && \ - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF .. ######################################################################################################### # run debug ######################################################################################################### -FROM build_debug_preparation as login_server_debug +FROM debug as login_server_debug ENV DOCKER_WORKDIR="/code" +#RUN apt-get update && \ +# apt-get install -y --no-install-recommends gdb && \ +# apt-get autoclean && \ +# apt-get autoremove && \ +# apt-get clean && \ +# rm -rf /var/lib/apt/lists/* + +VOLUME /var/log/grd_login +VOLUME /code/src EXPOSE 1200 EXPOSE 1201 WORKDIR ${DOCKER_WORKDIR} RUN chmod +x ./Dockerfiles/build_and_run.sh -CMD ./Dockerfiles/build_and_run.sh; ./build/bin/Gradido_LoginServer +CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer diff --git a/login_server/Dockerfiles/build_and_run.sh b/login_server/Dockerfiles/build_and_run.sh index e18dcd17d..d5ea45235 100644 --- a/login_server/Dockerfiles/build_and_run.sh +++ b/login_server/Dockerfiles/build_and_run.sh @@ -1,5 +1,17 @@ #!/bin/bash +cp build/conan* build_vol/ +cd build_vol + +cmake -DCMAKE_BUILD_TYPE=Debug .. +cmake .. +make -j$(nproc) Gradido_LoginServer +#echo "building done" +chmod +x ./bin/Gradido_LoginServer +#./bin/Gradido_LoginServer + + +: ' cd build conan install .. --build=missing -s build_type=Debug cmake -DCMAKE_BUILD_TYPE=Debug .. @@ -21,3 +33,4 @@ make -j$(nproc) Gradido_LoginServer #echo "building done" chmod +x ./bin/Gradido_LoginServer #./bin/Gradido_LoginServer +' From c458e226fb12ca3e12603edf77bc33d565e63ac2 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 19:10:06 +0200 Subject: [PATCH 09/67] remove conan volume because no used here --- docker-compose.override.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 44299b54c..5a505478b 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -35,7 +35,6 @@ services: - ./login_server/src:/code/src - ./configs/login_server:/etc/grd_login - login_build_conan:/code/build_vol - - conan:/root/.conan ######################################################### @@ -101,5 +100,4 @@ services: volumes: frontend_node_modules: login_build_conan: - conan: From c704ca1a95b0bd00aa1b02fbb073709db957819b Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 20:06:04 +0200 Subject: [PATCH 10/67] fix some missed out things --- login_server/Dockerfiles/build_and_run.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/login_server/Dockerfiles/build_and_run.sh b/login_server/Dockerfiles/build_and_run.sh index d5ea45235..b246d8230 100644 --- a/login_server/Dockerfiles/build_and_run.sh +++ b/login_server/Dockerfiles/build_and_run.sh @@ -1,9 +1,19 @@ #!/bin/bash cp build/conan* build_vol/ -cd build_vol +cd build_vol cmake -DCMAKE_BUILD_TYPE=Debug .. + +cd .. +if [ ! -d "./src/cpp/proto/hedera" ] ; then + chmod +x unix_parse_proto.sh + ./unix_parse_proto.sh +fi +chmod +x compile_pot.sh +./compile_pot.sh + +cd build_vol cmake .. make -j$(nproc) Gradido_LoginServer #echo "building done" From e3e968b24f470a88997d52141629df13ff264faf Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Fri, 23 Apr 2021 14:09:43 +0200 Subject: [PATCH 11/67] fix exception for unlock on false place, maybe from merging stage1 with stage2 --- login_server/src/cpp/model/Session.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/login_server/src/cpp/model/Session.cpp b/login_server/src/cpp/model/Session.cpp index f7ccc121b..3fbe05a98 100644 --- a/login_server/src/cpp/model/Session.cpp +++ b/login_server/src/cpp/model/Session.cpp @@ -738,7 +738,6 @@ UserState Session::loadUser(const std::string& email, const std::string& passwor } detectSessionState(); - unlock(); if (0 == mNewUser->getModel()->getGroupId()) { return USER_NO_GROUP; } From 7f7b363c9ce25567438440f419b297b3ffa1d7f9 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Fri, 23 Apr 2021 17:21:23 +0200 Subject: [PATCH 12/67] fix empty reply by empty group_id --- .../src/cpp/JSONInterface/JsonUnsecureLogin.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp index 07aa9e1d3..5eba547d0 100644 --- a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp +++ b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp @@ -79,6 +79,8 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) USER_DISABLED */ auto user_state = session->loadUser(email, password); + auto user_model = session->getNewUser()->getModel(); + Poco::JSON::Array infos; switch (user_state) { case USER_EMPTY: @@ -98,6 +100,10 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) result->set("state", "disabled"); result->set("msg", "user is disabled"); break; + case USER_NO_GROUP: + user_model->setGroupId(1); + user_model->updateIntoDB("group_id", 1); + infos.add("set user.group_id to default group_id = 1"); case USER_NO_PRIVATE_KEY: case USER_COMPLETE: case USER_EMAIL_NOT_ACTIVATED: @@ -105,7 +111,14 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) result->set("user", session->getNewUser()->getJson()); result->set("session_id", session->getHandle()); session->setClientIp(mClientIP); + if(infos.size() > 0) { + result->set("info", infos); + } return result; + default: + result->set("state", "error"); + result->set("msg", "unknown user state"); + result->set("details", USER_NO_GROUP); } sm->releaseSession(session); From 19243b9a27b5c73d01ed5d9fa41f890fcc0368c0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 26 Apr 2021 12:56:01 +0200 Subject: [PATCH 13/67] new clone und docker-compose up build --- login_server/src/LOCALE/messages.pot | 431 +++++++++++++++++++++++++++ 1 file changed, 431 insertions(+) create mode 100644 login_server/src/LOCALE/messages.pot diff --git a/login_server/src/LOCALE/messages.pot b/login_server/src/LOCALE/messages.pot new file mode 100644 index 000000000..ea3230593 --- /dev/null +++ b/login_server/src/LOCALE/messages.pot @@ -0,0 +1,431 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-04-26 09:35+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:181 +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:260 +msgid "Login" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:181 +msgid "E-Mail or password isn't right, please try again!" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:190 +msgid "Passwort" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:190 +msgid "" +"Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut." +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:193 +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:196 +msgid "User" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:193 +msgid "Error in saved data, the server admin will look at it." +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:196 +msgid "Benutzer ist deaktiviert, kein Login möglich!" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:260 +msgid "Username and password are needed!" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:290 +#: model/Session.cpp:164 model/Session.cpp:171 model/Session.cpp:219 +#: model/Session.cpp:229 +msgid "E-Mail" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:291 +msgid "Password" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:292 +msgid " Login " +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:297 +msgid "You haven't any account yet? Please follow the link to create one." +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:299 +msgid "Create New Account" +msgstr "" + +#: F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\login.cpsp:303 +msgid "Passwort vergessen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:73 +msgid "E-Mail verifizieren" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:78 +msgid "" +"Deine E-Mail wurde erfolgreich bestätigt. Du kannst nun Gradidos versenden." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:79 +msgid "Zur Startseite" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:81 +msgid "Bitte gib deinen E-Mail Verification Code ein:" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:82 +#: model/Session.cpp:187 +msgid "Email Verification Code" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:83 +msgid "Überprüfe Code" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:86 +msgid "Du hast bisher keinen Code erhalten?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:87 +msgid "E-Mail erneut zuschicken (in Arbeit)" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:90 +msgid "Funktioniert dein E-Mail Verification Code nicht?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:91 +msgid "Schicke uns eine E-Mail und wir kümmern uns darum: " +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp:92 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:151 +msgid "E-Mail an Support schicken" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:113 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:124 +msgid "Gib bitte hier deine E-Mail Adresse an:" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:116 +msgid "Bestätigen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:126 +msgid "Hast du dir deine Passphrase notiert oder gemerkt?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:131 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:206 +msgid "Ja" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:136 +msgid "Nein" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:140 +msgid "Absenden" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:145 +msgid "Dir wird eine E-Mail zugeschickt um dein Passwort zurückzusetzen." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:147 +msgid "Der Admin hat eine E-Mail bekommen und wird sich bei dir melden." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:149 +msgid "" +"Du hast bereits eine E-Mail bekommen. Bitte schau auch in dein Spam-" +"Verzeichnis nach. " +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp:150 +msgid "" +"Du hast wirklich keine E-Mail erhalten und auch schon ein paar Minuten " +"gewartet?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:26 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:96 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:117 +#: model/Session.cpp:463 model/Session.cpp:475 model/Session.cpp:489 +msgid "Passphrase" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:27 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:266 +msgid "Neues Konto anlegen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:28 +msgid "2/3" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:96 +msgid "" +"Diese Passphrase ist ungültig, bitte überprüfen oder neu " +"generieren (lassen)." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:117 +msgid "intern error please try again later" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:132 +msgid "3/3" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:135 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:138 +msgid "1/3" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:137 +msgid "Neues Passwort anlegen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:148 +msgid "Passphrase abschreiben" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:159 +msgid "Was ist eine Passphrase?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:160 +msgid "Deine Passphrase besteht aus den im grünen Feld angezeigten Wörtern." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:161 +msgid "Sie dient deiner Sicherheit." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:162 +msgid "" +"Du brauchst deine Passphrase um dein Konto wiederherzustellen, wenn du mal " +"dein Passwort vergessen haben solltest." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:164 +msgid "Deine Passphrase (Groß/Kleinschreibung beachten)" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:169 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:197 +msgid "Was zu tun ist:" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:170 +msgid "" +"Schreibe dir die obenstehende Passphrase von Hand auf ein Blatt " +"Papier!" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:171 +msgid "Speichere sie auf keinen Fall auf deinem Rechner oder Mobilgerät!!" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:172 +msgid "Bewahre sie an einem sicheren Ort auf!" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:174 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:285 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:290 +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:303 +msgid "Weiter" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:198 +msgid "Hast du dir deine Passphrase gemerkt?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:199 +msgid "" +"Dann zeig es mir. Zur Unterstützung gebe ich dir deine Wörter aber in " +"anderer Reihenfolge." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:200 +msgid "Klicke sie an um sie einzusetzen." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:201 +msgid "Überprüfe dabei, ob du alle Wörter richtig geschrieben hast!" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:205 +msgid "" +"Weil du kein Javascript verwendest geht es direkt weiter. Hast du dir deine " +"Passphrase gemerkt oder aufgeschrieben?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:252 +msgid "Deine E-Mail Adresse wurde erfolgreich bestätigt." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:256 +msgid "Neue Gradido Adresse anlegen / wiederherstellen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:257 +msgid "" +"Möchtest du ein neues Gradido-Konto anlegen oder ein bestehendes " +"wiederherstellen?" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:273 +msgid "Bestehendes Konto wiederherstellen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:280 +msgid "" +"Falls du ein bestehendes Konto wiederherstellen willst, gib hier deine " +"Passphrase ein:" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:297 +msgid "Konto wiederherstellen / Neues Passwort anlegen" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:299 +msgid "" +"Um dein Konto wiederherzustellen und dir ein Neues Passwort auswählen zu " +"können, tippe hier bitte die Wörter deiner Passphrase in der richtigen " +"Reihenfolge ein, welche du dir aufgeschrieben hast." +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:313 +msgid "Fehler" +msgstr "" + +#: F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp:314 +msgid "" +"Ungültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende " +"dich an den Server-Admin." +msgstr "" + +#: model/Session.cpp:150 model/Session.cpp:180 model/Session.cpp:768 +#: model/Session.cpp:774 model/Session.cpp:1050 model/Session.cpp:1066 +msgid "Benutzer" +msgstr "" + +#: model/Session.cpp:150 +msgid "Eingeloggter Benutzer ist kein Admin" +msgstr "" + +#: model/Session.cpp:156 model/Session.cpp:211 +msgid "Vorname" +msgstr "" + +#: model/Session.cpp:156 model/Session.cpp:160 model/Session.cpp:211 +#: model/Session.cpp:215 +msgid "" +"Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen " +"<>&;" +msgstr "" + +#: model/Session.cpp:160 model/Session.cpp:215 +msgid "Nachname" +msgstr "" + +#: model/Session.cpp:164 model/Session.cpp:219 +msgid "Bitte gebe eine gültige E-Mail Adresse an." +msgstr "" + +#: model/Session.cpp:171 +msgid "Für diese E-Mail Adresse gibt es bereits einen Account" +msgstr "" + +#: model/Session.cpp:180 model/Session.cpp:187 +msgid "Fehler beim speichern!" +msgstr "" + +#: model/Session.cpp:229 +msgid "Für diese E-Mail Adresse gibt es bereits ein Konto" +msgstr "" + +#: model/Session.cpp:253 +msgid "Server" +msgstr "" + +#: model/Session.cpp:253 +msgid "Fehler beim speichen des Kontos bitte versuche es später noch einmal" +msgstr "" + +#: model/Session.cpp:348 model/Session.cpp:388 model/Session.cpp:955 +#: model/Session.cpp:964 +msgid "E-Mail Verification" +msgstr "" + +#: model/Session.cpp:348 +msgid "Du hast dein Konto bereits aktiviert!" +msgstr "" + +#: model/Session.cpp:388 +msgid "Falscher Code für aktiven Login" +msgstr "" + +#: model/Session.cpp:463 +msgid "Deine Passphrase ist ungütig" +msgstr "" + +#: model/Session.cpp:475 +msgid "Ein Fehler trat auf, bitte versuche es erneut" +msgstr "" + +#: model/Session.cpp:489 +msgid "Das ist nicht die richtige Passphrase." +msgstr "" + +#: model/Session.cpp:768 +msgid "Konnte Community Server nicht erreichen. E-Mail an den Admin ist raus." +msgstr "" + +#: model/Session.cpp:774 +msgid "" +"Fehler beim Löschen des Accounts. Bitte logge dich erneut ein und " +"versuche es nochmal." +msgstr "" + +#: model/Session.cpp:955 +msgid "Konnte kein passendes Konto finden." +msgstr "" + +#: model/Session.cpp:964 +msgid "Fehler beim laden des Benutzers." +msgstr "" + +#: model/Session.cpp:1050 +msgid "Kein gültiger Benutzer, bitte logge dich erneut ein." +msgstr "" + +#: model/Session.cpp:1066 +msgid "Fehler beim generieren der Passphrase, der Admin bekommt eine E-Mail. " +msgstr "" From 92ba58858d1bde88df3689527b65302631af8270 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 26 Apr 2021 14:23:18 +0200 Subject: [PATCH 14/67] fix bug #221 --- .../src/components/SidebarPlugin/SideBar.vue | 2 +- frontend/src/views/KontoOverview/GddSend.vue | 25 +++++++++++++------ frontend/src/views/KontoOverview/GddTable.vue | 11 +++----- frontend/src/views/Layout/DashboardNavbar.vue | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 42d1e5fb1..65f92489b 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -58,7 +58,7 @@
  • - + {{ $t('logout') }}
    • diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index d32fadea2..78335c2fe 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -2,18 +2,18 @@
    - + + + - + + + - - - {{ $t('form.cancel') }} - - +
    + + --> @@ -78,7 +78,7 @@
    {{ $t('form.amount') }} - + {{ $t('form.max_gdd_info') }} @@ -202,9 +202,8 @@ export default { BIcon, }, props: { - row_form: { type: Boolean, default: true }, - row_check: { type: Boolean, default: false }, - row_thx: { type: Boolean, default: false }, + balance: { type: Number, default: 0 }, + showTransactionList: { type: Boolean, default: true }, }, data() { return { @@ -224,6 +223,8 @@ export default { auto_sign: true, }, send: false, + row_check: false, + row_thx: false, } }, computed: {}, @@ -232,7 +233,6 @@ export default { this.scan = !this.scan }, async onDecode(decodedString) { - //console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString)) const arr = JSON.parse(decodedString) this.form.email = arr[0].email this.form.amount = arr[0].amount @@ -244,8 +244,9 @@ export default { this.ajaxCreateData.amount = this.form.amount this.ajaxCreateData.target_date = Date.now() this.ajaxCreateData.memo = this.form.memo - - this.$emit('change-rows', { row_form: false, row_check: true, row_thx: false }) + this.$emit('toggle-show-list', false) + this.row_check = true + this.row_thx = false }, async sendTransaction() { this.ajaxCreateData.amount = this.ajaxCreateData.amount * 10000 @@ -256,16 +257,16 @@ export default { this.ajaxCreateData.amount, this.ajaxCreateData.memo, ) - // console.log(result) - if (result.success) { - // console.log('send success') - - this.$emit('change-rows', { row_form: false, row_check: false, row_thx: true }) + this.$emit('toggle-show-list', false) + this.row_check = false + this.row_thx = true + this.$emit('update-transctions', { ammount: Number(this.ajaxCreateData.amount) }) } else { - // console.log('send error') alert('error') - this.$emit('change-rows', { row_form: true, row_check: false, row_thx: false }) + this.$emit('toggle-show-list', true) + this.row_check = false + this.row_thx = false } }, onReset(event) { @@ -273,10 +274,12 @@ export default { this.form.email = '' this.form.amount = '' this.show = false + this.$emit('toggle-show-list', true) + this.row_check = false + this.row_thx = false this.$nextTick(() => { this.show = true }) - this.$emit('change-rows', { row_form: true, row_check: false, row_thx: false }) }, }, } diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index dec2a16d2..cc3ec880a 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -1,6 +1,6 @@