From 3ff399064b7e10cd578162c3e42121cbc07c36e1 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 26 Apr 2025 08:01:43 +0200 Subject: [PATCH] auto applied changes from biome --- .vscode/settings.json | 3 + backend/biome.json | 276 +++++++++--------- .../apis/dltConnector/DltConnectorClient.ts | 2 +- backend/src/apis/gms/ExportUsers.ts | 2 +- backend/src/apis/humhub/ExportUsers.ts | 2 +- .../humhub/compareHumhubUserDbUser.test.ts | 98 +++---- backend/src/apis/humhub/syncUser.test.ts | 2 +- backend/src/apis/humhub/syncUser.ts | 2 +- backend/src/config/index.ts | 4 +- backend/src/config/schema.ts | 8 +- backend/src/data/PublishName.logic.ts | 8 +- .../src/emails/sendEmailTranslated.test.ts | 2 +- backend/src/emails/sendEmailVariants.test.ts | 8 +- .../federation/validateCommunities.test.ts | 2 +- .../src/graphql/arg/ContributionLinkArgs.ts | 4 +- .../graphql/arg/ContributionMessageArgs.ts | 4 +- backend/src/graphql/arg/Paginated.ts | 4 +- .../arg/SearchContributionsFilterArgs.ts | 2 +- backend/src/graphql/arg/SetUserRoleArgs.ts | 4 +- .../src/graphql/arg/TransactionSendArgs.ts | 2 +- backend/src/graphql/directive/isAuthorized.ts | 8 +- .../src/graphql/input/ProjectBrandingInput.ts | 4 +- .../src/graphql/model/AdminCommunityView.ts | 2 +- .../graphql/model/AdminUpdateContribution.ts | 2 +- backend/src/graphql/model/Balance.ts | 2 +- backend/src/graphql/model/ChatGptMessage.ts | 2 +- backend/src/graphql/model/Community.ts | 2 +- .../src/graphql/model/CommunityStatistics.ts | 2 +- backend/src/graphql/model/Contribution.ts | 2 +- backend/src/graphql/model/ContributionLink.ts | 2 +- .../src/graphql/model/ContributionLinkList.ts | 2 +- backend/src/graphql/model/Decay.ts | 2 +- .../src/graphql/model/FederatedCommunity.ts | 2 +- backend/src/graphql/model/GdtEntry.ts | 2 +- backend/src/graphql/model/GdtEntryList.ts | 2 +- backend/src/graphql/model/KlickTipp.ts | 2 +- backend/src/graphql/model/OpenCreation.ts | 2 +- backend/src/graphql/model/Pagination.ts | 2 +- backend/src/graphql/model/ProjectBranding.ts | 2 +- backend/src/graphql/model/Space.ts | 2 +- backend/src/graphql/model/SpaceList.ts | 2 +- backend/src/graphql/model/Transaction.ts | 4 +- backend/src/graphql/model/TransactionLink.ts | 2 +- backend/src/graphql/model/TransactionList.ts | 2 +- .../graphql/model/UnconfirmedContribution.ts | 2 +- backend/src/graphql/model/User.ts | 2 +- backend/src/graphql/model/UserAdmin.ts | 2 +- backend/src/graphql/model/UserContact.ts | 2 +- .../src/graphql/resolver/AiChatResolver.ts | 4 +- .../src/graphql/resolver/BalanceResolver.ts | 2 +- .../resolver/CommunityResolver.test.ts | 6 +- .../src/graphql/resolver/CommunityResolver.ts | 4 +- .../resolver/ContributionLinkResolver.test.ts | 4 +- .../resolver/ContributionLinkResolver.ts | 6 +- .../ContributionMessageResolver.test.ts | 4 +- .../resolver/ContributionMessageResolver.ts | 2 +- .../resolver/ContributionResolver.test.ts | 20 +- .../graphql/resolver/ContributionResolver.ts | 16 +- .../graphql/resolver/EmailOptinCodes.test.ts | 4 +- backend/src/graphql/resolver/GdtResolver.ts | 4 +- .../resolver/KlicktippResolver.test.ts | 2 +- .../src/graphql/resolver/KlicktippResolver.ts | 4 +- .../resolver/ProjectBrandingResolver.ts | 2 +- .../graphql/resolver/StatisticsResolver.ts | 2 +- .../resolver/TransactionLinkResolver.test.ts | 12 +- .../resolver/TransactionLinkResolver.ts | 8 +- .../resolver/TransactionResolver.test.ts | 2 +- .../graphql/resolver/TransactionResolver.ts | 10 +- .../src/graphql/resolver/UserResolver.test.ts | 26 +- backend/src/graphql/resolver/UserResolver.ts | 48 +-- .../src/graphql/resolver/semaphore.test.ts | 8 +- .../graphql/resolver/util/creations.test.ts | 4 +- .../resolver/util/extractGraphQLFields.ts | 2 +- .../resolver/util/findUserByIdentifier.ts | 4 +- .../src/graphql/resolver/util/findUsers.ts | 2 +- .../resolver/util/processXComSendCoins.ts | 4 +- .../sendTransactionsToDltConnector.test.ts | 4 +- .../util/settlePendingSenderTransaction.ts | 2 +- .../resolver/util/transactionLinkList.ts | 2 +- .../resolver/util/validateAlias.test.ts | 4 +- .../validator/ContributionStatusArray.ts | 2 +- backend/src/graphql/validator/DateString.ts | 2 +- backend/src/graphql/validator/Decimal.ts | 2 +- backend/src/graphql/validator/Location.ts | 2 +- .../AbstractUnconfirmedContribution.role.ts | 2 +- ...nfirmedContributionAdminAddMessage.role.ts | 5 +- .../UnconfirmedContributionUser.role.ts | 5 +- ...onfirmedContributionUserAddMessage.role.ts | 5 +- .../UpdateUnconfirmedContribution.context.ts | 2 +- backend/src/password/EncryptionWorker.ts | 10 +- backend/src/password/PasswordEncryptor.ts | 2 +- .../src/password/__mocks__/EncryptorUtils.ts | 16 +- backend/src/seeds/factory/contributionLink.ts | 2 +- backend/src/seeds/factory/creation.ts | 2 +- backend/src/seeds/factory/transactionLink.ts | 2 +- backend/src/seeds/index.ts | 2 +- backend/src/server/createServer.ts | 2 +- backend/src/typeorm/connection.ts | 2 +- backend/src/util/communityUser.ts | 2 +- backend/src/util/decay.test.ts | 2 +- backend/src/util/klicktipp.test.ts | 2 +- backend/src/util/klicktipp.ts | 2 +- backend/src/util/virtualTransactions.ts | 2 +- 103 files changed, 411 insertions(+), 399 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9634ae8a9..534f8367f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,8 @@ { "git.ignoreLimitWarning": true, + "[javascript]": { + "editor.defaultFormatter": "biomejs.biome" + }, "sqltools.connections": [ { "mysqlOptions": { diff --git a/backend/biome.json b/backend/biome.json index cd6a1bb59..84d3a3a29 100644 --- a/backend/biome.json +++ b/backend/biome.json @@ -1,125 +1,125 @@ { - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", - "vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false }, - "files": { - "ignoreUnknown": false, - "ignore": ["build", "node_modules", "coverage"], - "include": ["./src/**/*.js", "./src/**/*.ts"] - }, - "formatter": { - "enabled": true, - "useEditorconfig": true, - "formatWithErrors": false, - "indentStyle": "space", - "indentWidth": 2, - "lineEnding": "lf", - "lineWidth": 100, - "attributePosition": "auto", - "bracketSpacing": true - }, - "organizeImports": { "enabled": true }, - "linter": { - "enabled": true, - "rules": { - "recommended": false, - "complexity": { - "noExtraBooleanCast": "error", - "noMultipleSpacesInRegularExpressionLiterals": "error", - "noUselessCatch": "error", - "noUselessConstructor": "error", - "noUselessLoneBlockStatements": "error", - "noUselessRename": "error", - "noUselessTernary": "error", - "noUselessUndefinedInitialization": "error", - "noVoid": "error", - "noWith": "error", - "useLiteralKeys": "error", - "useRegexLiterals": "error" - }, - "correctness": { - "noConstAssign": "error", - "noConstantCondition": "error", - "noEmptyCharacterClassInRegex": "error", - "noEmptyPattern": "error", - "noGlobalObjectCalls": "error", - "noInnerDeclarations": "error", - "noInvalidConstructorSuper": "error", - "noInvalidUseBeforeDeclaration": "error", - "noNewSymbol": "error", - "noNodejsModules": "off", - "noNonoctalDecimalEscape": "error", - "noPrecisionLoss": "error", - "noSelfAssign": "error", - "noSetterReturn": "error", - "noSwitchDeclarations": "error", - "noUndeclaredVariables": "error", - "noUnreachable": "error", - "noUnreachableSuper": "error", - "noUnsafeFinally": "error", - "noUnsafeOptionalChaining": "error", - "noUnusedLabels": "error", - "noUnusedVariables": "error", - "useArrayLiterals": "error", - "useIsNan": "error", - "useValidForDirection": "error", - "useYield": "error" - }, - "security": { "noGlobalEval": "error" }, - "style": { - "noCommaOperator": "error", - "noDefaultExport": "error", - "noVar": "warn", - "noYodaExpression": "error", - "useBlockStatements": "error", - "useConsistentBuiltinInstantiation": "error", - "useConst": "error", - "useSingleVarDeclarator": "error" - }, - "suspicious": { - "noAsyncPromiseExecutor": "error", - "noCatchAssign": "error", - "noClassAssign": "error", - "noCompareNegZero": "error", - "noConsole": "error", - "noControlCharactersInRegex": "error", - "noDebugger": "error", - "noDoubleEquals": "error", - "noDuplicateCase": "error", - "noDuplicateClassMembers": "error", - "noDuplicateObjectKeys": "error", - "noDuplicateParameters": "error", - "noEmptyBlockStatements": "error", - "noFallthroughSwitchClause": "error", - "noFunctionAssign": "error", - "noGlobalAssign": "error", - "noImportAssign": "error", - "noMisleadingCharacterClass": "error", - "noPrototypeBuiltins": "error", - "noRedeclare": "error", - "noSelfCompare": "error", - "noShadowRestrictedNames": "error", - "noSparseArray": "error", - "noUnsafeNegation": "error", - "useDefaultSwitchClauseLast": "error", - "useGetterReturn": "error", - "useValidTypeof": "error" - } - }, - "ignore": ["**/node_modules", "**/*.min.js", "**/build", "**/coverage"] - }, - "javascript": { - "formatter": { - "jsxQuoteStyle": "single", - "quoteProperties": "asNeeded", - "trailingCommas": "all", - "semicolons": "asNeeded", - "arrowParentheses": "always", - "bracketSameLine": false, - "quoteStyle": "single", - "attributePosition": "auto", - "bracketSpacing": true - }, - "globals": [ + "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", + "vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false }, + "files": { + "ignoreUnknown": false, + "ignore": ["build", "node_modules", "coverage"], + "include": ["./src/**/*.js", "./src/**/*.ts"] + }, + "formatter": { + "enabled": true, + "useEditorconfig": true, + "formatWithErrors": false, + "indentStyle": "space", + "indentWidth": 2, + "lineEnding": "lf", + "lineWidth": 100, + "attributePosition": "auto", + "bracketSpacing": true + }, + "organizeImports": { "enabled": true }, + "linter": { + "enabled": true, + "rules": { + "recommended": false, + "complexity": { + "noExtraBooleanCast": "error", + "noMultipleSpacesInRegularExpressionLiterals": "error", + "noUselessCatch": "error", + "noUselessConstructor": "error", + "noUselessLoneBlockStatements": "error", + "noUselessRename": "error", + "noUselessTernary": "error", + "noUselessUndefinedInitialization": "error", + "noVoid": "error", + "noWith": "error", + "useLiteralKeys": "error", + "useRegexLiterals": "error" + }, + "correctness": { + "noConstAssign": "error", + "noConstantCondition": "error", + "noEmptyCharacterClassInRegex": "error", + "noEmptyPattern": "error", + "noGlobalObjectCalls": "error", + "noInnerDeclarations": "error", + "noInvalidConstructorSuper": "error", + "noInvalidUseBeforeDeclaration": "error", + "noNewSymbol": "error", + "noNodejsModules": "off", + "noNonoctalDecimalEscape": "error", + "noPrecisionLoss": "error", + "noSelfAssign": "error", + "noSetterReturn": "error", + "noSwitchDeclarations": "error", + "noUndeclaredVariables": "error", + "noUnreachable": "error", + "noUnreachableSuper": "error", + "noUnsafeFinally": "error", + "noUnsafeOptionalChaining": "error", + "noUnusedLabels": "error", + "noUnusedVariables": "error", + "useArrayLiterals": "error", + "useIsNan": "error", + "useValidForDirection": "error", + "useYield": "error" + }, + "security": { "noGlobalEval": "error" }, + "style": { + "noCommaOperator": "error", + "noDefaultExport": "error", + "noVar": "warn", + "noYodaExpression": "error", + "useBlockStatements": "error", + "useConsistentBuiltinInstantiation": "error", + "useConst": "error", + "useSingleVarDeclarator": "error" + }, + "suspicious": { + "noAsyncPromiseExecutor": "error", + "noCatchAssign": "error", + "noClassAssign": "error", + "noCompareNegZero": "error", + "noConsole": "error", + "noControlCharactersInRegex": "error", + "noDebugger": "error", + "noDoubleEquals": "error", + "noDuplicateCase": "error", + "noDuplicateClassMembers": "error", + "noDuplicateObjectKeys": "error", + "noDuplicateParameters": "error", + "noEmptyBlockStatements": "error", + "noFallthroughSwitchClause": "error", + "noFunctionAssign": "error", + "noGlobalAssign": "error", + "noImportAssign": "error", + "noMisleadingCharacterClass": "error", + "noPrototypeBuiltins": "error", + "noRedeclare": "error", + "noSelfCompare": "error", + "noShadowRestrictedNames": "error", + "noSparseArray": "error", + "noUnsafeNegation": "error", + "useDefaultSwitchClauseLast": "error", + "useGetterReturn": "error", + "useValidTypeof": "error" + } + }, + "ignore": ["**/node_modules", "**/*.min.js", "**/build", "**/coverage"] + }, + "javascript": { + "formatter": { + "jsxQuoteStyle": "single", + "quoteProperties": "asNeeded", + "trailingCommas": "all", + "semicolons": "asNeeded", + "arrowParentheses": "always", + "bracketSameLine": false, + "quoteStyle": "single", + "attributePosition": "auto", + "bracketSpacing": true + }, + "globals": [ "document", "navigator", "window", @@ -127,21 +127,21 @@ "test", "it", "expect", - "beforeAll", - "beforeEach", - "afterAll", - "afterEach", - "jest" - ], - "parser": { - "unsafeParameterDecoratorsEnabled": true - } - }, - "overrides": [ - { - "include": ["*.ts", "*.tsx"], - "linter": { "rules": { "complexity": { "noVoid": "error" } } } - }, - { "include": ["*.test.ts"], "linter": { "rules": {} } } - ] + "beforeAll", + "beforeEach", + "afterAll", + "afterEach", + "jest" + ], + "parser": { + "unsafeParameterDecoratorsEnabled": true + } + }, + "overrides": [ + { + "include": ["*.ts", "*.tsx"], + "linter": { "rules": { "complexity": { "noVoid": "error" } } } + }, + { "include": ["*.test.ts"], "linter": { "rules": {} } } + ] } diff --git a/backend/src/apis/dltConnector/DltConnectorClient.ts b/backend/src/apis/dltConnector/DltConnectorClient.ts index 765d09fb4..0f3a6832b 100644 --- a/backend/src/apis/dltConnector/DltConnectorClient.ts +++ b/backend/src/apis/dltConnector/DltConnectorClient.ts @@ -1,5 +1,5 @@ import { Transaction as DbTransaction } from '@entity/Transaction' -import { gql, GraphQLClient } from 'graphql-request' +import { GraphQLClient, gql } from 'graphql-request' import { CONFIG } from '@/config' import { TransactionTypeId } from '@/graphql/enum/TransactionTypeId' diff --git a/backend/src/apis/gms/ExportUsers.ts b/backend/src/apis/gms/ExportUsers.ts index 43d8200c6..5e2f9f213 100644 --- a/backend/src/apis/gms/ExportUsers.ts +++ b/backend/src/apis/gms/ExportUsers.ts @@ -12,8 +12,8 @@ import { User as DbUser } from '@entity/User' import { CONFIG } from '@/config' import { getHomeCommunity } from '@/graphql/resolver/util/communities' import { sendUserToGms } from '@/graphql/resolver/util/sendUserToGms' -import { createServer } from '@/server/createServer' import { LogError } from '@/server/LogError' +import { createServer } from '@/server/createServer' import { backendLogger as logger } from '@/server/logger' CONFIG.EMAIL = false diff --git a/backend/src/apis/humhub/ExportUsers.ts b/backend/src/apis/humhub/ExportUsers.ts index b3af27f7d..bfa44af55 100644 --- a/backend/src/apis/humhub/ExportUsers.ts +++ b/backend/src/apis/humhub/ExportUsers.ts @@ -4,8 +4,8 @@ import { User } from '@entity/User' import { CONFIG } from '@/config' import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' -import { Connection } from '@/typeorm/connection' import { checkDBVersion } from '@/typeorm/DBVersion' +import { Connection } from '@/typeorm/connection' import { HumHubClient } from './HumHubClient' import { GetUser } from './model/GetUser' diff --git a/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts b/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts index cc636d17a..16ec81b24 100644 --- a/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts +++ b/backend/src/apis/humhub/compareHumhubUserDbUser.test.ts @@ -7,58 +7,58 @@ import { GetUser } from './model/GetUser' const defaultUser = communityDbUser describe('isHumhubUserIdenticalToDbUser', () => { - beforeEach(() => { - defaultUser.firstName = 'first name' - defaultUser.lastName = 'last name' - defaultUser.alias = 'alias' - defaultUser.emailContact.email = 'email@gmail.com' - defaultUser.language = 'en' - }) + beforeEach(() => { + defaultUser.firstName = 'first name' + defaultUser.lastName = 'last name' + defaultUser.alias = 'alias' + defaultUser.emailContact.email = 'email@gmail.com' + defaultUser.language = 'en' + }) - it('Should return true because humhubUser was created from entity user', () => { - const humhubUser = new GetUser(defaultUser, 1) - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(true) - }) + it('Should return true because humhubUser was created from entity user', () => { + const humhubUser = new GetUser(defaultUser, 1) + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(true) + }) - it('Should return false because first name differ', () => { - const humhubUser = new GetUser(defaultUser, 1) - humhubUser.profile.firstname = 'changed first name' - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(false) - }) - it('Should return false because last name differ', () => { - const humhubUser = new GetUser(defaultUser, 1) - humhubUser.profile.lastname = 'changed last name' - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(false) - }) - it('Should return false because username differ', () => { - const humhubUser = new GetUser(defaultUser, 1) - humhubUser.account.username = 'changed username' - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(false) - }) + it('Should return false because first name differ', () => { + const humhubUser = new GetUser(defaultUser, 1) + humhubUser.profile.firstname = 'changed first name' + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(false) + }) + it('Should return false because last name differ', () => { + const humhubUser = new GetUser(defaultUser, 1) + humhubUser.profile.lastname = 'changed last name' + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(false) + }) + it('Should return false because username differ', () => { + const humhubUser = new GetUser(defaultUser, 1) + humhubUser.account.username = 'changed username' + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(false) + }) - it('Should return false because email differ', () => { - const humhubUser = new GetUser(defaultUser, 1) - humhubUser.account.email = 'new@gmail.com' - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(false) - }) + it('Should return false because email differ', () => { + const humhubUser = new GetUser(defaultUser, 1) + humhubUser.account.email = 'new@gmail.com' + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(false) + }) - it('Should return false because language differ', () => { - const humhubUser = new GetUser(defaultUser, 1) - humhubUser.account.language = 'de' - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(false) - }) + it('Should return false because language differ', () => { + const humhubUser = new GetUser(defaultUser, 1) + humhubUser.account.language = 'de' + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(false) + }) - it('Should return false because gradido_address differ', () => { - const humhubUser = new GetUser(defaultUser, 1) - // eslint-disable-next-line camelcase - humhubUser.profile.gradido_address = 'changed gradido address' - const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) - expect(result).toBe(false) - }) + it('Should return false because gradido_address differ', () => { + const humhubUser = new GetUser(defaultUser, 1) + // eslint-disable-next-line camelcase + humhubUser.profile.gradido_address = 'changed gradido address' + const result = isHumhubUserIdenticalToDbUser(humhubUser, defaultUser) + expect(result).toBe(false) + }) }) diff --git a/backend/src/apis/humhub/syncUser.test.ts b/backend/src/apis/humhub/syncUser.test.ts index 20a6b2c33..2327e0c24 100644 --- a/backend/src/apis/humhub/syncUser.test.ts +++ b/backend/src/apis/humhub/syncUser.test.ts @@ -3,7 +3,7 @@ import { User } from '@entity/User' import { UserContact } from '@entity/UserContact' import { GetUser } from './model/GetUser' -import { syncUser, ExecutedHumhubAction } from './syncUser' +import { ExecutedHumhubAction, syncUser } from './syncUser' jest.mock('@/apis/humhub/HumHubClient') diff --git a/backend/src/apis/humhub/syncUser.ts b/backend/src/apis/humhub/syncUser.ts index fc6fcc99b..db9275e64 100644 --- a/backend/src/apis/humhub/syncUser.ts +++ b/backend/src/apis/humhub/syncUser.ts @@ -2,8 +2,8 @@ import { User } from '@entity/User' import { LogError } from '@/server/LogError' -import { isHumhubUserIdenticalToDbUser } from './compareHumhubUserDbUser' import { HumHubClient } from './HumHubClient' +import { isHumhubUserIdenticalToDbUser } from './compareHumhubUserDbUser' import { GetUser } from './model/GetUser' import { PostUser } from './model/PostUser' diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 4ef64f3ea..3420cd106 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -100,11 +100,11 @@ const email = { EMAIL_LINK_OVERVIEW: COMMUNITY_URL + (process.env.EMAIL_LINK_OVERVIEW_PATH ?? '/overview'), // time in minutes a optin code is valid EMAIL_CODE_VALID_TIME: process.env.EMAIL_CODE_VALID_TIME - ? parseInt(process.env.EMAIL_CODE_VALID_TIME) ?? 1440 + ? (parseInt(process.env.EMAIL_CODE_VALID_TIME) ?? 1440) : 1440, // time in minutes that must pass to request a new optin code EMAIL_CODE_REQUEST_TIME: process.env.EMAIL_CODE_REQUEST_TIME - ? parseInt(process.env.EMAIL_CODE_REQUEST_TIME) ?? 10 + ? (parseInt(process.env.EMAIL_CODE_REQUEST_TIME) ?? 10) : 10, } diff --git a/backend/src/config/schema.ts b/backend/src/config/schema.ts index e5a2f786e..da61b8988 100644 --- a/backend/src/config/schema.ts +++ b/backend/src/config/schema.ts @@ -1,19 +1,19 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ // eslint-disable-next-line import/no-unresolved import { - COMMUNITY_NAME, - COMMUNITY_URL, COMMUNITY_DESCRIPTION, + COMMUNITY_NAME, COMMUNITY_SUPPORT_MAIL, + COMMUNITY_URL, + DB_DATABASE, DB_HOST, DB_PASSWORD, DB_PORT, DB_USER, DB_VERSION, - DB_DATABASE, DECAY_START_TIME, - GDT_API_URL, GDT_ACTIVE, + GDT_API_URL, GMS_ACTIVE, GRAPHIQL, HUMHUB_ACTIVE, diff --git a/backend/src/data/PublishName.logic.ts b/backend/src/data/PublishName.logic.ts index a78627d49..3befb4d3a 100644 --- a/backend/src/data/PublishName.logic.ts +++ b/backend/src/data/PublishName.logic.ts @@ -54,8 +54,8 @@ export class PublishNameLogic { return publishNameType === PublishNameType.PUBLISH_NAME_FULL ? this.user.lastName : publishNameType === PublishNameType.PUBLISH_NAME_FIRST_INITIAL - ? this.user.lastName.charAt(0) - : '' + ? this.user.lastName.charAt(0) + : '' } /** @@ -84,8 +84,8 @@ export class PublishNameLogic { return this.isUsernameFromAlias(publishNameType) ? this.getUsernameFromAlias() : this.isUsernameFromInitials(publishNameType) - ? this.getUsernameFromInitials() - : (this.getFirstName(publishNameType) + ' ' + this.getLastName(publishNameType)).trim() + ? this.getUsernameFromInitials() + : (this.getFirstName(publishNameType) + ' ' + this.getLastName(publishNameType)).trim() } public getUsernameFromInitials(): string { diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index f38342985..69e5d9d83 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { createTransport } from 'nodemailer' -import { logger, i18n } from '@test/testSetup' +import { i18n, logger } from '@test/testSetup' import { CONFIG } from '@/config' diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 88cd851d2..e48c42b01 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -7,23 +7,23 @@ import { ApolloServerTestClient } from 'apollo-server-testing' import { Decimal } from 'decimal.js-light' import { testEnvironment } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { i18n as localization, logger } from '@test/testSetup' import { CONFIG } from '@/config' // eslint-disable-next-line import/no-namespace import * as sendEmailTranslatedApi from './sendEmailTranslated' import { - sendAddedContributionMessageEmail, sendAccountActivationEmail, sendAccountMultiRegistrationEmail, + sendAddedContributionMessageEmail, + sendContributionChangedByModeratorEmail, sendContributionConfirmedEmail, - sendContributionDeniedEmail, sendContributionDeletedEmail, + sendContributionDeniedEmail, sendResetPasswordEmail, sendTransactionLinkRedeemedEmail, sendTransactionReceivedEmail, - sendContributionChangedByModeratorEmail, } from './sendEmailVariants' const testMailServerHost = 'localhost' diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts index 9ff8d545f..d7b26435f 100644 --- a/backend/src/federation/validateCommunities.test.ts +++ b/backend/src/federation/validateCommunities.test.ts @@ -11,7 +11,7 @@ import { ApolloServerTestClient } from 'apollo-server-testing' import { GraphQLClient } from 'graphql-request' import { Response } from 'graphql-request/dist/types' -import { testEnvironment, cleanDB } from '@test/helpers' +import { cleanDB, testEnvironment } from '@test/helpers' import { logger } from '@test/testSetup' import { validateCommunities } from './validateCommunities' diff --git a/backend/src/graphql/arg/ContributionLinkArgs.ts b/backend/src/graphql/arg/ContributionLinkArgs.ts index 97cf3dfdd..f68b6c957 100644 --- a/backend/src/graphql/arg/ContributionLinkArgs.ts +++ b/backend/src/graphql/arg/ContributionLinkArgs.ts @@ -3,10 +3,10 @@ import { Decimal } from 'decimal.js-light' import { ArgsType, Field, Int } from 'type-graphql' import { + CONTRIBUTIONLINK_NAME_MAX_CHARS, + CONTRIBUTIONLINK_NAME_MIN_CHARS, MEMO_MAX_CHARS, MEMO_MIN_CHARS, - CONTRIBUTIONLINK_NAME_MIN_CHARS, - CONTRIBUTIONLINK_NAME_MAX_CHARS, } from '@/graphql/resolver/const/const' import { isValidDateString } from '@/graphql/validator/DateString' import { IsPositiveDecimal } from '@/graphql/validator/Decimal' diff --git a/backend/src/graphql/arg/ContributionMessageArgs.ts b/backend/src/graphql/arg/ContributionMessageArgs.ts index e20686187..8c95fadbd 100644 --- a/backend/src/graphql/arg/ContributionMessageArgs.ts +++ b/backend/src/graphql/arg/ContributionMessageArgs.ts @@ -1,5 +1,5 @@ -import { IsInt, IsString, IsEnum } from 'class-validator' -import { ArgsType, Field, Int, InputType } from 'type-graphql' +import { IsEnum, IsInt, IsString } from 'class-validator' +import { ArgsType, Field, InputType, Int } from 'type-graphql' import { ContributionMessageType } from '@enum/ContributionMessageType' diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts index f66c71c21..ed39c046b 100644 --- a/backend/src/graphql/arg/Paginated.ts +++ b/backend/src/graphql/arg/Paginated.ts @@ -1,6 +1,6 @@ /* eslint-disable type-graphql/invalid-nullable-input-type */ -import { IsPositive, IsEnum } from 'class-validator' -import { ArgsType, Field, Int, InputType } from 'type-graphql' +import { IsEnum, IsPositive } from 'class-validator' +import { ArgsType, Field, InputType, Int } from 'type-graphql' import { Order } from '@enum/Order' diff --git a/backend/src/graphql/arg/SearchContributionsFilterArgs.ts b/backend/src/graphql/arg/SearchContributionsFilterArgs.ts index 7896ad67a..ad8b7747e 100644 --- a/backend/src/graphql/arg/SearchContributionsFilterArgs.ts +++ b/backend/src/graphql/arg/SearchContributionsFilterArgs.ts @@ -1,5 +1,5 @@ import { IsBoolean, IsPositive, IsString } from 'class-validator' -import { Field, ArgsType, Int, InputType } from 'type-graphql' +import { ArgsType, Field, InputType, Int } from 'type-graphql' import { ContributionStatus } from '@enum/ContributionStatus' diff --git a/backend/src/graphql/arg/SetUserRoleArgs.ts b/backend/src/graphql/arg/SetUserRoleArgs.ts index 039d190cd..48d8086ab 100644 --- a/backend/src/graphql/arg/SetUserRoleArgs.ts +++ b/backend/src/graphql/arg/SetUserRoleArgs.ts @@ -1,5 +1,5 @@ -import { IsPositive, IsEnum } from 'class-validator' -import { ArgsType, Field, Int, InputType } from 'type-graphql' +import { IsEnum, IsPositive } from 'class-validator' +import { ArgsType, Field, InputType, Int } from 'type-graphql' import { RoleNames } from '@enum/RoleNames' diff --git a/backend/src/graphql/arg/TransactionSendArgs.ts b/backend/src/graphql/arg/TransactionSendArgs.ts index 5bd8b89f7..523f09d46 100644 --- a/backend/src/graphql/arg/TransactionSendArgs.ts +++ b/backend/src/graphql/arg/TransactionSendArgs.ts @@ -1,4 +1,4 @@ -import { MaxLength, MinLength, IsString } from 'class-validator' +import { IsString, MaxLength, MinLength } from 'class-validator' import { Decimal } from 'decimal.js-light' import { ArgsType, Field } from 'type-graphql' diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index 5912f16f7..0648339ed 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -7,15 +7,15 @@ import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS' import { decode, encode } from '@/auth/JWT' import { RIGHTS } from '@/auth/RIGHTS' import { - ROLE_UNAUTHORIZED, - ROLE_USER, ROLE_ADMIN, + ROLE_DLT_CONNECTOR, ROLE_MODERATOR, ROLE_MODERATOR_AI, - ROLE_DLT_CONNECTOR, + ROLE_UNAUTHORIZED, + ROLE_USER, } from '@/auth/ROLES' -import { Context } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context } from '@/server/context' export const isAuthorized: AuthChecker = async ({ context }, rights) => { context.role = ROLE_UNAUTHORIZED // unauthorized user diff --git a/backend/src/graphql/input/ProjectBrandingInput.ts b/backend/src/graphql/input/ProjectBrandingInput.ts index 16585c858..d1ed4c8df 100644 --- a/backend/src/graphql/input/ProjectBrandingInput.ts +++ b/backend/src/graphql/input/ProjectBrandingInput.ts @@ -1,5 +1,5 @@ -import { IsString, IsOptional, MaxLength, IsNumber, IsBoolean, IsUrl } from 'class-validator' -import { InputType, Field, Int } from 'type-graphql' +import { IsBoolean, IsNumber, IsOptional, IsString, IsUrl, MaxLength } from 'class-validator' +import { Field, InputType, Int } from 'type-graphql' @InputType() export class ProjectBrandingInput { diff --git a/backend/src/graphql/model/AdminCommunityView.ts b/backend/src/graphql/model/AdminCommunityView.ts index b4a1664a7..96f6fe213 100644 --- a/backend/src/graphql/model/AdminCommunityView.ts +++ b/backend/src/graphql/model/AdminCommunityView.ts @@ -1,7 +1,7 @@ import { Point } from '@dbTools/typeorm' import { Community as DbCommunity } from '@entity/Community' import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity' -import { ObjectType, Field } from 'type-graphql' +import { Field, ObjectType } from 'type-graphql' import { Point2Location } from '@/graphql/resolver/util/Location2Point' diff --git a/backend/src/graphql/model/AdminUpdateContribution.ts b/backend/src/graphql/model/AdminUpdateContribution.ts index b7c3df6bd..c5557ef10 100644 --- a/backend/src/graphql/model/AdminUpdateContribution.ts +++ b/backend/src/graphql/model/AdminUpdateContribution.ts @@ -1,5 +1,5 @@ import { Decimal } from 'decimal.js-light' -import { ObjectType, Field } from 'type-graphql' +import { Field, ObjectType } from 'type-graphql' @ObjectType() export class AdminUpdateContribution { diff --git a/backend/src/graphql/model/Balance.ts b/backend/src/graphql/model/Balance.ts index d992677b1..8f04004e1 100644 --- a/backend/src/graphql/model/Balance.ts +++ b/backend/src/graphql/model/Balance.ts @@ -1,5 +1,5 @@ import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int, Float } from 'type-graphql' +import { Field, Float, Int, ObjectType } from 'type-graphql' @ObjectType() export class Balance { diff --git a/backend/src/graphql/model/ChatGptMessage.ts b/backend/src/graphql/model/ChatGptMessage.ts index fd77dd7d8..3a5f08a59 100644 --- a/backend/src/graphql/model/ChatGptMessage.ts +++ b/backend/src/graphql/model/ChatGptMessage.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field } from 'type-graphql' +import { Field, ObjectType } from 'type-graphql' import { Message } from '@/apis/openai/model/Message' diff --git a/backend/src/graphql/model/Community.ts b/backend/src/graphql/model/Community.ts index 06c07875e..c3749d27a 100644 --- a/backend/src/graphql/model/Community.ts +++ b/backend/src/graphql/model/Community.ts @@ -1,5 +1,5 @@ import { Community as DbCommunity } from '@entity/Community' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class Community { diff --git a/backend/src/graphql/model/CommunityStatistics.ts b/backend/src/graphql/model/CommunityStatistics.ts index 775ad183b..2b7eb62e5 100644 --- a/backend/src/graphql/model/CommunityStatistics.ts +++ b/backend/src/graphql/model/CommunityStatistics.ts @@ -1,5 +1,5 @@ import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class DynamicStatisticsFields { diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index dc4d65e63..301348ccc 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -1,7 +1,7 @@ import { Contribution as dbContribution } from '@entity/Contribution' import { User as DbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { User } from './User' diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts index 3d02953b3..786646c4a 100644 --- a/backend/src/graphql/model/ContributionLink.ts +++ b/backend/src/graphql/model/ContributionLink.ts @@ -1,6 +1,6 @@ import { ContributionLink as dbContributionLink } from '@entity/ContributionLink' import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { CONFIG } from '@/config' diff --git a/backend/src/graphql/model/ContributionLinkList.ts b/backend/src/graphql/model/ContributionLinkList.ts index c35f6fae6..7f7c3b56f 100644 --- a/backend/src/graphql/model/ContributionLinkList.ts +++ b/backend/src/graphql/model/ContributionLinkList.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { ContributionLink } from '@model/ContributionLink' diff --git a/backend/src/graphql/model/Decay.ts b/backend/src/graphql/model/Decay.ts index 0b710c234..a32b96c13 100644 --- a/backend/src/graphql/model/Decay.ts +++ b/backend/src/graphql/model/Decay.ts @@ -1,5 +1,5 @@ import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' interface DecayInterface { balance: Decimal diff --git a/backend/src/graphql/model/FederatedCommunity.ts b/backend/src/graphql/model/FederatedCommunity.ts index 01a3996ce..aefbfa4b8 100644 --- a/backend/src/graphql/model/FederatedCommunity.ts +++ b/backend/src/graphql/model/FederatedCommunity.ts @@ -1,5 +1,5 @@ import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { ensureUrlEndsWithSlash } from '@/util/utilities' diff --git a/backend/src/graphql/model/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts index 43a33ba30..89068dd9d 100644 --- a/backend/src/graphql/model/GdtEntry.ts +++ b/backend/src/graphql/model/GdtEntry.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ObjectType, Field, Float, Int } from 'type-graphql' +import { Field, Float, Int, ObjectType } from 'type-graphql' import { GdtEntryType } from '@enum/GdtEntryType' diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts index adbe5dbc6..480712e31 100644 --- a/backend/src/graphql/model/GdtEntryList.ts +++ b/backend/src/graphql/model/GdtEntryList.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int, Float } from 'type-graphql' +import { Field, Float, Int, ObjectType } from 'type-graphql' import { GdtEntry } from './GdtEntry' diff --git a/backend/src/graphql/model/KlickTipp.ts b/backend/src/graphql/model/KlickTipp.ts index 356ed391f..3fc17c3ae 100644 --- a/backend/src/graphql/model/KlickTipp.ts +++ b/backend/src/graphql/model/KlickTipp.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field } from 'type-graphql' +import { Field, ObjectType } from 'type-graphql' @ObjectType() export class KlickTipp { diff --git a/backend/src/graphql/model/OpenCreation.ts b/backend/src/graphql/model/OpenCreation.ts index 46ee8117f..7a2d5c9be 100644 --- a/backend/src/graphql/model/OpenCreation.ts +++ b/backend/src/graphql/model/OpenCreation.ts @@ -1,5 +1,5 @@ import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class OpenCreation { diff --git a/backend/src/graphql/model/Pagination.ts b/backend/src/graphql/model/Pagination.ts index 761b57699..200ee3f9d 100644 --- a/backend/src/graphql/model/Pagination.ts +++ b/backend/src/graphql/model/Pagination.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class Pagination { diff --git a/backend/src/graphql/model/ProjectBranding.ts b/backend/src/graphql/model/ProjectBranding.ts index c76289405..8f5ad6ca5 100644 --- a/backend/src/graphql/model/ProjectBranding.ts +++ b/backend/src/graphql/model/ProjectBranding.ts @@ -1,5 +1,5 @@ import { ProjectBranding as dbProjectBranding } from '@entity/ProjectBranding' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class ProjectBranding { diff --git a/backend/src/graphql/model/Space.ts b/backend/src/graphql/model/Space.ts index 6f3a3cdfa..eb14a34fb 100644 --- a/backend/src/graphql/model/Space.ts +++ b/backend/src/graphql/model/Space.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { Space as HumhubSpace } from '@/apis/humhub/model/Space' diff --git a/backend/src/graphql/model/SpaceList.ts b/backend/src/graphql/model/SpaceList.ts index 311af84d7..2c611e211 100644 --- a/backend/src/graphql/model/SpaceList.ts +++ b/backend/src/graphql/model/SpaceList.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field } from 'type-graphql' +import { Field, ObjectType } from 'type-graphql' import { SpacesResponse } from '@/apis/humhub/model/SpacesResponse' diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index bfc96089b..a1ad73677 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -1,6 +1,6 @@ import { Transaction as dbTransaction } from '@entity/Transaction' import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { TransactionTypeId } from '@enum/TransactionTypeId' @@ -46,7 +46,7 @@ export class Transaction { this.linkedTransactionId = transaction.linkedTransactionId ?? null this.linkId = transaction.contribution ? transaction.contribution.contributionLinkId - : transaction.transactionLinkId ?? null + : (transaction.transactionLinkId ?? null) this.previousBalance = transaction.previousTransaction?.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN) ?? new Decimal(0) diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts index 995fe5d50..4b6b0e364 100644 --- a/backend/src/graphql/model/TransactionLink.ts +++ b/backend/src/graphql/model/TransactionLink.ts @@ -1,6 +1,6 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { CONFIG } from '@/config' diff --git a/backend/src/graphql/model/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts index 77f9f6481..421c5a87b 100644 --- a/backend/src/graphql/model/TransactionList.ts +++ b/backend/src/graphql/model/TransactionList.ts @@ -1,4 +1,4 @@ -import { ObjectType, Field } from 'type-graphql' +import { Field, ObjectType } from 'type-graphql' import { Balance } from './Balance' import { Transaction } from './Transaction' diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index 5e38db6a0..ad2d914c1 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -1,7 +1,7 @@ import { Contribution } from '@entity/Contribution' import { User } from '@entity/User' import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class UnconfirmedContribution { diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index e7a8288f0..0e19ab33f 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -1,6 +1,6 @@ import { Point } from '@dbTools/typeorm' import { User as dbUser } from '@entity/User' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' import { GmsPublishLocationType } from '@enum/GmsPublishLocationType' import { PublishNameType } from '@enum/PublishNameType' diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index 3266e9df8..d0b5cc932 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -1,6 +1,6 @@ import { User } from '@entity/User' import { Decimal } from 'decimal.js-light' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class UserAdmin { diff --git a/backend/src/graphql/model/UserContact.ts b/backend/src/graphql/model/UserContact.ts index 3c32229f2..a2745fb9a 100644 --- a/backend/src/graphql/model/UserContact.ts +++ b/backend/src/graphql/model/UserContact.ts @@ -1,5 +1,5 @@ import { UserContact as DbUserContact } from '@entity/UserContact' -import { ObjectType, Field, Int } from 'type-graphql' +import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() export class UserContact { diff --git a/backend/src/graphql/resolver/AiChatResolver.ts b/backend/src/graphql/resolver/AiChatResolver.ts index 7c1acba73..3fd01826f 100644 --- a/backend/src/graphql/resolver/AiChatResolver.ts +++ b/backend/src/graphql/resolver/AiChatResolver.ts @@ -1,10 +1,10 @@ -import { Resolver, Mutation, Authorized, Ctx, Arg, Query } from 'type-graphql' +import { Arg, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql' import { OpenaiMessage } from '@input/OpenaiMessage' import { ChatGptMessage } from '@model/ChatGptMessage' -import { Message } from '@/apis/openai/model/Message' import { OpenaiClient } from '@/apis/openai/OpenaiClient' +import { Message } from '@/apis/openai/model/Message' import { RIGHTS } from '@/auth/RIGHTS' import { Context } from '@/server/context' diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index c023e3510..1d0d70151 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -3,7 +3,7 @@ import { IsNull } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { Decimal } from 'decimal.js-light' -import { Resolver, Query, Ctx, Authorized } from 'type-graphql' +import { Authorized, Ctx, Query, Resolver } from 'type-graphql' import { Balance } from '@model/Balance' diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index f9e6aa9ac..48227d94d 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -13,16 +13,16 @@ import { GraphQLError } from 'graphql/error/GraphQLError' import { v4 as uuidv4 } from 'uuid' import { cleanDB, testEnvironment } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { i18n as localization, logger } from '@test/testSetup' import { userFactory } from '@/seeds/factory/user' import { login, updateHomeCommunityQuery } from '@/seeds/graphql/mutations' import { allCommunities, - getCommunities, communitiesQuery, - getHomeCommunityQuery, + getCommunities, getCommunityByIdentifierQuery, + getHomeCommunityQuery, } from '@/seeds/graphql/queries' import { peterLustig } from '@/seeds/users/peter-lustig' diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index 8a6d2992b..5c9f52111 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -1,7 +1,7 @@ import { IsNull, Not } from '@dbTools/typeorm' import { Community as DbCommunity } from '@entity/Community' import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity' -import { Resolver, Query, Authorized, Mutation, Args, Arg } from 'type-graphql' +import { Arg, Args, Authorized, Mutation, Query, Resolver } from 'type-graphql' import { Paginated } from '@arg/Paginated' import { EditCommunityInput } from '@input/EditCommunityInput' @@ -12,13 +12,13 @@ import { FederatedCommunity } from '@model/FederatedCommunity' import { RIGHTS } from '@/auth/RIGHTS' import { LogError } from '@/server/LogError' +import { Location2Point } from './util/Location2Point' import { getAllCommunities, getCommunityByIdentifier, getCommunityByUuid, getHomeCommunity, } from './util/communities' -import { Location2Point } from './util/Location2Point' @Resolver() export class CommunityResolver { diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts index 3a3196c85..5b4654303 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts @@ -7,15 +7,15 @@ import { ApolloServerTestClient } from 'apollo-server-testing' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' -import { cleanDB, testEnvironment, resetToken } from '@test/helpers' +import { cleanDB, resetToken, testEnvironment } from '@test/helpers' import { logger } from '@test/testSetup' import { EventType } from '@/event/Events' import { userFactory } from '@/seeds/factory/user' import { - login, createContributionLink, deleteContributionLink, + login, updateContributionLink, } from '@/seeds/graphql/mutations' import { listContributionLinks } from '@/seeds/graphql/queries' diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts index 0a04d387d..80fc772a9 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts @@ -1,6 +1,6 @@ -import { MoreThan, IsNull } from '@dbTools/typeorm' +import { IsNull, MoreThan } from '@dbTools/typeorm' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' -import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql' +import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' import { ContributionLinkArgs } from '@arg/ContributionLinkArgs' import { Paginated } from '@arg/Paginated' @@ -14,8 +14,8 @@ import { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE, EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE, } from '@/event/Events' -import { Context, getUser } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getUser } from '@/server/context' import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver' import { isStartEndDateValid } from './util/creations' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts index ac3800703..d8ad101b7 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts @@ -11,7 +11,7 @@ import { GraphQLError } from 'graphql' import { ContributionStatus } from '@enum/ContributionStatus' import { cleanDB, resetToken, testEnvironment } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { i18n as localization, logger } from '@test/testSetup' import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants' import { EventType } from '@/event/Events' @@ -22,7 +22,7 @@ import { createContributionMessage, login, } from '@/seeds/graphql/mutations' -import { listContributionMessages, adminListContributionMessages } from '@/seeds/graphql/queries' +import { adminListContributionMessages, listContributionMessages } from '@/seeds/graphql/queries' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bobBaumeister } from '@/seeds/users/bob-baumeister' import { peterLustig } from '@/seeds/users/peter-lustig' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 4803cea09..26f7f3eb8 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -18,8 +18,8 @@ import { EVENT_CONTRIBUTION_MESSAGE_CREATE, } from '@/event/Events' import { UpdateUnconfirmedContributionContext } from '@/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context' -import { Context, getUser } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getUser } from '@/server/context' import { backendLogger as logger } from '@/server/logger' import { findContributionMessages } from './util/findContributionMessages' diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index 134b378dc..c3847963c 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -16,12 +16,12 @@ import { ContributionStatus } from '@enum/ContributionStatus' import { Order } from '@enum/Order' import { cleanDB, - resetToken, - testEnvironment, contributionDateFormatter, resetEntity, + resetToken, + testEnvironment, } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { i18n as localization, logger } from '@test/testSetup' import { sendContributionConfirmedEmail, @@ -33,22 +33,22 @@ import { creations } from '@/seeds/creation/index' import { creationFactory } from '@/seeds/factory/creation' import { userFactory } from '@/seeds/factory/user' import { + adminCreateContribution, + adminCreateContributionMessage, + adminDeleteContribution, + adminUpdateContribution, + confirmContribution, createContribution, - updateContribution, deleteContribution, denyContribution, - confirmContribution, - adminCreateContribution, - adminUpdateContribution, - adminDeleteContribution, login, logout, - adminCreateContributionMessage, + updateContribution, } from '@/seeds/graphql/mutations' import { + adminListContributions, listAllContributions, listContributions, - adminListContributions, } from '@/seeds/graphql/queries' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bobBaumeister } from '@/seeds/users/bob-baumeister' diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 4c1dbe488..8fb55acd8 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -43,25 +43,25 @@ import { sendContributionDeniedEmail, } from '@/emails/sendEmailVariants' import { + EVENT_ADMIN_CONTRIBUTION_CONFIRM, + EVENT_ADMIN_CONTRIBUTION_CREATE, + EVENT_ADMIN_CONTRIBUTION_DELETE, + EVENT_ADMIN_CONTRIBUTION_DENY, + EVENT_ADMIN_CONTRIBUTION_UPDATE, EVENT_CONTRIBUTION_CREATE, EVENT_CONTRIBUTION_DELETE, EVENT_CONTRIBUTION_UPDATE, - EVENT_ADMIN_CONTRIBUTION_CREATE, - EVENT_ADMIN_CONTRIBUTION_UPDATE, - EVENT_ADMIN_CONTRIBUTION_DELETE, - EVENT_ADMIN_CONTRIBUTION_CONFIRM, - EVENT_ADMIN_CONTRIBUTION_DENY, } from '@/event/Events' import { UpdateUnconfirmedContributionContext } from '@/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context' -import { Context, getUser, getClientTimezoneOffset } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getClientTimezoneOffset, getUser } from '@/server/context' import { backendLogger as logger } from '@/server/logger' -import { calculateDecay } from '@/util/decay' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { calculateDecay } from '@/util/decay' import { fullName } from '@/util/utilities' import { findContribution } from './util/contributions' -import { getUserCreation, validateContribution, getOpenCreations } from './util/creations' +import { getOpenCreations, getUserCreation, validateContribution } from './util/creations' import { extractGraphQLFields, extractGraphQLFieldsForSelect } from './util/extractGraphQLFields' import { findContributions } from './util/findContributions' import { getLastTransaction } from './util/getLastTransaction' diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts index 09ad743fe..124f371a1 100644 --- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts +++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts @@ -5,11 +5,11 @@ import { User as DbUser } from '@entity/User' import { ApolloServerTestClient } from 'apollo-server-testing' import { GraphQLError } from 'graphql' -import { testEnvironment, cleanDB } from '@test/helpers' +import { cleanDB, testEnvironment } from '@test/helpers' import { CONFIG } from '@/config' import { writeHomeCommunityEntry } from '@/seeds/community' -import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations' +import { createUser, forgotPassword, setPassword } from '@/seeds/graphql/mutations' import { queryOptIn } from '@/seeds/graphql/queries' let mutate: ApolloServerTestClient['mutate'], diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index 2703be8ed..e26385c33 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -2,7 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql' +import { Arg, Args, Authorized, Ctx, Float, Int, Query, Resolver } from 'type-graphql' import { Paginated } from '@arg/Paginated' import { Order } from '@enum/Order' @@ -12,8 +12,8 @@ import { GdtEntryList } from '@model/GdtEntryList' import { apiGet, apiPost } from '@/apis/HttpRequest' import { RIGHTS } from '@/auth/RIGHTS' import { CONFIG } from '@/config' -import { Context, getUser } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getUser } from '@/server/context' @Resolver() export class GdtResolver { diff --git a/backend/src/graphql/resolver/KlicktippResolver.test.ts b/backend/src/graphql/resolver/KlicktippResolver.test.ts index 06430c620..c8dd39507 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.test.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.test.ts @@ -8,7 +8,7 @@ import { UserContact } from '@entity/UserContact' import { GraphQLError } from 'graphql' import { cleanDB, resetToken, testEnvironment } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { i18n as localization, logger } from '@test/testSetup' import { EventType } from '@/event/Events' import { userFactory } from '@/seeds/factory/user' diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts index 81290bdb6..1ac667fa4 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.ts @@ -1,6 +1,6 @@ -import { Resolver, Authorized, Mutation, Ctx } from 'type-graphql' +import { Authorized, Ctx, Mutation, Resolver } from 'type-graphql' -import { unsubscribe, subscribe } from '@/apis/KlicktippController' +import { subscribe, unsubscribe } from '@/apis/KlicktippController' import { RIGHTS } from '@/auth/RIGHTS' import { EVENT_NEWSLETTER_SUBSCRIBE, EVENT_NEWSLETTER_UNSUBSCRIBE } from '@/event/Events' import { Context, getUser } from '@/server/context' diff --git a/backend/src/graphql/resolver/ProjectBrandingResolver.ts b/backend/src/graphql/resolver/ProjectBrandingResolver.ts index 80180f58c..49b5a4cad 100644 --- a/backend/src/graphql/resolver/ProjectBrandingResolver.ts +++ b/backend/src/graphql/resolver/ProjectBrandingResolver.ts @@ -1,5 +1,5 @@ import { ProjectBranding as DbProjectBranding } from '@entity/ProjectBranding' -import { Resolver, Query, Mutation, Arg, Int, Authorized, ID } from 'type-graphql' +import { Arg, Authorized, ID, Int, Mutation, Query, Resolver } from 'type-graphql' import { ProjectBrandingInput } from '@input/ProjectBrandingInput' import { ProjectBranding } from '@model/ProjectBranding' diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts index ba8a32d37..a7f6555bf 100644 --- a/backend/src/graphql/resolver/StatisticsResolver.ts +++ b/backend/src/graphql/resolver/StatisticsResolver.ts @@ -5,7 +5,7 @@ import { getConnection } from '@dbTools/typeorm' import { Transaction as DbTransaction } from '@entity/Transaction' import { User as DbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' -import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql' +import { Authorized, FieldResolver, Query, Resolver } from 'type-graphql' import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts index bcea43416..30f3d0b6f 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts @@ -12,7 +12,7 @@ import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' import { UnconfirmedContribution } from '@model/UnconfirmedContribution' -import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers' +import { cleanDB, resetEntity, resetToken, testEnvironment } from '@test/helpers' import { logger } from '@test/testSetup' import { EventType } from '@/event/Events' @@ -21,14 +21,14 @@ import { creationFactory } from '@/seeds/factory/creation' import { transactionLinkFactory } from '@/seeds/factory/transactionLink' import { userFactory } from '@/seeds/factory/user' import { - login, - createContributionLink, - redeemTransactionLink, + confirmContribution, createContribution, - updateContribution, + createContributionLink, createTransactionLink, deleteTransactionLink, - confirmContribution, + login, + redeemTransactionLink, + updateContribution, } from '@/seeds/graphql/mutations' import { listTransactionLinksAdmin } from '@/seeds/graphql/queries' import { transactionLinks } from '@/seeds/transactionLink/index' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 63134a9a8..eaf690c24 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -7,7 +7,7 @@ import { Transaction as DbTransaction } from '@entity/Transaction' import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' import { User as DbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' -import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql' +import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' import { Paginated } from '@arg/Paginated' import { TransactionLinkArgs } from '@arg/TransactionLinkArgs' @@ -29,12 +29,12 @@ import { EVENT_TRANSACTION_LINK_DELETE, EVENT_TRANSACTION_LINK_REDEEM, } from '@/event/Events' -import { Context, getUser, getClientTimezoneOffset } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getClientTimezoneOffset, getUser } from '@/server/context' import { backendLogger as logger } from '@/server/logger' -import { calculateDecay } from '@/util/decay' -import { TRANSACTION_LINK_LOCK } from '@/util/TRANSACTION_LINK_LOCK' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { TRANSACTION_LINK_LOCK } from '@/util/TRANSACTION_LINK_LOCK' +import { calculateDecay } from '@/util/decay' import { fullName } from '@/util/utilities' import { calculateBalance } from '@/util/validate' diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts index 7cc6143e6..50a10455e 100644 --- a/backend/src/graphql/resolver/TransactionResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionResolver.test.ts @@ -20,9 +20,9 @@ import { logger } from '@test/testSetup' import { CONFIG } from '@/config' import { EventType } from '@/event/Events' +import { SendCoinsClient } from '@/federation/client/1_0/SendCoinsClient' import { SendCoinsArgs } from '@/federation/client/1_0/model/SendCoinsArgs' import { SendCoinsResult } from '@/federation/client/1_0/model/SendCoinsResult' -import { SendCoinsClient } from '@/federation/client/1_0/SendCoinsClient' import { userFactory } from '@/seeds/factory/user' import { confirmContribution, diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 3989cb175..4bb625e07 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -2,14 +2,14 @@ /* eslint-disable new-cap */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { getConnection, In, IsNull } from '@dbTools/typeorm' +import { In, IsNull, getConnection } from '@dbTools/typeorm' import { Community as DbCommunity } from '@entity/Community' import { PendingTransaction as DbPendingTransaction } from '@entity/PendingTransaction' import { Transaction as dbTransaction } from '@entity/Transaction' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { User as dbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' -import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' +import { Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql' import { Paginated } from '@arg/Paginated' import { TransactionSendArgs } from '@arg/TransactionSendArgs' @@ -28,14 +28,14 @@ import { } from '@/emails/sendEmailVariants' import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Events' import { SendCoinsResult } from '@/federation/client/1_0/model/SendCoinsResult' -import { Context, getUser } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getUser } from '@/server/context' import { backendLogger as logger } from '@/server/logger' -import { communityUser } from '@/util/communityUser' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { communityUser } from '@/util/communityUser' import { fullName } from '@/util/utilities' import { calculateBalance } from '@/util/validate' -import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions' +import { virtualDecayTransaction, virtualLinkTransaction } from '@/util/virtualTransactions' import { BalanceResolver } from './BalanceResolver' import { GdtResolver } from './GdtResolver' diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 4fcf9944a..9a94611a2 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -23,8 +23,8 @@ import { RoleNames } from '@enum/RoleNames' import { UserContactType } from '@enum/UserContactType' import { ContributionLink } from '@model/ContributionLink' import { Location } from '@model/Location' -import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { cleanDB, headerPushMock, resetToken, testEnvironment } from '@test/helpers' +import { i18n as localization, logger } from '@test/testSetup' import { subscribe } from '@/apis/KlicktippController' import { CONFIG } from '@/config' @@ -42,26 +42,26 @@ import { contributionLinkFactory } from '@/seeds/factory/contributionLink' import { transactionLinkFactory } from '@/seeds/factory/transactionLink' import { userFactory } from '@/seeds/factory/user' import { + confirmContribution, + createContribution, + createUser, + deleteUser, + forgotPassword, login, logout, - createUser, - setPassword, - forgotPassword, - updateUserInfos, - createContribution, - confirmContribution, - setUserRole, - deleteUser, - unDeleteUser, sendActivationEmail, + setPassword, + setUserRole, + unDeleteUser, + updateUserInfos, } from '@/seeds/graphql/mutations' import { - verifyLogin, + checkUsername, queryOptIn, searchAdminUsers, searchUsers, user as userQuery, - checkUsername, + verifyLogin, } from '@/seeds/graphql/queries' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bobBaumeister } from '@/seeds/users/bob-baumeister' diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index fea150338..8fe1eb4c4 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -2,7 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { getConnection, In, Point } from '@dbTools/typeorm' +import { In, Point, getConnection } from '@dbTools/typeorm' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' import { ProjectBranding } from '@entity/ProjectBranding' import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' @@ -12,17 +12,17 @@ import { UserLoggingView } from '@logging/UserLogging.view' import { GraphQLResolveInfo } from 'graphql' import i18n from 'i18n' import { - Resolver, - Query, - Args, Arg, + Args, Authorized, Ctx, - Mutation, - Int, - Root, FieldResolver, Info, + Int, + Mutation, + Query, + Resolver, + Root, } from 'type-graphql' import { IRestResponse } from 'typed-rest-client' import { v4 as uuidv4 } from 'uuid' @@ -42,15 +42,15 @@ import { SearchAdminUsersResult } from '@model/AdminUser' // import { Location } from '@model/Location' import { GmsUserAuthenticationResult } from '@model/GmsUserAuthenticationResult' import { User } from '@model/User' -import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' +import { SearchUsersResult, UserAdmin } from '@model/UserAdmin' import { UserContact } from '@model/UserContact' import { UserLocationResult } from '@model/UserLocationResult' +import { subscribe } from '@/apis/KlicktippController' import { HumHubClient } from '@/apis/humhub/HumHubClient' import { Account as HumhubAccount } from '@/apis/humhub/model/Account' import { GetUser } from '@/apis/humhub/model/GetUser' import { PostUser } from '@/apis/humhub/model/PostUser' -import { subscribe } from '@/apis/KlicktippController' import { encode } from '@/auth/JWT' import { RIGHTS } from '@/auth/RIGHTS' import { CONFIG } from '@/config' @@ -60,25 +60,25 @@ import { sendResetPasswordEmail, } from '@/emails/sendEmailVariants' import { + EVENT_ADMIN_USER_DELETE, + EVENT_ADMIN_USER_ROLE_SET, + EVENT_ADMIN_USER_UNDELETE, + EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION, + EVENT_EMAIL_ADMIN_CONFIRMATION, + EVENT_EMAIL_CONFIRMATION, + EVENT_EMAIL_FORGOT_PASSWORD, + EVENT_USER_ACTIVATE_ACCOUNT, + EVENT_USER_INFO_UPDATE, + EVENT_USER_LOGIN, + EVENT_USER_LOGOUT, + EVENT_USER_REGISTER, Event, EventType, - EVENT_USER_LOGIN, - EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION, - EVENT_EMAIL_CONFIRMATION, - EVENT_USER_REGISTER, - EVENT_USER_ACTIVATE_ACCOUNT, - EVENT_EMAIL_ADMIN_CONFIRMATION, - EVENT_USER_LOGOUT, - EVENT_EMAIL_FORGOT_PASSWORD, - EVENT_USER_INFO_UPDATE, - EVENT_ADMIN_USER_ROLE_SET, - EVENT_ADMIN_USER_DELETE, - EVENT_ADMIN_USER_UNDELETE, } from '@/event/Events' import { isValidPassword } from '@/password/EncryptorUtils' import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor' -import { Context, getUser, getClientTimezoneOffset } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getClientTimezoneOffset, getUser } from '@/server/context' import { backendLogger as logger } from '@/server/logger' import { communityDbUser } from '@/util/communityUser' import { hasElopageBuys } from '@/util/hasElopageBuys' @@ -89,6 +89,7 @@ import random from 'random-bigint' import { randombytes_random } from 'sodium-native' import { FULL_CREATION_AVAILABLE } from './const/const' +import { Location2Point, Point2Location } from './util/Location2Point' import { authenticateGmsUserPlayground } from './util/authenticateGmsUserPlayground' import { getHomeCommunity } from './util/communities' import { compareGmsRelevantUserSettings } from './util/compareGmsRelevantUserSettings' @@ -97,8 +98,7 @@ import { extractGraphQLFieldsForSelect } from './util/extractGraphQLFields' import { findUserByIdentifier } from './util/findUserByIdentifier' import { findUsers } from './util/findUsers' import { getKlicktippState } from './util/getKlicktippState' -import { Location2Point, Point2Location } from './util/Location2Point' -import { setUserRole, deleteUserRole } from './util/modifyUserRole' +import { deleteUserRole, setUserRole } from './util/modifyUserRole' import { sendUserToGms } from './util/sendUserToGms' import { syncHumhub } from './util/syncHumhub' import { validateAlias } from './util/validateAlias' diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts index f3dcce6f6..66b7e05cb 100644 --- a/backend/src/graphql/resolver/semaphore.test.ts +++ b/backend/src/graphql/resolver/semaphore.test.ts @@ -8,17 +8,17 @@ import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' import { v4 as uuidv4 } from 'uuid' -import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers' +import { cleanDB, contributionDateFormatter, testEnvironment } from '@test/helpers' import { creationFactory, nMonthsBefore } from '@/seeds/factory/creation' import { userFactory } from '@/seeds/factory/user' import { confirmContribution, createContribution, - createTransactionLink, - redeemTransactionLink, - login, createContributionLink, + createTransactionLink, + login, + redeemTransactionLink, sendCoins, } from '@/seeds/graphql/mutations' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts index 154520b85..4b1cc00b6 100644 --- a/backend/src/graphql/resolver/util/creations.test.ts +++ b/backend/src/graphql/resolver/util/creations.test.ts @@ -3,11 +3,11 @@ import { Contribution } from '@entity/Contribution' import { User } from '@entity/User' import { ApolloServerTestClient } from 'apollo-server-testing' -import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers' +import { cleanDB, contributionDateFormatter, testEnvironment } from '@test/helpers' import { CONFIG } from '@/config' import { userFactory } from '@/seeds/factory/user' -import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations' +import { adminCreateContribution, createContribution, login } from '@/seeds/graphql/mutations' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' diff --git a/backend/src/graphql/resolver/util/extractGraphQLFields.ts b/backend/src/graphql/resolver/util/extractGraphQLFields.ts index 082028ff1..75389b958 100644 --- a/backend/src/graphql/resolver/util/extractGraphQLFields.ts +++ b/backend/src/graphql/resolver/util/extractGraphQLFields.ts @@ -1,8 +1,8 @@ import { ObjectLiteral, SelectQueryBuilder } from '@dbTools/typeorm' import { GraphQLResolveInfo } from 'graphql' import { - parseResolveInfo, ResolveTree, + parseResolveInfo, simplifyParsedResolveInfoFragmentWithType, } from 'graphql-parse-resolve-info' diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts index 435dc3d04..bdd179091 100644 --- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts +++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts @@ -24,8 +24,8 @@ export const findUserByIdentifier = async ( const communityWhere: FindOptionsWhere = isURL(communityIdentifier) ? { url: communityIdentifier } : isUUID4(communityIdentifier) - ? { communityUuid: communityIdentifier } - : { name: communityIdentifier } + ? { communityUuid: communityIdentifier } + : { name: communityIdentifier } if (validate(identifier) && version(identifier) === 4) { user = await DbUser.findOne({ diff --git a/backend/src/graphql/resolver/util/findUsers.ts b/backend/src/graphql/resolver/util/findUsers.ts index a7d7d719c..d4de5a405 100644 --- a/backend/src/graphql/resolver/util/findUsers.ts +++ b/backend/src/graphql/resolver/util/findUsers.ts @@ -1,4 +1,4 @@ -import { IsNull, Not, Like } from '@dbTools/typeorm' +import { IsNull, Like, Not } from '@dbTools/typeorm' import { User as DbUser } from '@entity/User' import { SearchUsersFilters } from '@arg/SearchUsersFilters' diff --git a/backend/src/graphql/resolver/util/processXComSendCoins.ts b/backend/src/graphql/resolver/util/processXComSendCoins.ts index 6455bc36d..6b84f3629 100644 --- a/backend/src/graphql/resolver/util/processXComSendCoins.ts +++ b/backend/src/graphql/resolver/util/processXComSendCoins.ts @@ -5,10 +5,10 @@ import { User as dbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' import { CONFIG } from '@/config' -import { SendCoinsArgs } from '@/federation/client/1_0/model/SendCoinsArgs' -import { SendCoinsResult } from '@/federation/client/1_0/model/SendCoinsResult' // eslint-disable-next-line camelcase import { SendCoinsClient as V1_0_SendCoinsClient } from '@/federation/client/1_0/SendCoinsClient' +import { SendCoinsArgs } from '@/federation/client/1_0/model/SendCoinsArgs' +import { SendCoinsResult } from '@/federation/client/1_0/model/SendCoinsResult' import { SendCoinsClientFactory } from '@/federation/client/SendCoinsClientFactory' import { PendingTransactionState } from '@/graphql/enum/PendingTransactionState' import { TransactionTypeId } from '@/graphql/enum/TransactionTypeId' diff --git a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts index 064184a9d..d5cf3b0bf 100644 --- a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts +++ b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts @@ -17,8 +17,8 @@ import { GraphQLClient } from 'graphql-request' import { Response } from 'graphql-request/dist/types' import { v4 as uuidv4 } from 'uuid' -import { testEnvironment, cleanDB } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { cleanDB, testEnvironment } from '@test/helpers' +import { i18n as localization, logger } from '@test/testSetup' import { CONFIG } from '@/config' import { TransactionTypeId } from '@/graphql/enum/TransactionTypeId' diff --git a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts index 0e293c56c..e7f7d7262 100644 --- a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts +++ b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts @@ -12,8 +12,8 @@ import { Decimal } from 'decimal.js-light' import { PendingTransactionState } from '@/graphql/enum/PendingTransactionState' import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' -import { calculateSenderBalance } from '@/util/calculateSenderBalance' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { calculateSenderBalance } from '@/util/calculateSenderBalance' import { getLastTransaction } from './getLastTransaction' diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts index 653f86804..25567f633 100644 --- a/backend/src/graphql/resolver/util/transactionLinkList.ts +++ b/backend/src/graphql/resolver/util/transactionLinkList.ts @@ -1,4 +1,4 @@ -import { MoreThan, IsNull } from '@dbTools/typeorm' +import { IsNull, MoreThan } from '@dbTools/typeorm' import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' import { User as DbUser } from '@entity/User' diff --git a/backend/src/graphql/resolver/util/validateAlias.test.ts b/backend/src/graphql/resolver/util/validateAlias.test.ts index 5003f8975..e0e35c3b7 100644 --- a/backend/src/graphql/resolver/util/validateAlias.test.ts +++ b/backend/src/graphql/resolver/util/validateAlias.test.ts @@ -2,8 +2,8 @@ import { Connection } from '@dbTools/typeorm' import { User } from '@entity/User' import { ApolloServerTestClient } from 'apollo-server-testing' -import { testEnvironment, cleanDB } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' +import { cleanDB, testEnvironment } from '@test/helpers' +import { i18n as localization, logger } from '@test/testSetup' import { userFactory } from '@/seeds/factory/user' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' diff --git a/backend/src/graphql/validator/ContributionStatusArray.ts b/backend/src/graphql/validator/ContributionStatusArray.ts index da718f70c..82a5564de 100644 --- a/backend/src/graphql/validator/ContributionStatusArray.ts +++ b/backend/src/graphql/validator/ContributionStatusArray.ts @@ -1,4 +1,4 @@ -import { registerDecorator, ValidationOptions } from 'class-validator' +import { ValidationOptions, registerDecorator } from 'class-validator' import { ContributionStatus } from '@enum/ContributionStatus' diff --git a/backend/src/graphql/validator/DateString.ts b/backend/src/graphql/validator/DateString.ts index 4ee23b51a..dd2383f39 100644 --- a/backend/src/graphql/validator/DateString.ts +++ b/backend/src/graphql/validator/DateString.ts @@ -1,4 +1,4 @@ -import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator' +import { ValidationArguments, ValidationOptions, registerDecorator } from 'class-validator' export function isValidDateString(validationOptions?: ValidationOptions) { // eslint-disable-next-line @typescript-eslint/ban-types diff --git a/backend/src/graphql/validator/Decimal.ts b/backend/src/graphql/validator/Decimal.ts index 09e8fb4bd..d0a90d71e 100644 --- a/backend/src/graphql/validator/Decimal.ts +++ b/backend/src/graphql/validator/Decimal.ts @@ -1,4 +1,4 @@ -import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator' +import { ValidationArguments, ValidationOptions, registerDecorator } from 'class-validator' import { Decimal } from 'decimal.js-light' export function IsPositiveDecimal(validationOptions?: ValidationOptions) { diff --git a/backend/src/graphql/validator/Location.ts b/backend/src/graphql/validator/Location.ts index f1f23cd81..93f1c64e9 100644 --- a/backend/src/graphql/validator/Location.ts +++ b/backend/src/graphql/validator/Location.ts @@ -1,4 +1,4 @@ -import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator' +import { ValidationArguments, ValidationOptions, registerDecorator } from 'class-validator' import { Location } from '@model/Location' diff --git a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts index 620751f9c..06dfea6e7 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts @@ -6,8 +6,8 @@ import { Role } from '@/auth/Role' import { ContributionLogic } from '@/data/Contribution.logic' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { ContributionStatus } from '@/graphql/enum/ContributionStatus' -import { Context, getClientTimezoneOffset } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context, getClientTimezoneOffset } from '@/server/context' export abstract class AbstractUnconfirmedContributionRole { private availableCreationSums?: Decimal[] diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts index 6850767f7..8db74d8d4 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts @@ -17,7 +17,10 @@ import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContri * Admins and Moderators are currently not allowed to comment her own contributions with the admin/moderator role */ export class UnconfirmedContributionAdminAddMessageRole extends AbstractUnconfirmedContributionRole { - public constructor(contribution: Contribution, private updateData: ContributionMessageArgs) { + public constructor( + contribution: Contribution, + private updateData: ContributionMessageArgs, + ) { super(contribution, contribution.amount, contribution.contributionDate) logger.debug('use UnconfirmedContributionAdminAddMessageRole') } diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts index a3ffefeb3..fe7d55d80 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts @@ -14,7 +14,10 @@ import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContri * independent from there role, because the own contribution can only be edited in user role */ export class UnconfirmedContributionUserRole extends AbstractUnconfirmedContributionRole { - public constructor(contribution: Contribution, private updateData: ContributionArgs) { + public constructor( + contribution: Contribution, + private updateData: ContributionArgs, + ) { super(contribution, updateData.amount, new Date(updateData.creationDate)) logger.debug('use UnconfirmedContributionUserRole') } diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts index 36a4d4e05..9b81b07bd 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts @@ -15,7 +15,10 @@ import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContri * independent from there role, because the own contribution can only be commented in user role */ export class UnconfirmedContributionUserAddMessageRole extends AbstractUnconfirmedContributionRole { - public constructor(contribution: Contribution, private updateData: ContributionMessageArgs) { + public constructor( + contribution: Contribution, + private updateData: ContributionMessageArgs, + ) { super(contribution, contribution.amount, contribution.contributionDate) logger.debug('use UnconfirmedContributionUserAddMessageRole') } diff --git a/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts b/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts index 8a34bde5d..60d9cbf19 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts @@ -7,8 +7,8 @@ import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs' import { ContributionArgs } from '@arg/ContributionArgs' import { ContributionMessageArgs } from '@/graphql/arg/ContributionMessageArgs' -import { Context } from '@/server/context' import { LogError } from '@/server/LogError' +import { Context } from '@/server/context' import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContribution.role' import { UnconfirmedContributionAdminRole } from './UnconfirmedContributionAdmin.role' diff --git a/backend/src/password/EncryptionWorker.ts b/backend/src/password/EncryptionWorker.ts index 36c08f1b6..34f33226f 100644 --- a/backend/src/password/EncryptionWorker.ts +++ b/backend/src/password/EncryptionWorker.ts @@ -4,15 +4,15 @@ import { CONFIG } from '@/config' import { crypto_box_SEEDBYTES, - crypto_hash_sha512_init, - crypto_hash_sha512_update, - crypto_hash_sha512_final, crypto_hash_sha512_BYTES, crypto_hash_sha512_STATEBYTES, - crypto_shorthash_BYTES, - crypto_pwhash_SALTBYTES, + crypto_hash_sha512_final, + crypto_hash_sha512_init, + crypto_hash_sha512_update, crypto_pwhash, + crypto_pwhash_SALTBYTES, crypto_shorthash, + crypto_shorthash_BYTES, } from 'sodium-native' export const SecretKeyCryptographyCreateKey = ( diff --git a/backend/src/password/PasswordEncryptor.ts b/backend/src/password/PasswordEncryptor.ts index a97c29e7f..b9fdb65aa 100644 --- a/backend/src/password/PasswordEncryptor.ts +++ b/backend/src/password/PasswordEncryptor.ts @@ -1,7 +1,7 @@ import { User } from '@entity/User' // import { logger } from '@test/testSetup' getting error "jest is not defined" -import { getUserCryptographicSalt, SecretKeyCryptographyCreateKey } from './EncryptorUtils' +import { SecretKeyCryptographyCreateKey, getUserCryptographicSalt } from './EncryptorUtils' export const encryptPassword = async (dbUser: User, password: string): Promise => { const salt = getUserCryptographicSalt(dbUser) diff --git a/backend/src/password/__mocks__/EncryptorUtils.ts b/backend/src/password/__mocks__/EncryptorUtils.ts index 2bc20f951..630910a40 100644 --- a/backend/src/password/__mocks__/EncryptorUtils.ts +++ b/backend/src/password/__mocks__/EncryptorUtils.ts @@ -11,19 +11,19 @@ import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' import { - crypto_shorthash_KEYBYTES, crypto_box_SEEDBYTES, - crypto_hash_sha512_init, - crypto_hash_sha512_update, - crypto_hash_sha512_final, crypto_hash_sha512_BYTES, crypto_hash_sha512_STATEBYTES, - crypto_shorthash_BYTES, - crypto_pwhash_SALTBYTES, + crypto_hash_sha512_final, + crypto_hash_sha512_init, + crypto_hash_sha512_update, crypto_pwhash, - crypto_shorthash, - crypto_pwhash_OPSLIMIT_MIN, crypto_pwhash_MEMLIMIT_MIN, + crypto_pwhash_OPSLIMIT_MIN, + crypto_pwhash_SALTBYTES, + crypto_shorthash, + crypto_shorthash_BYTES, + crypto_shorthash_KEYBYTES, } from 'sodium-native' const SecretKeyCryptographyCreateKeyMock = ( diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts index d03d222c6..ce8dcb345 100644 --- a/backend/src/seeds/factory/contributionLink.ts +++ b/backend/src/seeds/factory/contributionLink.ts @@ -6,7 +6,7 @@ import { ApolloServerTestClient } from 'apollo-server-testing' import { ContributionLink } from '@model/ContributionLink' import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface' -import { login, createContributionLink } from '@/seeds/graphql/mutations' +import { createContributionLink, login } from '@/seeds/graphql/mutations' export const contributionLinkFactory = async ( client: ApolloServerTestClient, diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts index 5e6e058f9..9ae861556 100644 --- a/backend/src/seeds/factory/creation.ts +++ b/backend/src/seeds/factory/creation.ts @@ -8,7 +8,7 @@ import { ApolloServerTestClient } from 'apollo-server-testing' import { findUserByEmail } from '@/graphql/resolver/UserResolver' import { CreationInterface } from '@/seeds/creation/CreationInterface' -import { login, createContribution, confirmContribution } from '@/seeds/graphql/mutations' +import { confirmContribution, createContribution, login } from '@/seeds/graphql/mutations' export const nMonthsBefore = (date: Date, months = 1): string => { return new Date(date.getFullYear(), date.getMonth() - months, 1).toISOString() diff --git a/backend/src/seeds/factory/transactionLink.ts b/backend/src/seeds/factory/transactionLink.ts index b44fe349c..e115ae1c4 100644 --- a/backend/src/seeds/factory/transactionLink.ts +++ b/backend/src/seeds/factory/transactionLink.ts @@ -4,7 +4,7 @@ import { TransactionLink } from '@entity/TransactionLink' import { ApolloServerTestClient } from 'apollo-server-testing' import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver' -import { login, createTransactionLink } from '@/seeds/graphql/mutations' +import { createTransactionLink, login } from '@/seeds/graphql/mutations' import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface' export const transactionLinkFactory = async ( diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts index b22409759..add165a56 100644 --- a/backend/src/seeds/index.ts +++ b/backend/src/seeds/index.ts @@ -6,7 +6,7 @@ import { entities } from '@entity/index' import { createTestClient } from 'apollo-server-testing' -import { name, internet, datatype } from 'faker' +import { datatype, internet, name } from 'faker' import { CONFIG } from '@/config' import { createServer } from '@/server/createServer' diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index a901d8763..d58b6896b 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -10,8 +10,8 @@ import { Logger } from 'log4js' import { CONFIG } from '@/config' import { schema } from '@/graphql/schema' -import { Connection } from '@/typeorm/connection' import { checkDBVersion } from '@/typeorm/DBVersion' +import { Connection } from '@/typeorm/connection' import { elopageWebhook } from '@/webhook/elopage' import { gmsWebhook } from '@/webhook/gms' diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts index 104f6449d..41cfbd333 100644 --- a/backend/src/typeorm/connection.ts +++ b/backend/src/typeorm/connection.ts @@ -1,6 +1,6 @@ // TODO This is super weird - since the entities are defined in another project they have their own globals. // We cannot use our connection here, but must use the external typeorm installation -import { Connection as DbConnection, createConnection, FileLogger } from '@dbTools/typeorm' +import { Connection as DbConnection, FileLogger, createConnection } from '@dbTools/typeorm' import { entities } from '@entity/index' import { CONFIG } from '@/config' diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts index 45a142ce8..94b1eda1e 100644 --- a/backend/src/util/communityUser.ts +++ b/backend/src/util/communityUser.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' +import { RemoveOptions, SaveOptions } from '@dbTools/typeorm' import { User as dbUser } from '@entity/User' import { UserContact } from '@entity/UserContact' diff --git a/backend/src/util/decay.test.ts b/backend/src/util/decay.test.ts index 1d4ebab3b..fdb3fc563 100644 --- a/backend/src/util/decay.test.ts +++ b/backend/src/util/decay.test.ts @@ -1,6 +1,6 @@ import { Decimal } from 'decimal.js-light' -import { decayFormula, calculateDecay } from './decay' +import { calculateDecay, decayFormula } from './decay' describe('utils/decay', () => { describe('decayFormula', () => { diff --git a/backend/src/util/klicktipp.test.ts b/backend/src/util/klicktipp.test.ts index a88e8f21a..18a0d0e0d 100644 --- a/backend/src/util/klicktipp.test.ts +++ b/backend/src/util/klicktipp.test.ts @@ -6,7 +6,7 @@ import { Connection } from '@dbTools/typeorm' import { Event as DbEvent } from '@entity/Event' import { ApolloServerTestClient } from 'apollo-server-testing' -import { testEnvironment, cleanDB, resetToken } from '@test/helpers' +import { cleanDB, resetToken, testEnvironment } from '@test/helpers' import { addFieldsToSubscriber } from '@/apis/KlicktippController' import { creations } from '@/seeds/creation' diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts index c07b3128a..6936ed10e 100644 --- a/backend/src/util/klicktipp.ts +++ b/backend/src/util/klicktipp.ts @@ -1,7 +1,7 @@ // eslint-disable @typescript-eslint/no-explicit-any import { User } from '@entity/User' -import { getKlickTippUser, addFieldsToSubscriber } from '@/apis/KlicktippController' +import { addFieldsToSubscriber, getKlickTippUser } from '@/apis/KlicktippController' import { EventType } from '@/event/EventType' import { lastDateTimeEvents } from '@/graphql/resolver/util/eventList' diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts index 063f926e0..c50134d12 100644 --- a/backend/src/util/virtualTransactions.ts +++ b/backend/src/util/virtualTransactions.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' +import { RemoveOptions, SaveOptions } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { Decimal } from 'decimal.js-light'