From 19e71eceb1b9c5421bd633dd4720cbf05b870ab0 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 14:30:24 +0200 Subject: [PATCH 001/107] move gradido id right, replace copy icon, move copy icon left --- frontend/src/components/Menu/Navbar.vue | 16 ++++++++-------- frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + frontend/src/locales/es.json | 1 + frontend/src/locales/fr.json | 1 + frontend/src/locales/nl.json | 1 + 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 8a749c886..216c2c8a4 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -17,9 +17,9 @@ -
+
-
+
-
-
{{ username.username }}
-
-
- {{ gradidoId }} +
+ {{ username.username }} +
+
- + + {{ gradidoId }}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ac9647e96..cad11d22f 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -114,6 +114,7 @@ "thanksYouWith": "dankt dir mit" }, "contributionText": "Beitragstext", + "copy-to-clipboard": "In Zwischenablage kopieren", "creation": "Schöpfen", "decay": { "before_startblock_transaction": "Diese Transaktion beinhaltet keine Vergänglichkeit.", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index d70bafe5c..aa4318a95 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -114,6 +114,7 @@ "thanksYouWith": "thanks you with" }, "contributionText": "Contribution Text", + "copy-to-clipboard": "Copy to clipboard", "creation": "Creation", "decay": { "before_startblock_transaction": "This transaction does not include decay.", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 19a3accfd..c12d8fedc 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -101,6 +101,7 @@ "thanksYouWith": "te agradece con", "unique": "(único)" }, + "copy-to-clipboard": "Copiar al portapapeles", "decay": { "before_startblock_transaction": "Esta transacción no implica disminución en su valor.", "calculation_decay": "Cálculo de la disminución gradual del valor", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index a24a4c7aa..d50334e69 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -104,6 +104,7 @@ }, "contributionText": "Texte de la contribution", "creation": "Création", + "copy-to-clipboard": "Copier dans le presse-papier", "decay": { "before_startblock_transaction": "Cette transaction n'est pas péremptoire.", "calculation_decay": "Calcul de la décroissance", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 587dec716..40d6d1455 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -101,6 +101,7 @@ "thanksYouWith": "bedankt jou met", "unique": "(uniek)" }, + "copy-to-clipboard": "Kopieer naar klembord", "decay": { "before_startblock_transaction": "Deze transactie heeft geen vergankelijkheid.", "calculation_decay": "Berekening van de vergankelijkheid", From 913464bee78eeda2481684af0c49d56526a73ee0 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 14:31:39 +0200 Subject: [PATCH 002/107] update copy symbol in admin --- admin/src/components/AiChat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/AiChat.vue b/admin/src/components/AiChat.vue index e167d685d..c5f3fbcfc 100644 --- a/admin/src/components/AiChat.vue +++ b/admin/src/components/AiChat.vue @@ -25,7 +25,7 @@ :title="$t('copy-to-clipboard')" @click="copyToClipboard(message.content)" > - +
From 1dcfa3ea01cacd213db614cdd0340136c5e37ee3 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 14:33:38 +0200 Subject: [PATCH 003/107] home link on gradido logo --- frontend/src/components/Menu/Navbar.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 216c2c8a4..f2aa3c038 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -3,12 +3,14 @@
- + + +
From 883aa678937417d4cabf04645a7ac1ef1ec1b5dc Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 14:58:59 +0200 Subject: [PATCH 004/107] fix lint --- frontend/src/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index d50334e69..3e8bb3a7a 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -103,8 +103,8 @@ "unique": "(unique)" }, "contributionText": "Texte de la contribution", - "creation": "Création", "copy-to-clipboard": "Copier dans le presse-papier", + "creation": "Création", "decay": { "before_startblock_transaction": "Cette transaction n'est pas péremptoire.", "calculation_decay": "Calcul de la décroissance", From daaedbfc6fca07f4b739fce9059991a215c3e9b1 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 15:35:30 +0200 Subject: [PATCH 005/107] rollback changes from another domain --- .../src/graphql/api/1_0/resolver/AuthenticationResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts b/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts index 73eb70d26..3c62c7bef 100644 --- a/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts +++ b/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts @@ -109,7 +109,7 @@ export class AuthenticationResolver { } } - @Mutation(() => String, { nullable: true }) + @Mutation(() => String) async authenticate( @Arg('data') args: EncryptedTransferArgs, From 7b0e7f05b6d2aacd4ca4790aa0d7cebc0b33d707 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 15:38:10 +0200 Subject: [PATCH 006/107] fix federation authentication --- .../api/1_0/resolver/AuthenticationResolver.ts | 4 ++-- shared/src/schema/base.schema.test.ts | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts b/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts index 3c62c7bef..4c14360e9 100644 --- a/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts +++ b/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts @@ -109,7 +109,7 @@ export class AuthenticationResolver { } } - @Mutation(() => String) + @Mutation(() => String, { nullable: true }) async authenticate( @Arg('data') args: EncryptedTransferArgs, @@ -125,7 +125,7 @@ export class AuthenticationResolver { // no infos to the caller return null } - if (!uint32Schema.safeParse(authArgs.oneTimeCode).success) { + if (!uint32Schema.safeParse(Number(authArgs.oneTimeCode)).success) { const errmsg = `invalid oneTimeCode: ${authArgs.oneTimeCode} for community with publicKey ${authArgs.publicKey}, expect uint32` methodLogger.error(errmsg) // no infos to the caller diff --git a/shared/src/schema/base.schema.test.ts b/shared/src/schema/base.schema.test.ts index 3e56a9a22..d12f2a3b4 100644 --- a/shared/src/schema/base.schema.test.ts +++ b/shared/src/schema/base.schema.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'bun:test' -import { uuidv4Schema } from './base.schema' +import { uuidv4Schema, uint32Schema } from './base.schema' import { v4 as uuidv4 } from 'uuid' describe('uuidv4 schema', () => { @@ -10,3 +10,15 @@ describe('uuidv4 schema', () => { } }) }) + +describe('uint32 schema', () => { + it('should validate uint32 (40x)', () => { + for (let i = 0; i < 40; i++) { + const uint32 = Math.floor(Math.random() * 4294967295) + expect(uint32Schema.safeParse(uint32).success).toBeTruthy() + } + }) + it('should validate 2092352810', () => { + expect(uint32Schema.safeParse(2092352810).success).toBeTruthy() + }) +}) From 612b99cba6597aeb899d06c54e964680cc2814bc Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 15:46:10 +0200 Subject: [PATCH 007/107] fix config custom code --- config-schema/src/log4js-config/coloredContext.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-schema/src/log4js-config/coloredContext.ts b/config-schema/src/log4js-config/coloredContext.ts index 1ebb6b219..1f238fcdb 100644 --- a/config-schema/src/log4js-config/coloredContext.ts +++ b/config-schema/src/log4js-config/coloredContext.ts @@ -33,7 +33,7 @@ function composeDataString(data: (string | Object)[]): string { return data .map((d) => { // if it is a object and his toString function return only garbage - if (typeof d === 'object' && d.toString() === '[object Object]') { + if (d && typeof d === 'object' && d.toString() === '[object Object]') { return inspect(d, ) } if (d) { From 3b289a934ddc60ab0ec2aaed2ea3033b786b09e9 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 3 Oct 2025 15:46:37 +0200 Subject: [PATCH 008/107] move change in other branch --- config-schema/src/log4js-config/coloredContext.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-schema/src/log4js-config/coloredContext.ts b/config-schema/src/log4js-config/coloredContext.ts index 1f238fcdb..1ebb6b219 100644 --- a/config-schema/src/log4js-config/coloredContext.ts +++ b/config-schema/src/log4js-config/coloredContext.ts @@ -33,7 +33,7 @@ function composeDataString(data: (string | Object)[]): string { return data .map((d) => { // if it is a object and his toString function return only garbage - if (d && typeof d === 'object' && d.toString() === '[object Object]') { + if (typeof d === 'object' && d.toString() === '[object Object]') { return inspect(d, ) } if (d) { From cf87e7ab0e429a9c711ca437f1ede99645f78e91 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 09:59:52 +0200 Subject: [PATCH 009/107] use template function updateAllDefinedAndChanged for updating user or community data --- .../src/graphql/resolver/CommunityResolver.ts | 25 ++++--- backend/src/graphql/resolver/UserResolver.ts | 75 +++++++------------ shared/src/helper/index.ts | 1 + shared/src/helper/updateField.test.ts | 68 +++++++++++++++++ shared/src/helper/updateField.ts | 39 ++++++++++ shared/src/index.ts | 2 + 6 files changed, 152 insertions(+), 58 deletions(-) create mode 100644 shared/src/helper/index.ts create mode 100644 shared/src/helper/updateField.test.ts create mode 100644 shared/src/helper/updateField.ts diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index a46e30144..49e98e8cb 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -1,6 +1,6 @@ import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity, getHomeCommunity } from 'database' import { Arg, Args, Authorized, Mutation, Query, Resolver } from 'type-graphql' -import { IsNull, Not } from 'typeorm' +import { IsNull, Not, Point } from 'typeorm' import { Paginated } from '@arg/Paginated' import { EditCommunityInput } from '@input/EditCommunityInput' @@ -17,6 +17,7 @@ import { getCommunityByIdentifier, getCommunityByUuid, } from './util/communities' +import { updateAllDefinedAndChanged } from 'shared' @Resolver() export class CommunityResolver { @@ -89,16 +90,20 @@ export class CommunityResolver { if (homeCom.foreign) { throw new LogError('Error: Only the HomeCommunity could be modified!') } - if ( - homeCom.gmsApiKey !== gmsApiKey || - homeCom.location !== location || - homeCom.hieroTopicId !== hieroTopicId - ) { - homeCom.gmsApiKey = gmsApiKey ?? null - if (location) { - homeCom.location = Location2Point(location) + let updated = false + // if location is undefined, it should not be changed + // if location is null, it should be set to null + if (typeof location !== 'undefined') { + const newLocation = location ? Location2Point(location) : null + if (newLocation !== homeCom.location) { + homeCom.location = newLocation + updated = true } - homeCom.hieroTopicId = hieroTopicId ?? null + } + if (updateAllDefinedAndChanged(homeCom, { gmsApiKey, hieroTopicId })) { + updated = true + } + if (updated) { await DbCommunity.save(homeCom) } return new Community(homeCom) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 045ca7756..3d6fcafd4 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -25,7 +25,7 @@ import { Root, } from 'type-graphql' import { IRestResponse } from 'typed-rest-client' -import { EntityNotFoundError, In, Point } from 'typeorm' +import { EntityManager, EntityNotFoundError, In, Point } from 'typeorm' import { v4 as uuidv4 } from 'uuid' import { UserArgs } from '@arg//UserArgs' @@ -104,6 +104,7 @@ import { deleteUserRole, setUserRole } from './util/modifyUserRole' import { sendUserToGms } from './util/sendUserToGms' import { syncHumhub } from './util/syncHumhub' import { validateAlias } from 'core' +import { updateAllDefinedAndChanged } from 'shared' const LANGUAGES = ['de', 'en', 'es', 'fr', 'nl'] const DEFAULT_LANGUAGE = 'de' @@ -727,18 +728,22 @@ export class UserResolver { user.humhubPublishName as PublishNameType, ) - // try { - if (firstName) { - user.firstName = firstName - } - - if (lastName) { - user.lastName = lastName - } + let updated = updateAllDefinedAndChanged(user, { + firstName, + lastName, + hideAmountGDD, + hideAmountGDT, + humhubAllowed, + gmsAllowed, + gmsPublishName: gmsPublishName?.valueOf(), + humhubPublishName: humhubPublishName?.valueOf(), + gmsPublishLocation: gmsPublishLocation?.valueOf(), + }) // currently alias can only be set, not updated if (alias && !user.alias && (await validateAlias(alias))) { user.alias = alias + updated = true } if (language) { @@ -748,6 +753,7 @@ export class UserResolver { } user.language = language i18n.setLocale(language) + updated = true } if (password && passwordNew) { @@ -768,55 +774,28 @@ export class UserResolver { // Save new password hash and newly encrypted private key user.passwordEncryptionType = PasswordEncryptionType.GRADIDO_ID user.password = await encryptPassword(user, passwordNew) + updated = true } - // Save hideAmountGDD value - if (hideAmountGDD !== undefined) { - user.hideAmountGDD = hideAmountGDD - } - // Save hideAmountGDT value - if (hideAmountGDT !== undefined) { - user.hideAmountGDT = hideAmountGDT - } - if (humhubAllowed !== undefined) { - user.humhubAllowed = humhubAllowed - } - if (gmsAllowed !== undefined) { - user.gmsAllowed = gmsAllowed - } - if (gmsPublishName !== null && gmsPublishName !== undefined) { - user.gmsPublishName = gmsPublishName - } - if (humhubPublishName !== null && humhubPublishName !== undefined) { - user.humhubPublishName = humhubPublishName - } if (gmsLocation) { user.location = Location2Point(gmsLocation) + updated = true } - if (gmsPublishLocation !== null && gmsPublishLocation !== undefined) { - user.gmsPublishLocation = gmsPublishLocation + + // early exit if no update was made + if (!updated) { + return true } - // } catch (err) { - // console.log('error:', err) - // } - const queryRunner = db.getDataSource().createQueryRunner() - await queryRunner.connect() - await queryRunner.startTransaction('REPEATABLE READ') try { - await queryRunner.manager.save(user).catch((error) => { - throw new LogError('Error saving user', error) - }) - - await queryRunner.commitTransaction() - logger.debug('writing User data successful...', new UserLoggingView(user)) - } catch (e) { - await queryRunner.rollbackTransaction() - throw new LogError('Error on writing updated user data', e) - } finally { - await queryRunner.release() + await DbUser.save(user) + } catch (error) { + const errorMessage = 'Error saving user' + logger.error(errorMessage, error) + throw new Error(errorMessage) } logger.info('updateUserInfos() successfully finished...') + logger.debug('writing User data successful...', new UserLoggingView(user)) await EVENT_USER_INFO_UPDATE(user) // validate if user settings are changed with relevance to update gms-user diff --git a/shared/src/helper/index.ts b/shared/src/helper/index.ts new file mode 100644 index 000000000..abfe2c8dc --- /dev/null +++ b/shared/src/helper/index.ts @@ -0,0 +1 @@ +export * from './updateField' \ No newline at end of file diff --git a/shared/src/helper/updateField.test.ts b/shared/src/helper/updateField.test.ts new file mode 100644 index 000000000..4eb6d84e4 --- /dev/null +++ b/shared/src/helper/updateField.test.ts @@ -0,0 +1,68 @@ +import { updateAllDefinedAndChanged, updateIfDefinedAndChanged } from './updateField' + +describe('updateIfDefinedAndChanged', () => { + it('should update field if incoming is different from current', () => { + const current = { field: 'current' } + const incoming = 'incoming' + const result = updateIfDefinedAndChanged(current, 'field', incoming) + expect(result).toBe(true) + expect(current.field).toBe('incoming') + }) + it('should not update field if incoming is the same as current', () => { + const current = { field: 'current' } + const incoming = 'current' + const result = updateIfDefinedAndChanged(current, 'field', incoming) + expect(result).toBe(false) + expect(current.field).toBe('current') + }) + it('should not update field if incoming is undefined', () => { + const current = { field: 'current' } + const incoming = undefined + const result = updateIfDefinedAndChanged(current, 'field', incoming) + expect(result).toBe(false) + expect(current.field).toBe('current') + }) + it('should update field if incoming is null', () => { + type TestEntity = { field: string | null } + const current: TestEntity = { field: 'current' } + const incoming = null + const result = updateIfDefinedAndChanged(current, 'field', incoming) + expect(result).toBe(true) + expect(current.field).toBe(null) + }) +}) + +describe('updateAllDefinedAndChanged', () => { + it('should update all fields if incoming is different from current', () => { + type TestEntity = { field1: string | null, field2: string | null, field3: string | null } + const current: TestEntity = { field1: 'current', field2: 'current', field3: 'current' } + const incoming = { field1: 'incoming', field2: 'incoming', otherField: 'incoming' } + const result = updateAllDefinedAndChanged(current, incoming) + expect(result).toBe(true) + expect(current).toEqual({ field1: 'incoming', field2: 'incoming', field3: 'current' }) + }) + it('should not update any field if incoming is the same as current', () => { + const current = { field1: 'current', field2: 'current' } + const incoming = { field1: 'current', field2: 'current' } + const result = updateAllDefinedAndChanged(current, incoming) + expect(result).toBe(false) + expect(current).toEqual({ field1: 'current', field2: 'current' }) + }) + it('should not update any field if incoming is undefined', () => { + const current = { field1: 'current', field2: 'current' } + const incoming = { field1: undefined, field2: undefined } + const result = updateAllDefinedAndChanged(current, incoming) + expect(result).toBe(false) + expect(current).toEqual({ field1: 'current', field2: 'current' }) + }) + it('should update field if incoming is null', () => { + type TestEntity = { field1: string | null, field2: string | null } + type TestInput = { field1: string | null } + const current: TestEntity = { field1: 'current', field2: 'current' } + const incoming: TestInput = { field1: null } + const result = updateAllDefinedAndChanged(current, incoming) + expect(result).toBe(true) + expect(current).toEqual({ field1: null, field2: 'current' }) + }) +}) + diff --git a/shared/src/helper/updateField.ts b/shared/src/helper/updateField.ts new file mode 100644 index 000000000..0f7008628 --- /dev/null +++ b/shared/src/helper/updateField.ts @@ -0,0 +1,39 @@ +/** + * Updates a field if the incoming value is not undefined and not equal to the current value. + * So basically undefined means don't touch value, null means set value to null. + * @param current The current value of the field. + * @param incoming The incoming value of the field. + * @returns True if the field was updated, false otherwise. + */ +export function updateIfDefinedAndChanged( + entity: T, + key: K, + incoming: T[K] | undefined +): boolean { + if (typeof incoming === 'undefined') { + return false + } + // Object.is compare actual values and return true if they are identical + if (Object.is(entity[key], incoming)) { + return false + } + entity[key] = incoming + return true +} + +/** + * Check all keys of incoming and if exist on entity, call {@link updateIfDefinedAndChanged} + * to update entity if value isn't undefined and not equal to current value. + * @param entity The entity to update. + * @param incoming The incoming values to update the entity with. + * @returns True if at least one field was updated, false otherwise. + */ +export function updateAllDefinedAndChanged(entity: T, incoming: Partial): boolean { + let updated = false + for (const [key, value] of Object.entries(incoming)) { + if (key in entity && updateIfDefinedAndChanged(entity, key as keyof T, value as T[keyof T])) { + updated = true + } + } + return updated +} \ No newline at end of file diff --git a/shared/src/index.ts b/shared/src/index.ts index dd7965fdc..a9e070d7f 100644 --- a/shared/src/index.ts +++ b/shared/src/index.ts @@ -1,5 +1,6 @@ export * from './schema' export * from './enum' +export * from './helper' export * from './logic/decay' export * from './jwt/JWT' export * from './jwt/payloadtypes/AuthenticationJwtPayloadType' @@ -14,3 +15,4 @@ export * from './jwt/payloadtypes/SendCoinsJwtPayloadType' export * from './jwt/payloadtypes/SendCoinsResponseJwtPayloadType' export * from './jwt/payloadtypes/SignedTransferPayloadType' + From c5a5067155b13479372e1099a82013af6c465e12 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 10:23:39 +0200 Subject: [PATCH 010/107] update rights, prevent gms api access for others than admins --- admin/src/graphql/updateHomeCommunity.js | 2 +- backend/src/auth/ADMIN_RIGHTS.ts | 4 +--- backend/src/auth/DLT_CONNECTOR_RIGHTS.ts | 2 +- backend/src/auth/RIGHTS.ts | 4 +--- backend/src/graphql/model/AdminCommunityView.ts | 1 - backend/src/graphql/model/Community.ts | 4 ---- .../src/graphql/resolver/CommunityResolver.test.ts | 10 +++++----- backend/src/graphql/resolver/CommunityResolver.ts | 12 ++++++------ backend/src/seeds/graphql/mutations.ts | 1 - backend/src/seeds/graphql/queries.ts | 3 --- 10 files changed, 15 insertions(+), 28 deletions(-) diff --git a/admin/src/graphql/updateHomeCommunity.js b/admin/src/graphql/updateHomeCommunity.js index 19bfb7396..036db91e5 100644 --- a/admin/src/graphql/updateHomeCommunity.js +++ b/admin/src/graphql/updateHomeCommunity.js @@ -8,7 +8,7 @@ export const updateHomeCommunity = gql` location: $location hieroTopicId: $hieroTopicId ) { - id + uuid } } ` diff --git a/backend/src/auth/ADMIN_RIGHTS.ts b/backend/src/auth/ADMIN_RIGHTS.ts index 9ba3e7ccd..69100d7d2 100644 --- a/backend/src/auth/ADMIN_RIGHTS.ts +++ b/backend/src/auth/ADMIN_RIGHTS.ts @@ -5,8 +5,6 @@ export const ADMIN_RIGHTS = [ RIGHTS.DELETE_USER, RIGHTS.UNDELETE_USER, RIGHTS.COMMUNITY_UPDATE, - RIGHTS.COMMUNITY_BY_UUID, - RIGHTS.COMMUNITY_BY_IDENTIFIER, - RIGHTS.HOME_COMMUNITY, + RIGHTS.COMMUNITY_WITH_API_KEYS, RIGHTS.PROJECT_BRANDING_MUTATE, ] diff --git a/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts b/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts index 399b7c2d4..9b4c56eaa 100644 --- a/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts +++ b/backend/src/auth/DLT_CONNECTOR_RIGHTS.ts @@ -1,3 +1,3 @@ import { RIGHTS } from './RIGHTS' -export const DLT_CONNECTOR_RIGHTS = [RIGHTS.COMMUNITY_BY_IDENTIFIER, RIGHTS.HOME_COMMUNITY] +export const DLT_CONNECTOR_RIGHTS = [RIGHTS.COMMUNITIES, RIGHTS.COMMUNITY_UPDATE] diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index 012a4e627..d26bdc702 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -69,9 +69,7 @@ export enum RIGHTS { SET_USER_ROLE = 'SET_USER_ROLE', DELETE_USER = 'DELETE_USER', UNDELETE_USER = 'UNDELETE_USER', - COMMUNITY_BY_UUID = 'COMMUNITY_BY_UUID', - COMMUNITY_BY_IDENTIFIER = 'COMMUNITY_BY_IDENTIFIER', - HOME_COMMUNITY = 'HOME_COMMUNITY', COMMUNITY_UPDATE = 'COMMUNITY_UPDATE', + COMMUNITY_WITH_API_KEYS = 'COMMUNITY_WITH_API_KEYS', PROJECT_BRANDING_MUTATE = 'PROJECT_BRANDING_MUTATE', } diff --git a/backend/src/graphql/model/AdminCommunityView.ts b/backend/src/graphql/model/AdminCommunityView.ts index 50cee146a..8a685fa86 100644 --- a/backend/src/graphql/model/AdminCommunityView.ts +++ b/backend/src/graphql/model/AdminCommunityView.ts @@ -38,7 +38,6 @@ export class AdminCommunityView { this.updatedAt = dbCom.updatedAt this.uuid = dbCom.communityUuid this.authenticatedAt = dbCom.authenticatedAt - this.gmsApiKey = dbCom.gmsApiKey this.hieroTopicId = dbCom.hieroTopicId if (dbCom.location) { this.location = Point2Location(dbCom.location as Point) diff --git a/backend/src/graphql/model/Community.ts b/backend/src/graphql/model/Community.ts index 62cec9cf7..e5ccad59b 100644 --- a/backend/src/graphql/model/Community.ts +++ b/backend/src/graphql/model/Community.ts @@ -12,7 +12,6 @@ export class Community { this.creationDate = dbCom.creationDate this.uuid = dbCom.communityUuid this.authenticatedAt = dbCom.authenticatedAt - this.gmsApiKey = dbCom.gmsApiKey this.hieroTopicId = dbCom.hieroTopicId } @@ -40,9 +39,6 @@ export class Community { @Field(() => Date, { nullable: true }) authenticatedAt: Date | null - @Field(() => String, { nullable: true }) - gmsApiKey: string | null - @Field(() => String, { nullable: true }) hieroTopicId: string | null } diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index c9c925a2e..20a3680e3 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -324,6 +324,10 @@ describe('CommunityResolver', () => { beforeEach(async () => { jest.clearAllMocks() + await userFactory(testEnv, peterLustig) + // login as admin + await mutate({ mutation: login, variables: peterLoginData }) + comHomeCom1 = DbCommunity.create() comHomeCom1.foreign = false comHomeCom1.url = 'http://localhost' @@ -547,13 +551,10 @@ describe('CommunityResolver', () => { describe('with empty list', () => { beforeEach(async () => { - await cleanDB() - jest.clearAllMocks() + await DbCommunity.clear() }) it('returns no community entry', async () => { - // const result: Community[] = await query({ query: getCommunities }) - // expect(result.length).toEqual(0) await expect(query({ query: communitiesQuery })).resolves.toMatchObject({ data: { communities: [], @@ -785,7 +786,6 @@ describe('CommunityResolver', () => { ).resolves.toMatchObject({ data: { updateHomeCommunity: { - id: expect.any(Number), foreign: homeCom?.foreign, name: homeCom?.name, description: homeCom?.description, diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index a46e30144..5fe7eea44 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -35,7 +35,7 @@ export class CommunityResolver { ) } - @Authorized([RIGHTS.COMMUNITIES]) + @Authorized([RIGHTS.COMMUNITY_WITH_API_KEYS]) @Query(() => [AdminCommunityView]) async allCommunities(@Args() paginated: Paginated): Promise { // communityUUID could be oneTimePassCode (uint32 number) @@ -54,7 +54,7 @@ export class CommunityResolver { return dbCommunities.map((dbCom: DbCommunity) => new Community(dbCom)) } - @Authorized([RIGHTS.COMMUNITY_BY_IDENTIFIER]) + @Authorized([RIGHTS.COMMUNITIES]) @Query(() => Community) async communityByIdentifier( @Arg('communityIdentifier') communityIdentifier: string, @@ -67,7 +67,7 @@ export class CommunityResolver { return new Community(community) } - @Authorized([RIGHTS.HOME_COMMUNITY]) + @Authorized([RIGHTS.COMMUNITIES]) @Query(() => Community) async homeCommunity(): Promise { const community = await getHomeCommunity() @@ -78,10 +78,10 @@ export class CommunityResolver { } @Authorized([RIGHTS.COMMUNITY_UPDATE]) - @Mutation(() => Community) + @Mutation(() => AdminCommunityView) async updateHomeCommunity( @Args() { uuid, gmsApiKey, location, hieroTopicId }: EditCommunityInput, - ): Promise { + ): Promise { const homeCom = await getCommunityByUuid(uuid) if (!homeCom) { throw new LogError('HomeCommunity with uuid not found: ', uuid) @@ -101,6 +101,6 @@ export class CommunityResolver { homeCom.hieroTopicId = hieroTopicId ?? null await DbCommunity.save(homeCom) } - return new Community(homeCom) + return new AdminCommunityView(homeCom) } } diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index ec0a966a8..e42e738f2 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -375,7 +375,6 @@ export const logout = gql` export const updateHomeCommunityQuery = gql` mutation ($uuid: String!, $gmsApiKey: String!) { updateHomeCommunity(uuid: $uuid, gmsApiKey: $gmsApiKey) { - id foreign name description diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index 5a8e06cc0..466e96516 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -146,7 +146,6 @@ export const communitiesQuery = gql` creationDate uuid authenticatedAt - gmsApiKey } } ` @@ -162,7 +161,6 @@ export const getCommunityByIdentifierQuery = gql` creationDate uuid authenticatedAt - gmsApiKey } } ` @@ -178,7 +176,6 @@ export const getHomeCommunityQuery = gql` creationDate uuid authenticatedAt - gmsApiKey } } ` From ad1185daf89a68b7499107c386c836119e489350 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 10:33:43 +0200 Subject: [PATCH 011/107] fix --- .../resolver/CommunityResolver.test.ts | 8 ------- .../src/graphql/resolver/CommunityResolver.ts | 21 ------------------- 2 files changed, 29 deletions(-) diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index c952baf1b..5e7d929e2 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -227,14 +227,6 @@ describe('CommunityResolver', () => { let foreignCom4: DbFederatedCommunity beforeEach(async () => { -<<<<<<< HEAD -======= - jest.clearAllMocks() - await userFactory(testEnv, peterLustig) - // login as admin - await mutate({ mutation: login, variables: peterLoginData }) - ->>>>>>> refactor_community_auth comHomeCom1 = DbCommunity.create() comHomeCom1.foreign = false comHomeCom1.url = 'http://localhost' diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index cd199900a..c3604812e 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -24,24 +24,6 @@ import { CONFIG } from '@/config' @Resolver() export class CommunityResolver { -<<<<<<< HEAD -======= - @Authorized([RIGHTS.COMMUNITIES]) - @Query(() => [FederatedCommunity]) - async getCommunities(): Promise { - const dbFederatedCommunities: DbFederatedCommunity[] = await DbFederatedCommunity.find({ - order: { - foreign: 'ASC', - createdAt: 'DESC', - lastAnnouncedAt: 'DESC', - }, - }) - return dbFederatedCommunities.map( - (dbCom: DbFederatedCommunity) => new FederatedCommunity(dbCom), - ) - } - ->>>>>>> refactor_community_auth @Authorized([RIGHTS.COMMUNITY_WITH_API_KEYS]) @Query(() => [AdminCommunityView]) async allCommunities(@Args() paginated: Paginated): Promise { @@ -113,10 +95,7 @@ export class CommunityResolver { } await DbCommunity.save(homeCom) } -<<<<<<< HEAD -======= ->>>>>>> refactor_community_auth return new AdminCommunityView(homeCom) } } From ba6a390c7a9ede69309274d58e9d69ffe205bdbb Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 10:35:18 +0200 Subject: [PATCH 012/107] rollback accidently changes --- backend/src/auth/RIGHTS.ts | 1 - backend/src/auth/USER_RIGHTS.ts | 1 - backend/src/federation/client/FederationClientFactory.ts | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index 30027086f..d26bdc702 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -35,7 +35,6 @@ export enum RIGHTS { UPDATE_CONTRIBUTION = 'UPDATE_CONTRIBUTION', LIST_CONTRIBUTION_LINKS = 'LIST_CONTRIBUTION_LINKS', COMMUNITY_STATISTICS = 'COMMUNITY_STATISTICS', - COMMUNITY_STATUS = 'COMMUNITY_STATUS', SEARCH_ADMIN_USERS = 'SEARCH_ADMIN_USERS', CREATE_CONTRIBUTION_MESSAGE = 'CREATE_CONTRIBUTION_MESSAGE', LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES', diff --git a/backend/src/auth/USER_RIGHTS.ts b/backend/src/auth/USER_RIGHTS.ts index 83ce9d871..3f08d1160 100644 --- a/backend/src/auth/USER_RIGHTS.ts +++ b/backend/src/auth/USER_RIGHTS.ts @@ -26,7 +26,6 @@ export const USER_RIGHTS = [ RIGHTS.SEARCH_ADMIN_USERS, RIGHTS.LIST_CONTRIBUTION_LINKS, RIGHTS.COMMUNITY_STATISTICS, - RIGHTS.COMMUNITY_STATUS, RIGHTS.CREATE_CONTRIBUTION_MESSAGE, RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES, RIGHTS.OPEN_CREATIONS, diff --git a/backend/src/federation/client/FederationClientFactory.ts b/backend/src/federation/client/FederationClientFactory.ts index 87794882d..926c3c180 100644 --- a/backend/src/federation/client/FederationClientFactory.ts +++ b/backend/src/federation/client/FederationClientFactory.ts @@ -4,7 +4,7 @@ import { FederationClient as V1_0_FederationClient } from '@/federation/client/1 import { FederationClient as V1_1_FederationClient } from '@/federation/client/1_1/FederationClient' import { ApiVersionType, ensureUrlEndsWithSlash } from 'core' -export type FederationClient = V1_0_FederationClient | V1_1_FederationClient +type FederationClient = V1_0_FederationClient | V1_1_FederationClient interface FederationClientInstance { id: number From 05f3742525282c4ea0fff5e6a0a3dea6ee8e2c29 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 10:40:10 +0200 Subject: [PATCH 013/107] rollback --- backend/src/graphql/resolver/CommunityResolver.ts | 8 +------- backend/src/graphql/resolver/TransactionResolver.ts | 2 +- backend/test/helpers.ts | 6 ++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index c3604812e..675ec858f 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -78,24 +78,18 @@ export class CommunityResolver { if (homeCom.foreign) { throw new LogError('Error: Only the HomeCommunity could be modified!') } - if ( homeCom.gmsApiKey !== gmsApiKey || homeCom.location !== location || homeCom.hieroTopicId !== hieroTopicId ) { - // TODO: think about this, it is really expected to delete gmsApiKey if no new one is given? homeCom.gmsApiKey = gmsApiKey ?? null if (location) { homeCom.location = Location2Point(location) } - // update only with new value, don't overwrite existing value with null or undefined! - if (hieroTopicId) { - homeCom.hieroTopicId = hieroTopicId - } + homeCom.hieroTopicId = hieroTopicId ?? null await DbCommunity.save(homeCom) } - return new AdminCommunityView(homeCom) } } diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index fa6170013..a61356e29 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -447,7 +447,7 @@ export class TransactionResolver { recipientCommunityIdentifier, ) if (!recipientUser) { - throw new LogError('The recipient user was not found', { recipientIdentifier, recipientCommunityIdentifier }) + throw new LogError('The recipient user was not found', recipientUser) } logger.addContext('to', recipientUser?.id) if (recipientUser.foreign) { diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts index ff0c513e7..c7f533931 100644 --- a/backend/test/helpers.ts +++ b/backend/test/helpers.ts @@ -39,13 +39,11 @@ export const testEnvironment = async (testLogger = getLogger('apollo'), testI18n } export const resetEntity = async (entity: any) => { - // delete data and reset autoincrement! - await entity.clear() - /*const items = await entity.find({ withDeleted: true }) + const items = await entity.find({ withDeleted: true }) if (items.length > 0) { const ids = items.map((e: any) => e.id) await entity.delete(ids) - }*/ + } } export const resetToken = () => { From 2bcfdf4edd0dc7a939cdeae51ef8ae7f61606042 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 14:12:57 +0200 Subject: [PATCH 014/107] small layout adjusments --- frontend/src/components/Breadcrumb/breadcrumb.vue | 5 +++++ frontend/src/components/Menu/Navbar.vue | 4 ++-- frontend/src/components/Overview/CardUserSearch.vue | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Breadcrumb/breadcrumb.vue b/frontend/src/components/Breadcrumb/breadcrumb.vue index 305b34fe7..e89c9ea83 100644 --- a/frontend/src/components/Breadcrumb/breadcrumb.vue +++ b/frontend/src/components/Breadcrumb/breadcrumb.vue @@ -23,4 +23,9 @@ export default { margin-bottom: 1rem; padding: 0.75rem 1rem; } +@media screen and (max-width: 450px) { + .page-breadcrumb { + margin-top: 3rem; + } +} diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index f2aa3c038..e38ba3b8a 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -32,10 +32,10 @@ />
-
+
{{ username.username }}
-
+
{ onError(() => { isUserSearchDisabled.value = true if (gmsAllowed.value && gmsUserLocationExists.value) { - toastError('authenticateGmsUserSearch failed!') + // setting isUserSearchDisabled.value to true will show that GMS is offline, no need to further post to the user + // toastError('authenticateGmsUserSearch failed!') } else if (gmsAllowed.value && !gmsUserLocationExists.value) { // toastError('capture your location first!') // eslint-disable-next-line no-console From e0e7c312d40852fa904836b5fbebf9c8308f3942 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 14:16:13 +0200 Subject: [PATCH 015/107] fix stylelint --- frontend/src/components/Breadcrumb/breadcrumb.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Breadcrumb/breadcrumb.vue b/frontend/src/components/Breadcrumb/breadcrumb.vue index e89c9ea83..7372ecc6e 100644 --- a/frontend/src/components/Breadcrumb/breadcrumb.vue +++ b/frontend/src/components/Breadcrumb/breadcrumb.vue @@ -23,7 +23,8 @@ export default { margin-bottom: 1rem; padding: 0.75rem 1rem; } -@media screen and (max-width: 450px) { + +@media screen and (width <= 450px) { .page-breadcrumb { margin-top: 3rem; } From 753a9a5b4664f86aa17692fd6469e064a83fa927 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 4 Oct 2025 20:24:42 +0200 Subject: [PATCH 016/107] show decay on linked transaction confirmation --- .../resolver/TransactionLinkResolver.ts | 7 ++- .../GddSend/TransactionConfirmationLink.vue | 28 ++++++++--- frontend/src/constants.js | 3 ++ frontend/src/locales/de.json | 4 ++ frontend/src/locales/en.json | 4 ++ frontend/src/locales/es.json | 4 ++ frontend/src/locales/fr.json | 4 ++ frontend/src/locales/nl.json | 4 ++ shared/src/const/index.ts | 1 + shared/src/logic/decay.test.ts | 48 ++++++++++++++++++- shared/src/logic/decay.ts | 9 +++- 11 files changed, 104 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 8acbd7b53..faae12e56 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -14,7 +14,7 @@ import { User } from '@model/User' import { QueryLinkResult } from '@union/QueryLinkResult' import { Decay, interpretEncryptedTransferArgs, TransactionTypeId } from 'core' import { - AppDatabase, Community as DbCommunity, Contribution as DbContribution, + AppDatabase, Contribution as DbContribution, ContributionLink as DbContributionLink, FederatedCommunity as DbFederatedCommunity, Transaction as DbTransaction, TransactionLink as DbTransactionLink, User as DbUser, @@ -36,7 +36,7 @@ import { Context, getClientTimezoneOffset, getUser } from '@/server/context' import { calculateBalance } from '@/util/validate' import { fullName } from 'core' import { TRANSACTION_LINK_LOCK, TRANSACTIONS_LOCK } from 'database' -import { calculateDecay, decode, DisburseJwtPayloadType, encode, encryptAndSign, EncryptedJWEJwtPayloadType, RedeemJwtPayloadType, verify } from 'shared' +import { calculateDecay, compoundInterest, decayFormula, decode, DisburseJwtPayloadType, encode, encryptAndSign, EncryptedJWEJwtPayloadType, RedeemJwtPayloadType, verify } from 'shared' import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const' import { DisbursementClient as V1_0_DisbursementClient } from '@/federation/client/1_0/DisbursementClient' @@ -48,7 +48,6 @@ import { randombytes_random } from 'sodium-native' import { executeTransaction } from './TransactionResolver' import { getAuthenticatedCommunities, - getCommunityByIdentifier, getCommunityByPublicKey, getCommunityByUuid, } from './util/communities' @@ -90,7 +89,7 @@ export class TransactionLinkResolver { const createdDate = new Date() const validUntil = transactionLinkExpireDate(createdDate) - const holdAvailableAmount = amount.minus(calculateDecay(amount, createdDate, validUntil).decay) + const holdAvailableAmount = compoundInterest(amount, CODE_VALID_DAYS_DURATION * 24 * 60 * 60) // validate amount const sendBalance = await calculateBalance(user.id, holdAvailableAmount.mul(-1), createdDate) diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue index f31d043a0..d964f3e80 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue @@ -20,20 +20,29 @@ {{ $t('advanced-calculation') }} - {{ $t('form.current_balance') }} + {{ $t('form.current_available') }} {{ $filters.GDD(balance) }} - {{ $t('form.your_amount') }} + {{ $t('form.link_amount') }} - + {{ $filters.GDD(amount * -1) }} - {{ $t('form.new_balance') }} - {{ $filters.GDD(balance - amount) }} + {{ $t('decay.decay') }} + {{ $filters.GDD(amount - blockedAmount) }} + + + {{ $t('form.available_after') }} + {{ $filters.GDD(balance - blockedAmount) }} + + + + {{ $t('form.link_decay_description') }} + @@ -57,6 +66,7 @@