-
diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
index 20d578e75..d91acfb79 100644
--- a/frontend/src/i18n.js
+++ b/frontend/src/i18n.js
@@ -32,18 +32,51 @@ function loadLocaleMessages() {
}
const numberFormats = {
- 'en-US': {
- currency: {
- style: 'currency',
- currency: 'GDD',
- abbreviate: true,
+ en: {
+ decimal: {
+ style: 'decimal',
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
},
},
- 'de-DE': {
- currency: {
- style: 'currency',
- currency: 'GDD',
- abbreviate: true,
+ de: {
+ decimal: {
+ style: 'decimal',
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2,
+ },
+ },
+}
+
+const dateTimeFormats = {
+ en: {
+ short: {
+ year: 'numeric',
+ month: 'numeric',
+ day: 'numeric',
+ },
+ long: {
+ year: 'numeric',
+ month: 'short',
+ day: 'numeric',
+ weekday: 'short',
+ hour: 'numeric',
+ minute: 'numeric',
+ },
+ },
+ de: {
+ short: {
+ day: 'numeric',
+ month: 'numeric',
+ year: 'numeric',
+ },
+ long: {
+ day: 'numeric',
+ month: 'short',
+ year: 'numeric',
+ weekday: 'short',
+ hour: 'numeric',
+ minute: 'numeric',
},
},
}
@@ -53,4 +86,5 @@ export default new VueI18n({
fallbackLocale: 'en',
messages: loadLocaleMessages(),
numberFormats,
+ dateTimeFormats,
})
diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue
index 1ccbcf8c2..4749a0a60 100644
--- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue
@@ -16,8 +16,7 @@
- \n";
- responseStream << "\t\t\t
1. Create three new accounts and show user public keys for comparisation:
\n"; - responseStream << "\t\t\t"; -#line 217 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - Profiler time2; - auto group_id = hedera_topic->getModel()->getGroupId(); - auto group_id2 = hedera_topic2->getModel()->getGroupId(); - auto user_group = controller::Group::load(group_id); - auto user_group2 = controller::Group::load(group_id2); - auto mnemonic_type = ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - - std::string password1 = "hsaj(2askaslASlllak3wjjeudsaj"; - auto user_1 = controller::User::create("testEmail@google.de", "Max", "Mustermann", group_id); - auto passphrase_1 = Passphrase::generate(&ServerConfig::g_Mnemonic_WordLists[mnemonic_type]); - auto gradido_key_pair_1 = KeyPairEd25519::create(passphrase_1); - user_1->setGradidoKeyPair(gradido_key_pair_1); - user_1->login(password1); - - std::string password2 = "uweia8saiSale,dsasA"; - auto user_2 = controller::User::create("testEmail2@google.de", "MJax", "Mustrermann", group_id); - auto passphrase_2 = Passphrase::generate(&ServerConfig::g_Mnemonic_WordLists[mnemonic_type]); - auto gradido_key_pair_2 = KeyPairEd25519::create(passphrase_2); - user_2->setGradidoKeyPair(gradido_key_pair_2); - user_2->login(password2); - - std::string password3 = "jaue_skaiellasealaK"; - auto user_3 = controller::User::create("testEmail3@gmail.com", "Morpheus", "Miaufull", group_id2); - auto passphrase_3 = Passphrase::generate(&ServerConfig::g_Mnemonic_WordLists[mnemonic_type]); - auto gradido_key_pair_3 = KeyPairEd25519::create(passphrase_3); - user_3->setGradidoKeyPair(gradido_key_pair_3); - user_3->login(password3); - responseStream << "\t\t\t\n"; - responseStream << "\t\t\t\n"; - responseStream << "\t\t\t\n"; - responseStream << "\t\t\tTime: "; -#line 253 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "\n"; - responseStream << "\t\t
\n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
2. Send a add-member transaction to hedera topic with one signature (first user)
\n"; - responseStream << "\t\t\t"; -#line 257 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - time2.reset(); - if(!steps[0]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 261 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto transaction1 = model::gradido::Transaction::createGroupMemberUpdate(user_1, user_group); - transaction1->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(1); - transaction1->sign(user_1); - auto transaction1_json = transaction1->getTransactionAsJson(true); - responseStream << "\n"; - responseStream << "\t\t\t"; -#line 267 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction1_json) ); - responseStream << "
\n"; - responseStream << "\t\t\t"; -#line 268 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\tTime: "; -#line 269 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "\n"; - responseStream << "\t\t
\n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
3. Send a add-member transaction to hedera topic with two signatures (first user and second user)
\n"; - responseStream << "\t\t\t"; -#line 273 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - time2.reset(); - if(!steps[1]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 277 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto transaction2 = model::gradido::Transaction::createGroupMemberUpdate(user_2, user_group); - transaction2->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(2); - transaction2->sign(user_2); - // wait before sending fourth transaction, gn seems to crash by more than 3 transaction at nearly the same time - Poco::Thread::sleep(sleep_ms_between_transactions); - transaction2->sign(user_1); - auto transaction2_json = transaction2->getTransactionAsJson(true); - responseStream << "\n"; - responseStream << "\t\t\t"; -#line 286 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction2_json) ); - responseStream << "
\n"; - responseStream << "\t\t\t"; -#line 287 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\tTime: "; -#line 288 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "\n"; - responseStream << "\t\t
\n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
4. Send a creation transaction to second user, signed by first user
\n"; - responseStream << "\t\t\t"; -#line 292 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - time2.reset(); - if(!steps[2]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 296 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto transaction3 = model::gradido::Transaction::createCreation(user_2, 10000000, Poco::DateTime(), "Test Creation", model::gradido::BLOCKCHAIN_HEDERA); - // wait before sending fourth transaction, gn seems to crash by more than 3 transaction at nearly the same time - Poco::Thread::sleep(sleep_ms_between_transactions); - transaction3->sign(user_1); - auto transaction3_json = transaction3->getTransactionAsJson(true); - responseStream << "\n"; - responseStream << "\t\t\t"; -#line 303 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction3_json) ); - responseStream << "
\n"; - responseStream << "\t\t\t"; -#line 304 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\tTime: "; -#line 305 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "
\n"; - responseStream << "\t\t \n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
5. Send a transfer transaction from second user to first user signed by second user
\n"; - responseStream << "\t\t\t"; -#line 309 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - time2.reset(); - if(!steps[3]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 313 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto user_1_pubkey = user_1->getModel()->getPublicKeyCopy(); - auto transaction4 = model::gradido::Transaction::createTransfer(user_2, user_1_pubkey, user_group, 5000000, "Test Transfer", model::gradido::BLOCKCHAIN_HEDERA); - // wait before sending fourth transaction, gn seems to crash by more than 3 transaction at nearly the same time - Poco::Thread::sleep(sleep_ms_between_transactions); - transaction4->sign(user_2); - auto transaction4_json = transaction4->getTransactionAsJson(true); - responseStream << "\n"; - responseStream << "\t\t\t"; -#line 321 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction4_json) ); - responseStream << "
\n"; - responseStream << "\t\t\t"; -#line 322 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\tTime: "; -#line 323 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "
\n"; - responseStream << "\t\t \n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
6. Send a add-member transaction to hedera topic 2 with one signature (third user)
\n"; - responseStream << "\t\t\t"; -#line 327 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - time2.reset(); - if(!steps[4]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 331 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto transaction5 = model::gradido::Transaction::createGroupMemberUpdate(user_3, user_group2); - transaction5->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(1); - Poco::Thread::sleep(sleep_ms_between_transactions); - transaction5->sign(user_3); - auto transaction5_json = transaction5->getTransactionAsJson(true); - responseStream << "\n"; - responseStream << "\t\t\t"; -#line 338 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction5_json) ); - responseStream << "
\n"; - responseStream << "\t\t\t"; -#line 339 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\tTime: "; -#line 340 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "
\n"; - responseStream << "\t\t \n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
7. Send a cross group transfer from second user to third user signed by second user
\n"; - responseStream << "\t\t\t"; -#line 344 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - time2.reset(); - if(!steps[5]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 348 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto user_3_pubkey = user_3->getModel()->getPublicKeyCopy(); - auto transaction6 = model::gradido::Transaction::createTransfer(user_2, user_3_pubkey, user_group2, 4000000, "Test Group Transfer", model::gradido::BLOCKCHAIN_HEDERA, false); - if(transaction6.isNull()) { - responseStream << "\n"; - responseStream << "\t\t\t\t\n"; - responseStream << "\t\t\t\t\treport_problem\n"; - responseStream << "\t\t\t\t\tError creating Transaction\n"; - responseStream << "\t\t\t\t\n"; - responseStream << "\t\t\t\t"; -#line 357 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - } else { - Poco::Thread::sleep(sleep_ms_between_transactions); - transaction6->sign(user_2); - auto transaction6_json = transaction6->getTransactionAsJson(true); - auto paired_transaction = transaction6->getPairedTransaction(); - responseStream << "\n"; - responseStream << "\t\t\t\t\t"; -#line 364 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction6_json) ); - responseStream << "
\t\t\n"; - responseStream << "\t\t\t\t\t"; -#line 365 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - if(!paired_transaction.isNull()) { - auto transaction6_2_json = paired_transaction->getTransactionAsJson(true); - responseStream << ""; -#line 367 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction6_2_json) ); - responseStream << "
\n"; - responseStream << "\t\t\t\t\t"; -#line 368 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\t\t"; -#line 369 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << "\n"; - responseStream << "\t\t\t"; -#line 370 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } responseStream << " \n"; - responseStream << "\t\t\tTime: "; -#line 371 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "
\n"; - responseStream << "\t\t \n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
8. Wait "; -#line 374 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( hedera_timeout ); - responseStream << " seconds to give hedera time to process transactions
\n"; - responseStream << "\t\t\t"; -#line 375 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - if(!steps[6]) { responseStream << "\n"; - responseStream << "\t\t\t\tskipped
\n"; - responseStream << "\t\t\t"; -#line 377 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - Poco::Thread::sleep(hedera_timeout * 1000); - } responseStream << "\n"; - responseStream << "\t\t \n";
- responseStream << "\t\t - \n";
- responseStream << "\t\t\t
9. Ask choosen node for transaction and print result
\n"; - responseStream << "\t\t\t"; -#line 383 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - time2.reset(); - if(!steps[7] || node_server.isNull()) { - responseStream << "skipped
\n"; - responseStream << "\t\t\t"; -#line 386 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - } else { - auto node_server_model = node_server->getModel(); - JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort()); - Poco::JSON::Object params; - params.set("groupAlias", user_group->getModel()->getAlias()); - params.set("lastKnownSequenceNumber", 0); - auto gn_answear = jsonrpc.request("getTransactions", params); - if(!gn_answear.isNull()) { - std::stringstream ss; - Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER); - std::string answear_string = ss.str(); responseStream << "\n"; - responseStream << "\t\t\t\t\t"; -#line 397 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( DataTypeConverter::replaceNewLineWithBr(answear_string) ); -#line 397 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - - } - } responseStream << "\n"; - responseStream << "\t\t\tTime: "; -#line 400 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\adminNodeServerTest.cpsp" - responseStream << ( time2.string() ); - responseStream << "
\n"; - responseStream << "\t\t \n";
- responseStream << "\t - "; -#line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( userModel->getFirstName() ); - responseStream << " "; -#line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( userModel->getLastName() ); - responseStream << " \n"; - responseStream << "\t\t\t
- "; -#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( userModel->getEmail() ); - responseStream << " \n"; - responseStream << "\t\t\t
- Public Key: "; -#line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( userModel->getPublicKeyHex() ); - responseStream << " \n"; - responseStream << "\t\t\t
- E-Mail überprüft: "; -#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( std::to_string(userModel->isEmailChecked()) ); - responseStream << " \n"; - responseStream << "\t\t\t
- Private Key verschlüsselt: "; -#line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( std::to_string(userModel->hasPrivateKeyEncrypted()) ); - responseStream << " \n"; - responseStream << "\t\t\t
- Passwort gesetzt: "; -#line 93 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp" - responseStream << ( std::to_string(userModel->getPasswordHashed() != 0) ); - responseStream << " \n"; - responseStream << "\t\t
- account_balance_wallet
- home
- account_balanceÜberweisung \n"; - responseStream << "
- people_altMitgliederbereich \n"; - responseStream << "
- "; -#line 295 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( gettext("Name") ); - responseStream << ": "; -#line 295 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( group_model->getName() ); - responseStream << " \n"; - responseStream << "\t\t\t\t\t\t
- "; -#line 296 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( gettext("Alias") ); - responseStream << ": "; -#line 296 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( group_model->getAlias() ); - responseStream << " \n"; - responseStream << "\t\t\t\t\t\t
- "; -#line 297 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( gettext("Url") ); - responseStream << ": getUrl() ); - responseStream << "/pages/visitor\" target=\"_blank\">"; -#line 297 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( group_model->getUrl() ); - responseStream << " \n"; - responseStream << "\t\t\t\t\t\t
- "; -#line 298 "F:\\Gradido\\gradido_stage2_local\\login_server\\src\\cpsp\\checkTransaction.cpsp" - responseStream << ( group_model->getDescription() ); - responseStream << " \n"; - responseStream << "\t\t\t\t\t
+
-
+
-
-
- {{ getOperator(item) }}
- {{ $n(item.balance) }}
+
+ {{ getProperties(item).operator }}
+ {{ $n(item.balance, 'decimal') }}
-
- {{ item.name }}
- {{ item.name ? '' : $t('decay') }}
-
@@ -85,18 +84,11 @@ const iconsByType = {
export default {
name: 'gdd-transaction-list',
props: {
- transactions: { default: [] },
+ transactions: { default: () => [] },
max: { type: Number, default: 1000 },
timestamp: { type: Number, default: 0 },
transactionCount: { type: Number, default: 0 },
},
- data() {
- return {
- form: [],
- fields: ['balance', 'date', 'memo', 'name', 'transaction_id', 'type', 'details'],
- items: [],
- }
- },
watch: {
timestamp: {
immediate: true,
@@ -107,23 +99,18 @@ export default {
updateTransactions() {
this.$emit('update-transactions')
},
- getIcon(item) {
- const icon = iconsByType[item.type]
- if (icon) return icon.icon
- const thing = new Error('no item to given type')
- thing()
+ getProperties(item) {
+ const type = iconsByType[item.type]
+ if (type)
+ return {
+ icon: type.icon,
+ class: type.classes + ' m-mb-1 font2em',
+ operator: type.operator,
+ }
+ this.throwError('no icon to given type')
},
- getClass(item) {
- const icon = iconsByType[item.type]
- if (icon) return icon.classes + ' m-mb-1 font2em'
- const thing = new Error('no item to given type')
- thing()
- },
- getOperator(item) {
- const icon = iconsByType[item.type]
- if (icon) return icon.operator
- const thing = new Error('no item to given type')
- thing()
+ throwError(msg) {
+ throw new Error(msg)
},
},
}
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.spec.js
new file mode 100644
index 000000000..8457d2ad3
--- /dev/null
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionListFooter.spec.js
@@ -0,0 +1,48 @@
+import { mount, RouterLinkStub } from '@vue/test-utils'
+import GddTransactionListFooter from './GddTransactionListFooter'
+
+const localVue = global.localVue
+
+describe('GddTransactionListFooter', () => {
+ let wrapper
+
+ const mocks = {
+ $t: jest.fn((t) => t),
+ }
+
+ const stubs = {
+ RouterLink: RouterLinkStub,
+ }
+
+ const Wrapper = () => {
+ return mount(GddTransactionListFooter, { localVue, mocks, stubs })
+ }
+
+ describe('mount', () => {
+ beforeEach(() => {
+ wrapper = Wrapper()
+ })
+
+ it('renders the component', () => {
+ expect(wrapper.find('div.list-group').exists()).toBeTruthy()
+ })
+
+ it('contains no text', () => {
+ expect(wrapper.text()).toBe('')
+ })
+ })
+
+ describe('count property is greater than 5', () => {
+ beforeEach(async () => {
+ wrapper.setProps({ count: 6 })
+ })
+
+ it('renders a link to show all', () => {
+ expect(wrapper.text()).toBe('transaction.show_all')
+ })
+
+ it('links to /transactions', () => {
+ expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/transactions')
+ })
+ })
+})
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index 1e94867e6..8e512c439 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -3,7 +3,6 @@
{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}
+
+ {{ item.name ? item.name : $t('decay') }}
+
{{ $d($moment(item.date), 'long') }}
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 457c13f45..1fb5cd195 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -17,6 +17,8 @@ import VueQrcode from 'vue-qrcode'
import BaseHeader from '@/components/BaseHeader'
import StatsCard from '@/components/Cards/StatsCard.vue'
+import VueMoment from 'vue-moment'
+
import clickOutside from '@/directives/click-ouside.js'
global.localVue = createLocalVue()
@@ -37,6 +39,7 @@ global.localVue.use(Notifications)
global.localVue.use(SideBar)
global.localVue.use(VueRouter)
global.localVue.use(VueQrcode)
+global.localVue.use(VueMoment)
global.localVue.component(BaseInput.name, BaseInput)
global.localVue.component('validation-provider', ValidationProvider)
global.localVue.component('validation-observer', ValidationObserver)
diff --git a/login_server/CMakeLists.txt b/login_server/CMakeLists.txt
index c1b55d9c7..d20dcdaf9 100644
--- a/login_server/CMakeLists.txt
+++ b/login_server/CMakeLists.txt
@@ -24,6 +24,8 @@ include_directories(
"dependencies/grpc/third_party/googletest/googletest/include"
"build"
"build/proto"
+ "build/http_pages"
+ "src/cpp"
)
IF(UNIX)
@@ -103,7 +105,9 @@ FOREACH(proto ${DATAMODEL_GRADIDO_PROTOS})
)
# Optional, but that can show the user if something have gone wrong with the proto generation
IF(${rv})
- MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ ELSE()
+ MESSAGE("Parsed: src/proto/gradido/${proto_parsed}.proto")
ENDIF()
ENDIF()
@@ -127,17 +131,80 @@ FOREACH(proto ${DATAMODEL_HEDERA_PROTOS})
)
# Optional, but that can show the user if something have gone wrong with the proto generation
IF(${rv})
- MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ ELSE()
+ MESSAGE("Parsed: src/proto/hedera/hedera-protobuf/src/main/proto/${proto_parsed}.proto")
ENDIF()
ENDIF()
ENDFOREACH(proto)
+############################## parse cpsp Files ####################################
+
+IF(WIN32)
+ include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+ conan_basic_setup()
+ #add_compile_definitions(POCO_NETSSL_WIN)
+ENDIF()
+
+FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/cpsp GRADIDO_CPSP_PAGE_SRC_PATH)
+FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build/http_pages GRADIDO_HTTP_PAGES_PATH)
+file(MAKE_DIRECTORY ${GRADIDO_HTTP_PAGES_PATH})
+
+FILE(GLOB GRADIDO_HTTP_PAGES_SRC "${GRADIDO_CPSP_PAGE_SRC_PATH}/*.cpsp")
+IF(WIN32)
+ string(REGEX REPLACE "(.*)package/([a-f0-9]*)" "\\1build/\\2/build/bin" POCO_BUILD_BIN "${CONAN_POCO_ROOT}")
+ find_program(POCO_PAGE_COMPILER cpspc.exe PATHS "${CONAN_POCO_ROOT}")
+ find_program(POCO_PAGE_COMPILER cpspc.exe PATHS "${POCO_BUILD_BIN}")
+ELSE()
+ find_program(POCO_PAGE_COMPILER cpspc PATHS "${CMAKE_CURRENT_SOURCE_DIR}/build/bin")
+ENDIF()
+
+MESSAGE("Poco Page Compiler: ${POCO_PAGE_COMPILER}")
+
+FOREACH(cpsp_file ${GRADIDO_HTTP_PAGES_SRC})
+ FILE(TO_NATIVE_PATH ${cpsp_file} cpsp_file_native)
+ get_filename_component(cpsp_file_parsed ${cpsp_file} NAME_WLE)
+
+ FILE(TO_NATIVE_PATH ${GRADIDO_HTTP_PAGES_PATH}/${cpsp_file_parsed}Page.cpp cpsp_file_parsed_native)
+
+ IF(${cpsp_file_native} IS_NEWER_THAN ${cpsp_file_parsed_native})
+ IF(WIN32)
+ EXECUTE_PROCESS(
+ COMMAND
+ ${POCO_PAGE_COMPILER}
+ /output-dir=${GRADIDO_HTTP_PAGES_PATH}
+ /header-output-dir=${GRADIDO_HTTP_PAGES_PATH}
+ /noline
+ ${cpsp_file_native}
+ RESULT_VARIABLE rv
+ )
+ ELSE()
+ EXECUTE_PROCESS(
+ COMMAND
+ ${POCO_PAGE_COMPILER}
+ --output-dir=${GRADIDO_HTTP_PAGES_PATH}
+ --header-output-dir=${GRADIDO_HTTP_PAGES_PATH}
+ --noline
+ ${cpsp_file_native}
+ RESULT_VARIABLE rv
+ )
+ ENDIF()
+ # Optional, but that can show the user if something have gone wrong with the proto generation
+ IF(${rv})
+ MESSAGE("Generation of HTTP Page return ${rv} for cpsp ${cpsp_file_native}")
+ ELSE()
+ MESSAGE("Parsed: src/cpsp/${cpsp_file_parsed}.cpsp")
+ ENDIF()
+ ENDIF()
+
+ENDFOREACH(cpsp_file)
############################## bind source files ###################################
FILE(GLOB CONTROLLER "src/cpp/controller/*.cpp" "src/cpp/controller/*.h")
FILE(GLOB TINF "dependencies/tinf/src/*.c" "dependencies/tinf/src/*.h")
FILE(GLOB HTTPInterface "src/cpp/HTTPInterface/*.h" "src/cpp/HTTPInterface/*.cpp")
+FILE(GLOB COMPILED_PAGES "build/http_pages/*.h" "build/http_pages/*.cpp")
FILE(GLOB JSONInterface "src/cpp/JSONInterface/*.h" "src/cpp/JSONInterface/*.cpp")
FILE(GLOB TASKS "src/cpp/tasks/*.cpp" "src/cpp/tasks/*.h")
FILE(GLOB SINGLETON_MANAGER "src/cpp/SingletonManager/*.h" "src/cpp/SingletonManager/*.cpp")
@@ -161,7 +228,7 @@ FILE(GLOB TEST_MODEL_TABLE "src/cpp/test/model/table/*.cpp" "src/cpp/test/model/
FILE(GLOB TEST_CONTROLLER "src/cpp/test/controller/*.cpp" "src/cpp/test/controller/*.h")
SET(LOCAL_SRCS
- ${CONTROLLER} ${TINF} ${MAIN} ${HTTPInterface}
+ ${CONTROLLER} ${TINF} ${MAIN} ${HTTPInterface} ${COMPILED_PAGES}
${JSONInterface} ${CRYPTO}
${MODEL} ${MODEL_TABLE} ${MODEL_EMAIL} ${MODEL_HEDERA} ${MODEL_GRADIDO}
${SINGLETON_MANAGER} ${LIB_SRC} ${MYSQL} ${TASKS}
@@ -188,6 +255,7 @@ if(MSVC)
source_group("mysql" FILES ${MYSQL})
source_group("SingletonManager" FILES ${SINGLETON_MANAGER})
source_group("lib" FILES ${LIB_SRC})
+ source_group("HTTP-Interface\\pages" FILES ${COMPILED_PAGES})
source_group("HTTP-Interface" FILES ${HTTPInterface})
source_group("Json-Interface" FILES ${JSONInterface})
source_group("Test\\crypto" FILES ${TEST_CRYPTO})
@@ -197,11 +265,7 @@ if(MSVC)
source_group("Test" FILES ${TEST})
endif()
-IF(WIN32)
- include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
- conan_basic_setup()
- #add_compile_definitions(POCO_NETSSL_WIN)
-ENDIF()
+
add_executable(Gradido_LoginServer ${LOCAL_SRCS})
diff --git a/login_server/CMakeLists.txt.lib b/login_server/CMakeLists.txt.lib
index 6de10f72e..bf62814c4 100644
--- a/login_server/CMakeLists.txt.lib
+++ b/login_server/CMakeLists.txt.lib
@@ -22,6 +22,8 @@ include_directories(
"/usr/local/include/mariadb"
"build"
"build/proto"
+ "build/http_pages"
+ "src/cpp"
)
############################## config and add grpc ###################################
@@ -61,7 +63,9 @@ FOREACH(proto ${DATAMODEL_GRADIDO_PROTOS})
)
# Optional, but that can show the user if something have gone wrong with the proto generation
IF(${rv})
- MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ ELSE()
+ MESSAGE("Parsed: src/proto/gradido/${proto_parsed}.proto")
ENDIF()
ENDIF()
@@ -85,17 +89,57 @@ FOREACH(proto ${DATAMODEL_HEDERA_PROTOS})
)
# Optional, but that can show the user if something have gone wrong with the proto generation
IF(${rv})
- MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")
+ ELSE()
+ MESSAGE("Parsed: src/proto/hedera/hedera-protobuf/src/main/proto/${proto_parsed}.proto")
ENDIF()
ENDIF()
ENDFOREACH(proto)
+############################## parse cpsp Files ####################################
+FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/cpsp GRADIDO_CPSP_PAGE_SRC_PATH)
+FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build/http_pages GRADIDO_HTTP_PAGES_PATH)
+file(MAKE_DIRECTORY ${GRADIDO_HTTP_PAGES_PATH})
+
+FILE(GLOB GRADIDO_HTTP_PAGES_SRC "${GRADIDO_CPSP_PAGE_SRC_PATH}/*.cpsp")
+
+find_program(POCO_PAGE_COMPILER cpspc)
+
+MESSAGE("Poco Page Compiler: ${POCO_PAGE_COMPILER}")
+
+FOREACH(cpsp_file ${GRADIDO_HTTP_PAGES_SRC})
+ FILE(TO_NATIVE_PATH ${cpsp_file} cpsp_file_native)
+ get_filename_component(cpsp_file_parsed ${cpsp_file} NAME_WLE)
+
+ FILE(TO_NATIVE_PATH ${GRADIDO_HTTP_PAGES_PATH}/${cpsp_file_parsed}Page.cpp cpsp_file_parsed_native)
+
+ IF(${cpsp_file_native} IS_NEWER_THAN ${cpsp_file_parsed_native})
+ EXECUTE_PROCESS(
+ COMMAND
+ ${POCO_PAGE_COMPILER}
+ --output-dir=${GRADIDO_HTTP_PAGES_PATH}
+ --header-output-dir=${GRADIDO_HTTP_PAGES_PATH}
+ --noline
+ ${cpsp_file_native}
+ RESULT_VARIABLE rv
+ )
+ # Optional, but that can show the user if something have gone wrong with the proto generation
+ IF(${rv})
+ MESSAGE("Generation of HTTP Page return ${rv} for cpsp ${cpsp_file_native}")
+ ELSE()
+ MESSAGE("Parsed: src/cpsp/${cpsp_file_parsed}.cpsp")
+ ENDIF()
+ ENDIF()
+
+ENDFOREACH(cpsp_file)
+
############################## include src files ###################################
#set(MYSQL_INCLUDE_DIR "dependencies/mariadb-connector-c/include")
FILE(GLOB CONTROLLER "src/cpp/controller/*.cpp" "src/cpp/controller/*.h")
FILE(GLOB TINF "dependencies/tinf/src/*.c" "dependencies/tinf/src/*.h")
FILE(GLOB HTTPInterface "src/cpp/HTTPInterface/*.h" "src/cpp/HTTPInterface/*.cpp")
+FILE(GLOB COMPILED_PAGES "build/http_pages/*.h" "build/http_pages/*.cpp")
FILE(GLOB JSONInterface "src/cpp/JSONInterface/*.h" "src/cpp/JSONInterface/*.cpp")
FILE(GLOB TASKS "src/cpp/tasks/*.cpp" "src/cpp/tasks/*.h")
FILE(GLOB SINGLETON_MANAGER "src/cpp/SingletonManager/*.h" "src/cpp/SingletonManager/*.cpp")
@@ -119,7 +163,7 @@ FILE(GLOB TEST_MODEL_TABLE "src/cpp/test/model/table/*.cpp" "src/cpp/test/model/
FILE(GLOB TEST_CONTROLLER "src/cpp/test/controller/*.cpp" "src/cpp/test/controller/*.h")
SET(LOCAL_SRCS
- ${CONTROLLER} ${TINF} ${MAIN} ${HTTPInterface}
+ ${CONTROLLER} ${TINF} ${MAIN} ${HTTPInterface} ${COMPILED_PAGES}
${JSONInterface} ${CRYPTO}
${MODEL} ${MODEL_TABLE} ${MODEL_EMAIL} ${MODEL_HEDERA} ${MODEL_GRADIDO}
${SINGLETON_MANAGER} ${LIB_SRC} ${MYSQL} ${TASKS}
@@ -130,31 +174,6 @@ SET(LOCAL_TEST_SRC
)
aux_source_directory("src/cpp" LOCAL_SRCS)
-if(MSVC)
- # src
- source_group("controller" FILES ${CONTROLLER})
- source_group("proto\\gradido" FILES ${PROTO_GRADIDO})
- source_group("proto\\hedera" FILES ${PROTO_HEDERA})
- source_group("tinf" FILES ${TINF})
- source_group("Crypto" FILES ${CRYPTO})
- source_group("tasks" FILES ${TASKS})
- source_group("model\\table" FILES ${MODEL_TABLE})
- source_group("model\\email" FILES ${MODEL_EMAIL})
- source_group("model\\hedera" FILES ${MODEL_HEDERA})
- source_group("model\\gradido" FILES ${MODEL_GRADIDO})
- source_group("model" FILES ${MODEL})
- source_group("mysql" FILES ${MYSQL})
- source_group("SingletonManager" FILES ${SINGLETON_MANAGER})
- source_group("lib" FILES ${LIB_SRC})
- source_group("HTTP-Interface" FILES ${HTTPInterface})
- source_group("Json-Interface" FILES ${JSONInterface})
- source_group("Test\\crypto" FILES ${TEST_CRYPTO})
- source_group("Test\\model\\table" FILES ${TEST_MODEL_TABLE})
- source_group("Test\\model" FILES ${TEST_MODEL})
- source_group("Test\\controller" FILES ${TEST_CONTROLLER})
- source_group("Test" FILES ${TEST})
-endif()
-
add_executable(Gradido_LoginServer ${LOCAL_SRCS})
############################## find mariadb ###################################
diff --git a/login_server/Dockerfile b/login_server/Dockerfile
index bc3cb9807..83adec256 100644
--- a/login_server/Dockerfile
+++ b/login_server/Dockerfile
@@ -12,15 +12,16 @@ COPY ./dependencies/cmake-modules ./dependencies/cmake-modules
COPY ./dependencies/spirit-po ./dependencies/spirit-po
COPY ./dependencies/tinf ./dependencies/tinf
COPY ./scripts ./scripts
-RUN cd scripts && \
- chmod +x compile_pot.sh && \
- ./compile_pot.sh
RUN mkdir build && \
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j$(nproc) Gradido_LoginServer
+RUN cd scripts && \
+ chmod +x compile_pot.sh && \
+ ./compile_pot.sh
+
#########################################################################################################
# run release
diff --git a/login_server/conanfile.txt b/login_server/conanfile.txt
index 5d3dd4ebb..276925116 100644
--- a/login_server/conanfile.txt
+++ b/login_server/conanfile.txt
@@ -3,6 +3,8 @@ Poco/1.9.4@pocoproject/stable
libsodium/1.0.18@bincrafters/stable
boost/1.71.0@conan/stable
+[options]
+Poco:enable_pagecompiler=True
[generators]
cmake
diff --git a/login_server/scripts/build_debug.sh b/login_server/scripts/build_debug.sh
index 84356018e..99a0d6d1a 100755
--- a/login_server/scripts/build_debug.sh
+++ b/login_server/scripts/build_debug.sh
@@ -3,10 +3,10 @@
cd ../scripts
chmod +x compile_pot.sh
-./compile_pot.sh
cd ../build
cmake -DCMAKE_BUILD_TYPE=Debug ..
+./compile_pot.sh
make -j$(nproc) Gradido_LoginServer
chmod +x ./bin/Gradido_LoginServer
diff --git a/login_server/scripts/compile_pot.sh b/login_server/scripts/compile_pot.sh
index 1d817be55..6dcd6c560 100755
--- a/login_server/scripts/compile_pot.sh
+++ b/login_server/scripts/compile_pot.sh
@@ -1,2 +1,3 @@
#!/bin/sh
-xgettext -D ../src/cpp -p ../src/LOCALE -o messages.pot --from-code=UTF-8 --files-from=files_to_translate.txt
+xgettext -D ../ -p ../src/LOCALE -o messages.pot --from-code=UTF-8 --files-from=files_to_translate.txt
+
diff --git a/login_server/scripts/files_to_translate.txt b/login_server/scripts/files_to_translate.txt
index 9bc694e1e..231056201 100644
--- a/login_server/scripts/files_to_translate.txt
+++ b/login_server/scripts/files_to_translate.txt
@@ -1,10 +1,10 @@
-HTTPInterface/LoginPage.cpp
-HTTPInterface/CheckEmailPage.cpp
-HTTPInterface/ResetPassword.cpp
-HTTPInterface/PassphrasePage.cpp
-model/Session.cpp
-model/email/Email.cpp
-model/email/EmailCustomReply.cpp
-model/email/EmailNotificationCreation.cpp
-model/email/EmailNotificationTransfer.cpp
-SingletonManager/SessionManager.cpp
\ No newline at end of file
+build/http_pages/LoginPage.cpp
+build/http_pages/CheckEmailPage.cpp
+build/http_pages/ResetPasswordPage.cpp
+build/http_pages/PassphrasePage.cpp
+src/cpp/model/Session.cpp
+src/cpp/model/email/Email.cpp
+src/cpp/model/email/EmailCustomReply.cpp
+src/cpp/model/email/EmailNotificationCreation.cpp
+src/cpp/model/email/EmailNotificationTransfer.cpp
+src/cpp/SingletonManager/SessionManager.cpp
\ No newline at end of file
diff --git a/login_server/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp b/login_server/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp
deleted file mode 100644
index 3139ff59a..000000000
--- a/login_server/src/cpp/HTTPInterface/AdminCheckUserBackup.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-#include "AdminCheckUserBackup.h"
-#include "Poco/Net/HTTPServerRequest.h"
-#include "Poco/Net/HTTPServerResponse.h"
-#include "Poco/Net/HTMLForm.h"
-#include "Poco/DeflatingStream.h"
-
-
-#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp"
-
-#include "../Crypto/KeyPairEd25519.h"
-#include "../Crypto/Passphrase.h"
-#include "../SingletonManager/ConnectionManager.h"
-
-#include "../controller/UserBackup.h"
-
-#include "Poco/Data/Binding.h"
-using namespace Poco::Data::Keywords;
-
-typedef Poco::Tuple, std::string> UserBackupTuple;
-
-struct SListEntry
-{
- Poco::AutoPtr user;
- std::vector> backups;
-};
-
-#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
-
-#include "../ServerConfig.h"
-
-
-AdminCheckUserBackup::AdminCheckUserBackup(Session* arg):
- SessionHTTPRequestHandler(arg)
-{
-}
-
-
-void AdminCheckUserBackup::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response)
-{
- response.setChunkedTransferEncoding(true);
- response.setContentType("text/html");
- bool _compressResponse(request.hasToken("Accept-Encoding", "gzip"));
- if (_compressResponse) response.set("Content-Encoding", "gzip");
-
- Poco::Net::HTMLForm form(request, request.stream());
-#line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp"
-
- const char* pageName = "Admin Check User Backups";
- auto cm = ConnectionManager::getInstance();
-
- std::list notMatchingEntrys;
-
- auto con = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER);
- Poco::Data::Statement select(con);
- std::list userBackupEntrys;
- select << "SELECT u.id, u.pubkey, b.passphrase FROM users as u LEFT JOIN user_backups as b on(u.id = b.user_id) order by u.id"
- , into(userBackupEntrys);
-
- size_t resultCount = 0;
- try {
- resultCount = select.execute();
- int last_user_id = 0;
- for(auto it = userBackupEntrys.begin(); it != userBackupEntrys.end(); it++) {
- auto tuple = *it;
- auto pubkey = tuple.get<1>();
- if(pubkey.isNull()) {
- continue;
- }
- auto passphrase = Passphrase::filter(tuple.get<2>());
- auto user_id = tuple.get<0>();
- KeyPairEd25519 key_pair(pubkey.value().content().data());
-
- auto wordSource = Passphrase::detectMnemonic(passphrase);
- if(!wordSource) {
- addError(new Error("admin Check user backup", "invalid passphrase"), false);
- addError(new ParamError("admin Check user backup", "passphrase", passphrase.data()), false);
- addError(new ParamError("admin Check user backup", "user id", user_id), false);
- continue;
- }
- auto passphrase_object = Passphrase::create(passphrase, wordSource);
- auto key_pair_from_passhrase = KeyPairEd25519::create(passphrase_object);
- bool matching = false;
- if(key_pair_from_passhrase->isTheSame(key_pair)) {
- matching = true;
- }
- delete key_pair_from_passhrase;
- if(user_id != last_user_id) {
- last_user_id = user_id;
- if(matching) continue;
- } else {
- auto lastEntry = notMatchingEntrys.back();
- if(lastEntry.user->getModel()->getID() == user_id && matching == true) {
- notMatchingEntrys.pop_back();
- continue;
- }
- }
-
- SListEntry entry;
- entry.user = controller::User::create();
- entry.user->load(user_id);
- entry.backups = controller::UserBackup::load(user_id);
-
- notMatchingEntrys.push_back(entry);
-
- }
- }
- catch (Poco::Exception& ex) {
- addError(new ParamError("adminCheckUserBackup", "mysql error", ex.displayText().data()), false);
- }
-
-
-
- std::ostream& _responseStream = response.send();
- Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
- std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
- responseStream << "\n";
- // begin include header_old.cpsp
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "Gradido Login Server: ";
-#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
- responseStream << ( pageName );
- responseStream << " \n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "\n";
- responseStream << "
\n";
- responseStream << "\t
\n";
- // end include header_old.cpsp
- responseStream << "\n";
- responseStream << "Login Server in Entwicklung
\n"; - responseStream << "\tAlpha "; -#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp" - responseStream << ( ServerConfig::g_versionString ); - responseStream << "
\n"; - responseStream << "\n";
- responseStream << "\t\n";
- responseStream << "\t\t\n";
- responseStream << "\t\t\t
Admin Check User Backup
\n"; - responseStream << "\t"; -#line 95 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( getErrorsHtml() ); - responseStream << "\n"; - responseStream << "\tUnmatching count: "; -#line 96 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( notMatchingEntrys.size() ); - responseStream << "
\n"; - responseStream << "\t| id | Vorname | Nachname | backups count | |
|---|---|---|---|---|
| "; -#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( userModel->getID() ); - responseStream << " | \n"; - responseStream << "\t\t\t\t"; -#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( userModel->getFirstName() ); - responseStream << " | \n"; - responseStream << "\t\t\t\t"; -#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( userModel->getLastName() ); - responseStream << " | \n"; - responseStream << "\t\t\t\t"; -#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( userModel->getEmail() ); - responseStream << " | \n"; - responseStream << "\t\t\t\t"; -#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminCheckUserBackup.cpsp" - responseStream << ( (*it).backups.size() ); - responseStream << " | \n"; - responseStream << "\t\t\t\t