mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
Merge pull request #3542 from gradido/refactor_community
feat(frontend): paste community and user in recipient field of gdd send dialog
This commit is contained in:
commit
397933a980
@ -7,7 +7,7 @@ export class UserArgs {
|
||||
@IsString()
|
||||
identifier: string
|
||||
|
||||
@Field()
|
||||
@Field({ nullable: true })
|
||||
@IsString()
|
||||
communityIdentifier: string
|
||||
communityIdentifier?: string
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { ApolloServerTestClient } from 'apollo-server-testing'
|
||||
import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from 'database'
|
||||
import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity, getHomeCommunity } from 'database'
|
||||
import { GraphQLError } from 'graphql/error/GraphQLError'
|
||||
import { DataSource } from 'typeorm'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
@ -10,19 +10,20 @@ import { i18n as localization } from '@test/testSetup'
|
||||
import { userFactory } from '@/seeds/factory/user'
|
||||
import { login, updateHomeCommunityQuery } from '@/seeds/graphql/mutations'
|
||||
import {
|
||||
allCommunities,
|
||||
communitiesQuery,
|
||||
getCommunities,
|
||||
allCommunities,
|
||||
getCommunityByIdentifierQuery,
|
||||
getHomeCommunityQuery,
|
||||
reachableCommunities,
|
||||
} from '@/seeds/graphql/queries'
|
||||
import { peterLustig } from '@/seeds/users/peter-lustig'
|
||||
import { createCommunity, createVerifiedFederatedCommunity } from 'database/src/seeds/community'
|
||||
|
||||
import { getLogger } from 'config-schema/test/testSetup'
|
||||
import { getCommunityByUuid } from './util/communities'
|
||||
import { CONFIG } from '@/config'
|
||||
|
||||
jest.mock('@/password/EncryptorUtils')
|
||||
|
||||
CONFIG.FEDERATION_VALIDATE_COMMUNITY_TIMER = 1000
|
||||
|
||||
// to do: We need a setup for the tests that closes the connection
|
||||
let mutate: ApolloServerTestClient['mutate']
|
||||
@ -46,11 +47,10 @@ beforeAll(async () => {
|
||||
mutate = testEnv.mutate
|
||||
query = testEnv.query
|
||||
con = testEnv.con
|
||||
await DbFederatedCommunity.clear()
|
||||
await cleanDB()
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
await cleanDB()
|
||||
await con.destroy()
|
||||
})
|
||||
|
||||
@ -109,31 +109,38 @@ const ed25519KeyPairStaticHex = [
|
||||
]
|
||||
|
||||
describe('CommunityResolver', () => {
|
||||
describe('getCommunities', () => {
|
||||
describe('allCommunities for admin', () => {
|
||||
let homeCom1: DbFederatedCommunity
|
||||
let homeCom2: DbFederatedCommunity
|
||||
let homeCom3: DbFederatedCommunity
|
||||
let foreignCom1: DbFederatedCommunity
|
||||
let foreignCom2: DbFederatedCommunity
|
||||
let foreignCom3: DbFederatedCommunity
|
||||
let foreignCom3: DbFederatedCommunity
|
||||
|
||||
beforeAll(async () => {
|
||||
// create admin and login as admin
|
||||
await userFactory(testEnv, peterLustig)
|
||||
await mutate({ mutation: login, variables: peterLoginData })
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
await cleanDB()
|
||||
})
|
||||
|
||||
describe('with empty list', () => {
|
||||
it('returns no community entry', async () => {
|
||||
// const result: Community[] = await query({ query: getCommunities })
|
||||
// expect(result.length).toEqual(0)
|
||||
await expect(query({ query: getCommunities })).resolves.toMatchObject({
|
||||
await expect(query({ query: allCommunities })).resolves.toMatchObject({
|
||||
data: {
|
||||
getCommunities: [],
|
||||
allCommunities: [],
|
||||
},
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('only home-communities entries', () => {
|
||||
describe('only home-community entries (different apis)', () => {
|
||||
beforeEach(async () => {
|
||||
await cleanDB()
|
||||
jest.clearAllMocks()
|
||||
|
||||
homeCom1 = DbFederatedCommunity.create()
|
||||
homeCom1.foreign = false
|
||||
homeCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[0].public, 'hex')
|
||||
@ -144,7 +151,7 @@ describe('CommunityResolver', () => {
|
||||
|
||||
homeCom2 = DbFederatedCommunity.create()
|
||||
homeCom2.foreign = false
|
||||
homeCom2.publicKey = Buffer.from(ed25519KeyPairStaticHex[1].public, 'hex')
|
||||
homeCom2.publicKey = Buffer.from(ed25519KeyPairStaticHex[0].public, 'hex')
|
||||
homeCom2.apiVersion = '1_1'
|
||||
homeCom2.endPoint = 'http://localhost/api'
|
||||
homeCom2.createdAt = new Date()
|
||||
@ -152,170 +159,67 @@ describe('CommunityResolver', () => {
|
||||
|
||||
homeCom3 = DbFederatedCommunity.create()
|
||||
homeCom3.foreign = false
|
||||
homeCom3.publicKey = Buffer.from(ed25519KeyPairStaticHex[2].public, 'hex')
|
||||
homeCom3.publicKey = Buffer.from(ed25519KeyPairStaticHex[0].public, 'hex')
|
||||
homeCom3.apiVersion = '2_0'
|
||||
homeCom3.endPoint = 'http://localhost/api'
|
||||
homeCom3.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(homeCom3)
|
||||
})
|
||||
|
||||
it('returns 3 home-community entries', async () => {
|
||||
await expect(query({ query: getCommunities })).resolves.toMatchObject({
|
||||
it('returns only home-community entries', async () => {
|
||||
await expect(query({ query: allCommunities })).resolves.toMatchObject({
|
||||
data: {
|
||||
getCommunities: [
|
||||
allCommunities: [
|
||||
{
|
||||
id: 3,
|
||||
foreign: homeCom3.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[2].public),
|
||||
endPoint: expect.stringMatching('http://localhost/api/'),
|
||||
apiVersion: '2_0',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: homeCom3.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
foreign: homeCom2.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[1].public),
|
||||
endPoint: expect.stringMatching('http://localhost/api/'),
|
||||
apiVersion: '1_1',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: homeCom2.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
foreign: homeCom1.foreign,
|
||||
foreign: false,
|
||||
url: 'http://localhost',
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
|
||||
endPoint: expect.stringMatching('http://localhost/api/'),
|
||||
apiVersion: '1_0',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: homeCom1.createdAt.toISOString(),
|
||||
authenticatedAt: null,
|
||||
createdAt: null,
|
||||
creationDate: null,
|
||||
description: null,
|
||||
gmsApiKey: null,
|
||||
name: null,
|
||||
updatedAt: null,
|
||||
uuid: null,
|
||||
federatedCommunities: [
|
||||
{
|
||||
id: 3,
|
||||
apiVersion: '2_0',
|
||||
endPoint: 'http://localhost/api/',
|
||||
createdAt: homeCom3.createdAt.toISOString(),
|
||||
lastAnnouncedAt: null,
|
||||
lastErrorAt: null,
|
||||
updatedAt: null,
|
||||
verifiedAt: null,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
apiVersion: '1_1',
|
||||
endPoint: 'http://localhost/api/',
|
||||
createdAt: homeCom2.createdAt.toISOString(),
|
||||
lastAnnouncedAt: null,
|
||||
lastErrorAt: null,
|
||||
updatedAt: null,
|
||||
verifiedAt: null,
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
apiVersion: '1_0',
|
||||
endPoint: 'http://localhost/api/',
|
||||
createdAt: homeCom1.createdAt.toISOString(),
|
||||
lastAnnouncedAt: null,
|
||||
lastErrorAt: null,
|
||||
updatedAt: null,
|
||||
verifiedAt: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('plus foreign-communities entries', () => {
|
||||
beforeEach(async () => {
|
||||
jest.clearAllMocks()
|
||||
|
||||
foreignCom1 = DbFederatedCommunity.create()
|
||||
foreignCom1.foreign = true
|
||||
foreignCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[3].public, 'hex')
|
||||
foreignCom1.apiVersion = '1_0'
|
||||
foreignCom1.endPoint = 'http://remotehost/api'
|
||||
foreignCom1.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(foreignCom1)
|
||||
|
||||
foreignCom2 = DbFederatedCommunity.create()
|
||||
foreignCom2.foreign = true
|
||||
foreignCom2.publicKey = Buffer.from(ed25519KeyPairStaticHex[4].public, 'hex')
|
||||
foreignCom2.apiVersion = '1_1'
|
||||
foreignCom2.endPoint = 'http://remotehost/api'
|
||||
foreignCom2.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(foreignCom2)
|
||||
|
||||
foreignCom3 = DbFederatedCommunity.create()
|
||||
foreignCom3.foreign = true
|
||||
foreignCom3.publicKey = Buffer.from(ed25519KeyPairStaticHex[5].public, 'hex')
|
||||
foreignCom3.apiVersion = '2_0'
|
||||
foreignCom3.endPoint = 'http://remotehost/api'
|
||||
foreignCom3.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(foreignCom3)
|
||||
})
|
||||
|
||||
it('returns 3 home community and 3 foreign community entries', async () => {
|
||||
await expect(query({ query: getCommunities })).resolves.toMatchObject({
|
||||
data: {
|
||||
getCommunities: [
|
||||
{
|
||||
id: 3,
|
||||
foreign: homeCom3.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[2].public),
|
||||
endPoint: expect.stringMatching('http://localhost/api/'),
|
||||
apiVersion: '2_0',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: homeCom3.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
foreign: homeCom2.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[1].public),
|
||||
endPoint: expect.stringMatching('http://localhost/api/'),
|
||||
apiVersion: '1_1',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: homeCom2.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
foreign: homeCom1.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
|
||||
endPoint: expect.stringMatching('http://localhost/api/'),
|
||||
apiVersion: '1_0',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: homeCom1.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
foreign: foreignCom3.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[5].public),
|
||||
endPoint: expect.stringMatching('http://remotehost/api/'),
|
||||
apiVersion: '2_0',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: foreignCom3.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
foreign: foreignCom2.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[4].public),
|
||||
endPoint: expect.stringMatching('http://remotehost/api/'),
|
||||
apiVersion: '1_1',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: foreignCom2.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
foreign: foreignCom1.foreign,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[3].public),
|
||||
endPoint: expect.stringMatching('http://remotehost/api/'),
|
||||
apiVersion: '1_0',
|
||||
lastAnnouncedAt: null,
|
||||
verifiedAt: null,
|
||||
lastErrorAt: null,
|
||||
createdAt: foreignCom1.createdAt.toISOString(),
|
||||
updatedAt: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('with 6 federated community entries', () => {
|
||||
let comHomeCom1: DbCommunity
|
||||
let comForeignCom1: DbCommunity
|
||||
@ -323,11 +227,6 @@ describe('CommunityResolver', () => {
|
||||
let foreignCom4: DbFederatedCommunity
|
||||
|
||||
beforeEach(async () => {
|
||||
jest.clearAllMocks()
|
||||
await userFactory(testEnv, peterLustig)
|
||||
// login as admin
|
||||
await mutate({ mutation: login, variables: peterLoginData })
|
||||
|
||||
comHomeCom1 = DbCommunity.create()
|
||||
comHomeCom1.foreign = false
|
||||
comHomeCom1.url = 'http://localhost'
|
||||
@ -364,6 +263,30 @@ describe('CommunityResolver', () => {
|
||||
comForeignCom2.creationDate = new Date()
|
||||
await DbCommunity.insert(comForeignCom2)
|
||||
|
||||
foreignCom1 = DbFederatedCommunity.create()
|
||||
foreignCom1.foreign = true
|
||||
foreignCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[3].public, 'hex')
|
||||
foreignCom1.apiVersion = '1_0'
|
||||
foreignCom1.endPoint = 'http://remotehost/api'
|
||||
foreignCom1.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(foreignCom1)
|
||||
|
||||
foreignCom2 = DbFederatedCommunity.create()
|
||||
foreignCom2.foreign = true
|
||||
foreignCom2.publicKey = Buffer.from(ed25519KeyPairStaticHex[4].public, 'hex')
|
||||
foreignCom2.apiVersion = '1_1'
|
||||
foreignCom2.endPoint = 'http://remotehost/api'
|
||||
foreignCom2.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(foreignCom2)
|
||||
|
||||
foreignCom3 = DbFederatedCommunity.create()
|
||||
foreignCom3.foreign = true
|
||||
foreignCom3.publicKey = Buffer.from(ed25519KeyPairStaticHex[5].public, 'hex')
|
||||
foreignCom3.apiVersion = '2_0'
|
||||
foreignCom3.endPoint = 'http://remotehost/api'
|
||||
foreignCom3.createdAt = new Date()
|
||||
await DbFederatedCommunity.insert(foreignCom3)
|
||||
|
||||
foreignCom4 = DbFederatedCommunity.create()
|
||||
foreignCom4.foreign = true
|
||||
foreignCom4.publicKey = Buffer.from(ed25519KeyPairStaticHex[5].public, 'hex')
|
||||
@ -380,15 +303,15 @@ describe('CommunityResolver', () => {
|
||||
{
|
||||
foreign: false,
|
||||
url: 'http://localhost',
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[2].public),
|
||||
authenticatedAt: null,
|
||||
createdAt: null,
|
||||
creationDate: null,
|
||||
description: null,
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
|
||||
authenticatedAt: comHomeCom1.authenticatedAt?.toISOString(),
|
||||
createdAt: comHomeCom1.createdAt.toISOString(),
|
||||
creationDate: comHomeCom1.creationDate?.toISOString(),
|
||||
description: comHomeCom1.description,
|
||||
gmsApiKey: null,
|
||||
name: null,
|
||||
name: comHomeCom1.name,
|
||||
updatedAt: null,
|
||||
uuid: null,
|
||||
uuid: comHomeCom1.communityUuid,
|
||||
federatedCommunities: [
|
||||
{
|
||||
id: 3,
|
||||
@ -400,21 +323,6 @@ describe('CommunityResolver', () => {
|
||||
updatedAt: null,
|
||||
verifiedAt: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
foreign: false,
|
||||
url: 'http://localhost',
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[1].public),
|
||||
authenticatedAt: null,
|
||||
createdAt: null,
|
||||
creationDate: null,
|
||||
description: null,
|
||||
gmsApiKey: null,
|
||||
name: null,
|
||||
updatedAt: null,
|
||||
uuid: null,
|
||||
federatedCommunities: [
|
||||
{
|
||||
id: 2,
|
||||
apiVersion: '1_1',
|
||||
@ -425,21 +333,6 @@ describe('CommunityResolver', () => {
|
||||
updatedAt: null,
|
||||
verifiedAt: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
foreign: false,
|
||||
url: 'http://localhost',
|
||||
publicKey: expect.stringMatching(ed25519KeyPairStaticHex[0].public),
|
||||
authenticatedAt: comHomeCom1.authenticatedAt?.toISOString(),
|
||||
createdAt: comHomeCom1.createdAt.toISOString(),
|
||||
creationDate: comHomeCom1.creationDate?.toISOString(),
|
||||
description: comHomeCom1.description,
|
||||
gmsApiKey: null,
|
||||
name: comHomeCom1.name,
|
||||
updatedAt: null,
|
||||
uuid: comHomeCom1.communityUuid,
|
||||
federatedCommunities: [
|
||||
{
|
||||
id: 1,
|
||||
apiVersion: '1_0',
|
||||
@ -544,20 +437,21 @@ describe('CommunityResolver', () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe('communities', () => {
|
||||
describe('reachableCommunities', () => {
|
||||
let homeCom1: DbCommunity
|
||||
let foreignCom1: DbCommunity
|
||||
let foreignCom2: DbCommunity
|
||||
|
||||
describe('with empty list', () => {
|
||||
beforeEach(async () => {
|
||||
await DbCommunity.clear()
|
||||
})
|
||||
afterAll(async () => {
|
||||
await DbCommunity.clear()
|
||||
await DbFederatedCommunity.clear()
|
||||
})
|
||||
|
||||
describe('with empty list', () => {
|
||||
it('returns no community entry', async () => {
|
||||
await expect(query({ query: communitiesQuery })).resolves.toMatchObject({
|
||||
await expect(query({ query: reachableCommunities })).resolves.toMatchObject({
|
||||
data: {
|
||||
communities: [],
|
||||
reachableCommunities: [],
|
||||
},
|
||||
})
|
||||
})
|
||||
@ -565,35 +459,20 @@ describe('CommunityResolver', () => {
|
||||
|
||||
describe('with one home-community entry', () => {
|
||||
beforeEach(async () => {
|
||||
await cleanDB()
|
||||
jest.clearAllMocks()
|
||||
|
||||
homeCom1 = DbCommunity.create()
|
||||
homeCom1.foreign = false
|
||||
homeCom1.url = 'http://localhost/api'
|
||||
homeCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[0].public, 'hex')
|
||||
homeCom1.privateKey = Buffer.from(ed25519KeyPairStaticHex[0].private, 'hex')
|
||||
homeCom1.communityUuid = 'HomeCom-UUID'
|
||||
homeCom1.authenticatedAt = new Date()
|
||||
homeCom1.name = 'HomeCommunity-name'
|
||||
homeCom1.description = 'HomeCommunity-description'
|
||||
homeCom1.creationDate = new Date()
|
||||
homeCom1 = await createCommunity(false, false)
|
||||
await DbCommunity.insert(homeCom1)
|
||||
})
|
||||
|
||||
it('returns 1 home-community entry', async () => {
|
||||
await expect(query({ query: communitiesQuery })).resolves.toMatchObject({
|
||||
await expect(query({ query: reachableCommunities })).resolves.toMatchObject({
|
||||
data: {
|
||||
communities: [
|
||||
reachableCommunities: [
|
||||
{
|
||||
id: expect.any(Number),
|
||||
foreign: homeCom1.foreign,
|
||||
name: homeCom1.name,
|
||||
description: homeCom1.description,
|
||||
url: homeCom1.url,
|
||||
creationDate: homeCom1.creationDate?.toISOString(),
|
||||
uuid: homeCom1.communityUuid,
|
||||
authenticatedAt: homeCom1.authenticatedAt?.toISOString(),
|
||||
},
|
||||
],
|
||||
},
|
||||
@ -603,135 +482,55 @@ describe('CommunityResolver', () => {
|
||||
|
||||
describe('returns 2 filtered communities even with 3 existing entries', () => {
|
||||
beforeEach(async () => {
|
||||
await cleanDB()
|
||||
jest.clearAllMocks()
|
||||
|
||||
homeCom1 = DbCommunity.create()
|
||||
homeCom1.foreign = false
|
||||
homeCom1.url = 'http://localhost/api'
|
||||
homeCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[0].public, 'hex')
|
||||
homeCom1.privateKey = Buffer.from(ed25519KeyPairStaticHex[0].private, 'hex')
|
||||
homeCom1.communityUuid = 'HomeCom-UUID'
|
||||
homeCom1.authenticatedAt = new Date()
|
||||
homeCom1.name = 'HomeCommunity-name'
|
||||
homeCom1.description = 'HomeCommunity-description'
|
||||
homeCom1.creationDate = new Date()
|
||||
await DbCommunity.insert(homeCom1)
|
||||
|
||||
foreignCom1 = DbCommunity.create()
|
||||
foreignCom1.foreign = true
|
||||
foreignCom1.url = 'http://stage-2.gradido.net/api'
|
||||
foreignCom1.publicKey = Buffer.from(ed25519KeyPairStaticHex[3].public, 'hex')
|
||||
foreignCom1.privateKey = Buffer.from(ed25519KeyPairStaticHex[3].private, 'hex')
|
||||
// foreignCom1.communityUuid = 'Stage2-Com-UUID'
|
||||
// foreignCom1.authenticatedAt = new Date()
|
||||
foreignCom1.name = 'Stage-2_Community-name'
|
||||
foreignCom1.description = 'Stage-2_Community-description'
|
||||
foreignCom1.creationDate = new Date()
|
||||
await DbCommunity.insert(foreignCom1)
|
||||
|
||||
foreignCom2 = DbCommunity.create()
|
||||
foreignCom2.foreign = true
|
||||
foreignCom2.url = 'http://stage-3.gradido.net/api'
|
||||
foreignCom2.publicKey = Buffer.from(ed25519KeyPairStaticHex[4].public, 'hex')
|
||||
foreignCom2.privateKey = Buffer.from(ed25519KeyPairStaticHex[4].private, 'hex')
|
||||
foreignCom2.communityUuid = 'Stage3-Com-UUID'
|
||||
foreignCom2.authenticatedAt = new Date()
|
||||
foreignCom2.name = 'Stage-3_Community-name'
|
||||
foreignCom2.description = 'Stage-3_Community-description'
|
||||
foreignCom2.creationDate = new Date()
|
||||
await DbCommunity.insert(foreignCom2)
|
||||
foreignCom1 = await createCommunity(true, false)
|
||||
foreignCom2 = await createCommunity(true, false)
|
||||
const com1FedCom = await createVerifiedFederatedCommunity('1_0', 100, foreignCom1, false)
|
||||
const com1FedCom2 = await createVerifiedFederatedCommunity('1_1', 100, foreignCom1, false)
|
||||
const com2FedCom = await createVerifiedFederatedCommunity('1_0', 10000, foreignCom2, false)
|
||||
await Promise.all([
|
||||
DbCommunity.insert(foreignCom1),
|
||||
DbCommunity.insert(foreignCom2),
|
||||
DbFederatedCommunity.insert(com1FedCom),
|
||||
DbFederatedCommunity.insert(com1FedCom2),
|
||||
DbFederatedCommunity.insert(com2FedCom)
|
||||
])
|
||||
})
|
||||
|
||||
it('returns 2 community entries', async () => {
|
||||
await expect(query({ query: communitiesQuery })).resolves.toMatchObject({
|
||||
data: {
|
||||
communities: [
|
||||
{
|
||||
id: expect.any(Number),
|
||||
foreign: homeCom1.foreign,
|
||||
name: homeCom1.name,
|
||||
description: homeCom1.description,
|
||||
url: homeCom1.url,
|
||||
creationDate: homeCom1.creationDate?.toISOString(),
|
||||
uuid: homeCom1.communityUuid,
|
||||
authenticatedAt: homeCom1.authenticatedAt?.toISOString(),
|
||||
},
|
||||
/*
|
||||
{
|
||||
id: expect.any(Number),
|
||||
foreign: foreignCom1.foreign,
|
||||
name: foreignCom1.name,
|
||||
description: foreignCom1.description,
|
||||
url: foreignCom1.url,
|
||||
creationDate: foreignCom1.creationDate?.toISOString(),
|
||||
uuid: foreignCom1.communityUuid,
|
||||
authenticatedAt: foreignCom1.authenticatedAt?.toISOString(),
|
||||
},
|
||||
*/
|
||||
{
|
||||
id: expect.any(Number),
|
||||
foreign: foreignCom2.foreign,
|
||||
name: foreignCom2.name,
|
||||
description: foreignCom2.description,
|
||||
url: foreignCom2.url,
|
||||
creationDate: foreignCom2.creationDate?.toISOString(),
|
||||
uuid: foreignCom2.communityUuid,
|
||||
authenticatedAt: foreignCom2.authenticatedAt?.toISOString(),
|
||||
},
|
||||
],
|
||||
},
|
||||
})
|
||||
const result = await query({ query: reachableCommunities })
|
||||
expect(result.data.reachableCommunities.length).toBe(2)
|
||||
expect(result.data.reachableCommunities).toMatchObject([
|
||||
{
|
||||
foreign: homeCom1.foreign,
|
||||
name: homeCom1.name,
|
||||
description: homeCom1.description,
|
||||
url: homeCom1.url,
|
||||
uuid: homeCom1.communityUuid,
|
||||
}, {
|
||||
foreign: foreignCom1.foreign,
|
||||
name: foreignCom1.name,
|
||||
description: foreignCom1.description,
|
||||
url: foreignCom1.url,
|
||||
uuid: foreignCom1.communityUuid,
|
||||
}
|
||||
])
|
||||
})
|
||||
})
|
||||
|
||||
describe('search community by uuid', () => {
|
||||
let homeCom: DbCommunity | null
|
||||
beforeEach(async () => {
|
||||
await cleanDB()
|
||||
jest.clearAllMocks()
|
||||
const admin = await userFactory(testEnv, peterLustig)
|
||||
// login as admin
|
||||
await mutate({ mutation: login, variables: peterLoginData })
|
||||
beforeAll(async () => {
|
||||
await DbCommunity.clear()
|
||||
|
||||
// HomeCommunity is still created in userFactory
|
||||
homeCom = await getCommunityByUuid(admin.communityUuid)
|
||||
homeCom = await createCommunity(false, false)
|
||||
foreignCom1 = await createCommunity(true, false)
|
||||
foreignCom2 = await createCommunity(true, false)
|
||||
|
||||
foreignCom1 = DbCommunity.create()
|
||||
foreignCom1.foreign = true
|
||||
foreignCom1.url = 'http://stage-2.gradido.net/api'
|
||||
foreignCom1.publicKey = Buffer.from(
|
||||
'8a1f9374b99c30d827b85dcd23f7e50328430d64ef65ef35bf375ea8eb9a2e1d',
|
||||
'hex',
|
||||
)
|
||||
foreignCom1.privateKey = Buffer.from(
|
||||
'f6c2a9d78e20a3c910f35b8ffcf824aa7b37f0d3d81bfc4c0e65e17a194b3a4a',
|
||||
'hex',
|
||||
)
|
||||
// foreignCom1.communityUuid = 'Stage2-Com-UUID'
|
||||
// foreignCom1.authenticatedAt = new Date()
|
||||
foreignCom1.name = 'Stage-2_Community-name'
|
||||
foreignCom1.description = 'Stage-2_Community-description'
|
||||
foreignCom1.creationDate = new Date()
|
||||
await DbCommunity.insert(foreignCom1)
|
||||
|
||||
foreignCom2 = DbCommunity.create()
|
||||
foreignCom2.foreign = true
|
||||
foreignCom2.url = 'http://stage-3.gradido.net/api'
|
||||
foreignCom2.publicKey = Buffer.from(
|
||||
'e047365a54082e8a7e9273da61b55c8134a2a0c836799ba12b78b9b0c52bc85f',
|
||||
'hex',
|
||||
)
|
||||
foreignCom2.privateKey = Buffer.from(
|
||||
'e047365a54082e8a7e9273da61b55c8134a2a0c836799ba12b78b9b0c52bc85f',
|
||||
'hex',
|
||||
)
|
||||
foreignCom2.communityUuid = uuidv4()
|
||||
foreignCom2.authenticatedAt = new Date()
|
||||
foreignCom2.name = 'Stage-3_Community-name'
|
||||
foreignCom2.description = 'Stage-3_Community-description'
|
||||
foreignCom2.creationDate = new Date()
|
||||
await DbCommunity.insert(foreignCom2)
|
||||
await Promise.all([
|
||||
DbCommunity.insert(homeCom),
|
||||
DbCommunity.insert(foreignCom1),
|
||||
DbCommunity.insert(foreignCom2),
|
||||
])
|
||||
})
|
||||
|
||||
it('finds the home-community by uuid', async () => {
|
||||
@ -750,7 +549,6 @@ describe('CommunityResolver', () => {
|
||||
url: homeCom?.url,
|
||||
creationDate: homeCom?.creationDate?.toISOString(),
|
||||
uuid: homeCom?.communityUuid,
|
||||
authenticatedAt: homeCom?.authenticatedAt,
|
||||
},
|
||||
},
|
||||
})
|
||||
@ -770,75 +568,100 @@ describe('CommunityResolver', () => {
|
||||
description: homeCom?.description,
|
||||
url: homeCom?.url,
|
||||
creationDate: homeCom?.creationDate?.toISOString(),
|
||||
uuid: homeCom?.communityUuid,
|
||||
authenticatedAt: homeCom?.authenticatedAt,
|
||||
uuid: homeCom?.communityUuid
|
||||
},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
it('updates the home-community gmsApiKey', async () => {
|
||||
await expect(
|
||||
mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: homeCom?.communityUuid, gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).resolves.toMatchObject({
|
||||
data: {
|
||||
updateHomeCommunity: {
|
||||
foreign: homeCom?.foreign,
|
||||
name: homeCom?.name,
|
||||
description: homeCom?.description,
|
||||
url: homeCom?.url,
|
||||
creationDate: homeCom?.creationDate?.toISOString(),
|
||||
uuid: homeCom?.communityUuid,
|
||||
authenticatedAt: homeCom?.authenticatedAt,
|
||||
gmsApiKey: 'gmsApiKey',
|
||||
},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
it('throws error on updating a foreign-community', async () => {
|
||||
expect(
|
||||
await mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: foreignCom2.communityUuid, gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
errors: [new GraphQLError('Error: Only the HomeCommunity could be modified!')],
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('throws error on updating a community without uuid', async () => {
|
||||
expect(
|
||||
await mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: null, gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
errors: [
|
||||
new GraphQLError(`Variable "$uuid" of non-null type "String!" must not be null.`),
|
||||
],
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('throws error on updating a community with not existing uuid', async () => {
|
||||
expect(
|
||||
await mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: uuidv4(), gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
errors: [new GraphQLError('HomeCommunity with uuid not found: ')],
|
||||
}),
|
||||
)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('update community', () => {
|
||||
let homeCom: DbCommunity
|
||||
let foreignCom1: DbCommunity
|
||||
let foreignCom2: DbCommunity
|
||||
|
||||
beforeAll(async () => {
|
||||
await DbCommunity.clear()
|
||||
|
||||
// create admin and login as admin
|
||||
await userFactory(testEnv, peterLustig)
|
||||
homeCom = (await getHomeCommunity())!
|
||||
foreignCom1 = await createCommunity(true, false)
|
||||
foreignCom2 = await createCommunity(true, false)
|
||||
|
||||
await Promise.all([
|
||||
DbCommunity.insert(foreignCom1),
|
||||
DbCommunity.insert(foreignCom2),
|
||||
mutate({ mutation: login, variables: peterLoginData })
|
||||
])
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
await cleanDB()
|
||||
})
|
||||
|
||||
it('updates the home-community gmsApiKey', async () => {
|
||||
await expect(
|
||||
mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: homeCom?.communityUuid, gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).resolves.toMatchObject({
|
||||
data: {
|
||||
updateHomeCommunity: {
|
||||
foreign: homeCom?.foreign,
|
||||
name: homeCom?.name,
|
||||
description: homeCom?.description,
|
||||
url: homeCom?.url,
|
||||
creationDate: homeCom?.creationDate?.toISOString(),
|
||||
uuid: homeCom?.communityUuid,
|
||||
authenticatedAt: homeCom?.authenticatedAt,
|
||||
gmsApiKey: 'gmsApiKey',
|
||||
},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
it('throws error on updating a foreign-community', async () => {
|
||||
expect(
|
||||
await mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: foreignCom2.communityUuid, gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
errors: [new GraphQLError('Error: Only the HomeCommunity could be modified!')],
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('throws error on updating a community without uuid', async () => {
|
||||
expect(
|
||||
await mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: null, gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
errors: [
|
||||
new GraphQLError(`Variable "$uuid" of non-null type "String!" must not be null.`),
|
||||
],
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('throws error on updating a community with not existing uuid', async () => {
|
||||
expect(
|
||||
await mutate({
|
||||
mutation: updateHomeCommunityQuery,
|
||||
variables: { uuid: uuidv4(), gmsApiKey: 'gmsApiKey' },
|
||||
}),
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
errors: [new GraphQLError('HomeCommunity with uuid not found: ')],
|
||||
}),
|
||||
)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity, getHomeCommunity } from 'database'
|
||||
import {
|
||||
Community as DbCommunity,
|
||||
getReachableCommunities,
|
||||
getHomeCommunity
|
||||
} from 'database'
|
||||
import { Arg, Args, Authorized, Mutation, Query, Resolver } from 'type-graphql'
|
||||
import { IsNull, Not } from 'typeorm'
|
||||
|
||||
import { Paginated } from '@arg/Paginated'
|
||||
import { EditCommunityInput } from '@input/EditCommunityInput'
|
||||
import { AdminCommunityView } from '@model/AdminCommunityView'
|
||||
import { Community } from '@model/Community'
|
||||
import { FederatedCommunity } from '@model/FederatedCommunity'
|
||||
|
||||
import { RIGHTS } from '@/auth/RIGHTS'
|
||||
import { LogError } from '@/server/LogError'
|
||||
@ -18,23 +20,10 @@ import {
|
||||
getCommunityByUuid,
|
||||
} from './util/communities'
|
||||
|
||||
import { CONFIG } from '@/config'
|
||||
|
||||
@Resolver()
|
||||
export class CommunityResolver {
|
||||
@Authorized([RIGHTS.COMMUNITIES])
|
||||
@Query(() => [FederatedCommunity])
|
||||
async getCommunities(): Promise<FederatedCommunity[]> {
|
||||
const dbFederatedCommunities: DbFederatedCommunity[] = await DbFederatedCommunity.find({
|
||||
order: {
|
||||
foreign: 'ASC',
|
||||
createdAt: 'DESC',
|
||||
lastAnnouncedAt: 'DESC',
|
||||
},
|
||||
})
|
||||
return dbFederatedCommunities.map(
|
||||
(dbCom: DbFederatedCommunity) => new FederatedCommunity(dbCom),
|
||||
)
|
||||
}
|
||||
|
||||
@Authorized([RIGHTS.COMMUNITY_WITH_API_KEYS])
|
||||
@Query(() => [AdminCommunityView])
|
||||
async allCommunities(@Args() paginated: Paginated): Promise<AdminCommunityView[]> {
|
||||
@ -44,12 +33,12 @@ export class CommunityResolver {
|
||||
|
||||
@Authorized([RIGHTS.COMMUNITIES])
|
||||
@Query(() => [Community])
|
||||
async communities(): Promise<Community[]> {
|
||||
const dbCommunities: DbCommunity[] = await DbCommunity.find({
|
||||
where: { communityUuid: Not(IsNull()) }, //, authenticatedAt: Not(IsNull()) },
|
||||
order: {
|
||||
name: 'ASC',
|
||||
},
|
||||
async reachableCommunities(): Promise<Community[]> {
|
||||
const dbCommunities: DbCommunity[] = await getReachableCommunities(
|
||||
CONFIG.FEDERATION_VALIDATE_COMMUNITY_TIMER * 2, {
|
||||
// order by
|
||||
foreign: 'ASC', // home community first
|
||||
name: 'ASC', // sort foreign communities by name
|
||||
})
|
||||
return dbCommunities.map((dbCom: DbCommunity) => new Community(dbCom))
|
||||
}
|
||||
|
||||
@ -439,9 +439,7 @@ export class TransactionResolver {
|
||||
logger.debug(
|
||||
`sendCoins(recipientCommunityIdentifier=${recipientCommunityIdentifier}, recipientIdentifier=${recipientIdentifier}, amount=${amount}, memo=${memo})`,
|
||||
)
|
||||
const homeCom = await DbCommunity.findOneOrFail({ where: { foreign: false } })
|
||||
const senderUser = getUser(context)
|
||||
|
||||
if (!recipientCommunityIdentifier || (await isHomeCommunity(recipientCommunityIdentifier))) {
|
||||
// processing sendCoins within sender and recipient are both in home community
|
||||
const recipientUser = await findUserByIdentifier(
|
||||
|
||||
@ -1151,6 +1151,12 @@ export class UserResolver {
|
||||
@Args()
|
||||
{ identifier, communityIdentifier }: UserArgs,
|
||||
): Promise<User> {
|
||||
// check if identifier contain community and user identifier
|
||||
if (identifier.includes('/')) {
|
||||
const parts = identifier.split('/')
|
||||
communityIdentifier = parts[0]
|
||||
identifier = parts[1]
|
||||
}
|
||||
const foundDbUser = await findUserByIdentifier(identifier, communityIdentifier)
|
||||
if (!foundDbUser) {
|
||||
createLogger().debug('User not found', identifier, communityIdentifier)
|
||||
|
||||
@ -135,17 +135,14 @@ export const listGDTEntriesQuery = gql`
|
||||
}
|
||||
`
|
||||
|
||||
export const communitiesQuery = gql`
|
||||
query {
|
||||
communities {
|
||||
id
|
||||
export const reachableCommunities = gql`
|
||||
query {
|
||||
reachableCommunities {
|
||||
foreign
|
||||
uuid
|
||||
name
|
||||
description
|
||||
url
|
||||
creationDate
|
||||
uuid
|
||||
authenticatedAt
|
||||
}
|
||||
}
|
||||
`
|
||||
@ -180,23 +177,6 @@ export const getHomeCommunityQuery = gql`
|
||||
}
|
||||
`
|
||||
|
||||
export const getCommunities = gql`
|
||||
query {
|
||||
getCommunities {
|
||||
id
|
||||
foreign
|
||||
publicKey
|
||||
endPoint
|
||||
apiVersion
|
||||
lastAnnouncedAt
|
||||
verifiedAt
|
||||
lastErrorAt
|
||||
createdAt
|
||||
updatedAt
|
||||
}
|
||||
}
|
||||
`
|
||||
|
||||
export const allCommunities = gql`
|
||||
query {
|
||||
allCommunities {
|
||||
@ -265,7 +245,7 @@ export const listContributions = gql`
|
||||
}
|
||||
`
|
||||
|
||||
export const listAllContributions = `
|
||||
export const listAllContributions = gql`
|
||||
query ($pagination: Paginated!) {
|
||||
listAllContributions(pagination: $pagination) {
|
||||
contributionCount
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import { Community as DbCommunity } from '..'
|
||||
import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from '..'
|
||||
import { AppDatabase } from '../AppDatabase'
|
||||
import { getHomeCommunity } from './communities'
|
||||
import { describe, expect, it, beforeAll, afterAll } from 'vitest'
|
||||
import { createCommunity } from '../seeds/homeCommunity'
|
||||
import { getHomeCommunity, getReachableCommunities } from './communities'
|
||||
import { describe, expect, it, beforeEach, beforeAll, afterAll } from 'vitest'
|
||||
import { createCommunity, createVerifiedFederatedCommunity } from '../seeds/community'
|
||||
|
||||
const db = AppDatabase.getInstance()
|
||||
|
||||
@ -14,8 +14,10 @@ afterAll(async () => {
|
||||
})
|
||||
|
||||
describe('community.queries', () => {
|
||||
beforeAll(async () => {
|
||||
// clean db for every test case
|
||||
beforeEach(async () => {
|
||||
await DbCommunity.clear()
|
||||
await DbFederatedCommunity.clear()
|
||||
})
|
||||
describe('getHomeCommunity', () => {
|
||||
it('should return null if no home community exists', async () => {
|
||||
@ -37,4 +39,51 @@ describe('community.queries', () => {
|
||||
expect(community?.privateKey).toStrictEqual(homeCom.privateKey)
|
||||
})
|
||||
})
|
||||
describe('getReachableCommunities', () => {
|
||||
it('home community counts also to reachable communities', async () => {
|
||||
await createCommunity(false)
|
||||
expect(await getReachableCommunities(1000)).toHaveLength(1)
|
||||
})
|
||||
it('foreign communities authenticated within chosen range', async () => {
|
||||
const com1 = await createCommunity(true)
|
||||
const com2 = await createCommunity(true)
|
||||
const com3 = await createCommunity(true)
|
||||
await createVerifiedFederatedCommunity('1_0', 100, com1)
|
||||
await createVerifiedFederatedCommunity('1_0', 500, com2)
|
||||
// outside of range
|
||||
await createVerifiedFederatedCommunity('1_0', 1200, com3)
|
||||
|
||||
const communities = await getReachableCommunities(1000)
|
||||
expect(communities).toHaveLength(2)
|
||||
expect(communities[0].communityUuid).toBe(com1.communityUuid)
|
||||
expect(communities[1].communityUuid).toBe(com2.communityUuid)
|
||||
})
|
||||
it('multiple federated community api version, result in one community', async () => {
|
||||
const com1 = await createCommunity(true)
|
||||
await createVerifiedFederatedCommunity('1_0', 100, com1)
|
||||
await createVerifiedFederatedCommunity('1_1', 100, com1)
|
||||
expect(await getReachableCommunities(1000)).toHaveLength(1)
|
||||
})
|
||||
it('multiple federated community api version one outside of range, result in one community', async () => {
|
||||
const com1 = await createCommunity(true)
|
||||
await createVerifiedFederatedCommunity('1_0', 100, com1)
|
||||
// outside of range
|
||||
await createVerifiedFederatedCommunity('1_1', 1200, com1)
|
||||
expect(await getReachableCommunities(1000)).toHaveLength(1)
|
||||
})
|
||||
it('foreign and home community', async () => {
|
||||
// home community
|
||||
await createCommunity(false)
|
||||
const com1 = await createCommunity(true)
|
||||
const com2 = await createCommunity(true)
|
||||
await createVerifiedFederatedCommunity('1_0', 400, com1)
|
||||
await createVerifiedFederatedCommunity('1_0', 1200, com2)
|
||||
expect(await getReachableCommunities(1000)).toHaveLength(2)
|
||||
})
|
||||
it('not verified inside time frame federated community', async () => {
|
||||
const com1 = await createCommunity(true)
|
||||
await createVerifiedFederatedCommunity('1_0', 1200, com1)
|
||||
expect(await getReachableCommunities(1000)).toHaveLength(0)
|
||||
})
|
||||
})
|
||||
})
|
||||
@ -1,10 +1,14 @@
|
||||
import { FindOptionsOrder, FindOptionsWhere, IsNull, MoreThanOrEqual, Not } from 'typeorm'
|
||||
import { Community as DbCommunity } from '../entity'
|
||||
import { urlSchema, uuidv4Schema } from 'shared'
|
||||
|
||||
/**
|
||||
* Retrieves the home community, i.e., a community that is not foreign.
|
||||
* @returns A promise that resolves to the home community, or null if no home community was found
|
||||
*/
|
||||
export async function getHomeCommunity(): Promise<DbCommunity | null> {
|
||||
// TODO: Put in Cache, it is needed nearly always
|
||||
// TODO: return only DbCommunity or throw to reduce unnecessary checks, because there should be always a home community
|
||||
return await DbCommunity.findOne({
|
||||
where: { foreign: false },
|
||||
})
|
||||
@ -15,3 +19,45 @@ export async function getCommunityByUuid(communityUuid: string): Promise<DbCommu
|
||||
where: [{ communityUuid }],
|
||||
})
|
||||
}
|
||||
|
||||
export function findWithCommunityIdentifier(communityIdentifier: string): FindOptionsWhere<DbCommunity> {
|
||||
const where: FindOptionsWhere<DbCommunity> = {}
|
||||
// pre filter identifier type to reduce db query complexity
|
||||
if (urlSchema.safeParse(communityIdentifier).success) {
|
||||
where.url = communityIdentifier
|
||||
} else if (uuidv4Schema.safeParse(communityIdentifier).success) {
|
||||
where.communityUuid = communityIdentifier
|
||||
} else {
|
||||
where.name = communityIdentifier
|
||||
}
|
||||
return where
|
||||
}
|
||||
|
||||
export async function getCommunityWithFederatedCommunityByIdentifier(
|
||||
communityIdentifier: string,
|
||||
): Promise<DbCommunity | null> {
|
||||
return await DbCommunity.findOne({
|
||||
where: { ...findWithCommunityIdentifier(communityIdentifier) },
|
||||
relations: ['federatedCommunities'],
|
||||
})
|
||||
}
|
||||
|
||||
// returns all reachable communities
|
||||
// home community and all federated communities which have been verified within the last authenticationTimeoutMs
|
||||
export async function getReachableCommunities(
|
||||
authenticationTimeoutMs: number,
|
||||
order?: FindOptionsOrder<DbCommunity>
|
||||
): Promise<DbCommunity[]> {
|
||||
return await DbCommunity.find({
|
||||
where: [
|
||||
{
|
||||
authenticatedAt: Not(IsNull()),
|
||||
federatedCommunities: {
|
||||
verifiedAt: MoreThanOrEqual(new Date(Date.now() - authenticationTimeoutMs))
|
||||
}
|
||||
},
|
||||
{ foreign: false },
|
||||
],
|
||||
order,
|
||||
})
|
||||
}
|
||||
@ -14,7 +14,7 @@ import { peterLustig } from '../seeds/users/peter-lustig'
|
||||
import { bobBaumeister } from '../seeds/users/bob-baumeister'
|
||||
import { garrickOllivander } from '../seeds/users/garrick-ollivander'
|
||||
import { describe, expect, it, beforeAll, afterAll } from 'vitest'
|
||||
import { createCommunity } from '../seeds/homeCommunity'
|
||||
import { createCommunity } from '../seeds/community'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
import Decimal from 'decimal.js-light'
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import { aliasExists, findUserByIdentifier } from './user'
|
||||
import { userFactory } from '../seeds/factory/user'
|
||||
import { bibiBloxberg } from '../seeds/users/bibi-bloxberg'
|
||||
import { describe, expect, it, beforeAll, afterAll, beforeEach, } from 'vitest'
|
||||
import { createCommunity } from '../seeds/homeCommunity'
|
||||
import { createCommunity } from '../seeds/community'
|
||||
import { peterLustig } from '../seeds/users/peter-lustig'
|
||||
import { bobBaumeister } from '../seeds/users/bob-baumeister'
|
||||
import { getLogger, printLogs, clearLogs } from '../../../config-schema/test/testSetup.vitest'
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
import { Raw } from 'typeorm'
|
||||
import { Community, User as DbUser, UserContact as DbUserContact } from '../entity'
|
||||
import { FindOptionsWhere } from 'typeorm'
|
||||
import { aliasSchema, emailSchema, uuidv4Schema, urlSchema } from 'shared'
|
||||
import { User as DbUser, UserContact as DbUserContact } from '../entity'
|
||||
import { aliasSchema, emailSchema, uuidv4Schema } from 'shared'
|
||||
import { getLogger } from 'log4js'
|
||||
import { LOG4JS_QUERIES_CATEGORY_NAME } from './index'
|
||||
import { findWithCommunityIdentifier, LOG4JS_QUERIES_CATEGORY_NAME } from './index'
|
||||
|
||||
export async function aliasExists(alias: string): Promise<boolean> {
|
||||
const user = await DbUser.findOne({
|
||||
@ -22,11 +21,9 @@ export const findUserByIdentifier = async (
|
||||
identifier: string,
|
||||
communityIdentifier?: string,
|
||||
): Promise<DbUser | null> => {
|
||||
const communityWhere: FindOptionsWhere<Community> = urlSchema.safeParse(communityIdentifier).success
|
||||
? { url: communityIdentifier }
|
||||
: uuidv4Schema.safeParse(communityIdentifier).success
|
||||
? { communityUuid: communityIdentifier }
|
||||
: { name: communityIdentifier }
|
||||
const communityWhere = communityIdentifier
|
||||
? findWithCommunityIdentifier(communityIdentifier)
|
||||
: undefined
|
||||
|
||||
if (uuidv4Schema.safeParse(identifier).success) {
|
||||
return DbUser.findOne({
|
||||
|
||||
42
database/src/seeds/community.ts
Normal file
42
database/src/seeds/community.ts
Normal file
@ -0,0 +1,42 @@
|
||||
import { Community, FederatedCommunity } from '../entity'
|
||||
import { randomBytes } from 'node:crypto'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
|
||||
export async function createCommunity(foreign: boolean, save: boolean = true): Promise<Community> {
|
||||
const community = new Community()
|
||||
community.publicKey = randomBytes(32)
|
||||
community.communityUuid = uuidv4()
|
||||
community.name = 'HomeCommunity-name'
|
||||
community.creationDate = new Date()
|
||||
|
||||
if(foreign) {
|
||||
community.foreign = true
|
||||
community.name = 'ForeignCommunity-name'
|
||||
community.description = 'ForeignCommunity-description'
|
||||
community.url = `http://foreign-${Math.random()}/api`
|
||||
community.authenticatedAt = new Date()
|
||||
} else {
|
||||
community.foreign = false
|
||||
// todo: generate valid public/private key pair (ed25519)
|
||||
community.privateKey = randomBytes(64)
|
||||
community.name = 'HomeCommunity-name'
|
||||
community.description = 'HomeCommunity-description'
|
||||
community.url = 'http://localhost/api'
|
||||
}
|
||||
return save ? await community.save() : community
|
||||
}
|
||||
|
||||
export async function createVerifiedFederatedCommunity(
|
||||
apiVersion: string,
|
||||
verifiedBeforeMs: number,
|
||||
community: Community,
|
||||
save: boolean = true
|
||||
): Promise<FederatedCommunity> {
|
||||
const federatedCommunity = new FederatedCommunity()
|
||||
federatedCommunity.apiVersion = apiVersion
|
||||
federatedCommunity.endPoint = community.url
|
||||
federatedCommunity.publicKey = community.publicKey
|
||||
federatedCommunity.community = community
|
||||
federatedCommunity.verifiedAt = new Date(Date.now() - verifiedBeforeMs)
|
||||
return save ? await federatedCommunity.save() : federatedCommunity
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
import { Community } from '../entity'
|
||||
import { randomBytes } from 'node:crypto'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
|
||||
export async function createCommunity(foreign: boolean): Promise<Community> {
|
||||
const homeCom = new Community()
|
||||
homeCom.publicKey = randomBytes(32)
|
||||
homeCom.communityUuid = uuidv4()
|
||||
homeCom.authenticatedAt = new Date()
|
||||
homeCom.name = 'HomeCommunity-name'
|
||||
homeCom.creationDate = new Date()
|
||||
|
||||
if(foreign) {
|
||||
homeCom.foreign = true
|
||||
homeCom.name = 'ForeignCommunity-name'
|
||||
homeCom.description = 'ForeignCommunity-description'
|
||||
homeCom.url = 'http://foreign/api'
|
||||
} else {
|
||||
homeCom.foreign = false
|
||||
homeCom.privateKey = randomBytes(64)
|
||||
homeCom.name = 'HomeCommunity-name'
|
||||
homeCom.description = 'HomeCommunity-description'
|
||||
homeCom.url = 'http://localhost/api'
|
||||
}
|
||||
return await homeCom.save()
|
||||
}
|
||||
@ -22,10 +22,10 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import { ref, computed, onMounted, watch } from 'vue'
|
||||
import { useQuery } from '@vue/apollo-composable'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { selectCommunities } from '@/graphql/queries'
|
||||
import { reachableCommunities } from '@/graphql/communities.graphql'
|
||||
import { useAppToast } from '@/composables/useToast'
|
||||
|
||||
const props = defineProps({
|
||||
@ -33,9 +33,13 @@ const props = defineProps({
|
||||
type: Object,
|
||||
default: () => ({}),
|
||||
},
|
||||
communityIdentifier: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
})
|
||||
|
||||
const emit = defineEmits(['update:modelValue'])
|
||||
const emit = defineEmits(['update:modelValue', 'communitiesLoaded'])
|
||||
|
||||
const route = useRoute()
|
||||
const { toastError } = useAppToast()
|
||||
@ -43,20 +47,31 @@ const { toastError } = useAppToast()
|
||||
const communities = ref([])
|
||||
const validCommunityIdentifier = ref(false)
|
||||
|
||||
const { onResult } = useQuery(selectCommunities)
|
||||
const { onResult } = useQuery(reachableCommunities)
|
||||
|
||||
onResult(({ data }) => {
|
||||
// console.log('CommunitySwitch.onResult...data=', data)
|
||||
if (data) {
|
||||
communities.value = data.communities
|
||||
communities.value = data.reachableCommunities
|
||||
setDefaultCommunity()
|
||||
if (data.communities.length === 1) {
|
||||
if (data.reachableCommunities.length === 1) {
|
||||
validCommunityIdentifier.value = true
|
||||
}
|
||||
emit('communitiesLoaded', data.reachableCommunities)
|
||||
}
|
||||
})
|
||||
|
||||
const communityIdentifier = computed(() => route.params.communityIdentifier)
|
||||
const communityIdentifier = computed(
|
||||
() => route.params.communityIdentifier || props.communityIdentifier,
|
||||
)
|
||||
|
||||
watch(
|
||||
() => communityIdentifier.value,
|
||||
() => {
|
||||
// console.log('CommunitySwitch.communityIdentifier.value', value)
|
||||
setDefaultCommunity()
|
||||
},
|
||||
)
|
||||
|
||||
function updateCommunity(community) {
|
||||
// console.log('CommunitySwitch.updateCommunity...community=', community)
|
||||
|
||||
@ -165,18 +165,35 @@ const validationSchema = computed(() => {
|
||||
.required('form.validation.contributionMemo.required'),
|
||||
hours: string()
|
||||
.typeError({ key: 'form.validation.hours.typeError', values: { min: 0.01, max: maxHours } })
|
||||
.required()
|
||||
.transform((currentValue) =>
|
||||
!currentValue || typeof currentValue !== 'string'
|
||||
? currentValue
|
||||
: currentValue.replace(',', '.'),
|
||||
)
|
||||
// min and max are needed for html min max which validatedInput will take from this scheme
|
||||
.min(0.01, ({ min }) => ({ key: 'form.validation.hours.min', values: { min } }))
|
||||
.max(maxHours, ({ max }) => ({ key: 'form.validation.hours.max', values: { max } }))
|
||||
.test('decimal-places', 'form.validation.hours.decimal-places', (value) => {
|
||||
if (value === undefined || value === null) return true
|
||||
return /^\d+(\.\d{0,2})?$/.test(value.toString())
|
||||
}),
|
||||
})
|
||||
// min and max are not working with string, so we need to do it manually
|
||||
.test('min-hours', { key: 'form.validation.hours.min', values: { min: 0.01 } }, (value) => {
|
||||
if (value === undefined || value === null || Number.isNaN(parseFloat(value))) {
|
||||
return false
|
||||
}
|
||||
return parseFloat(value) >= 0.01
|
||||
})
|
||||
.test(
|
||||
'max-hours',
|
||||
{ key: 'form.validation.hours.max', values: { max: maxHours } },
|
||||
(value) => {
|
||||
if (value === undefined || value === null || Number.isNaN(parseFloat(value))) {
|
||||
return false
|
||||
}
|
||||
return parseFloat(value) <= maxHours
|
||||
},
|
||||
),
|
||||
amount: number().min(0.01).max(maxAmounts),
|
||||
})
|
||||
})
|
||||
|
||||
@ -26,6 +26,7 @@ vi.mock('vue-router', () => ({
|
||||
}))
|
||||
|
||||
const mockUseQuery = vi.fn()
|
||||
const mockUseLazyQuery = vi.fn()
|
||||
vi.mock('@vue/apollo-composable', () => ({
|
||||
useQuery: (...args) => {
|
||||
mockUseQuery(...args)
|
||||
@ -35,6 +36,12 @@ vi.mock('@vue/apollo-composable', () => ({
|
||||
error: ref(null),
|
||||
}
|
||||
},
|
||||
useLazyQuery: (...args) => {
|
||||
mockUseLazyQuery(...args)
|
||||
return {
|
||||
refetch: vi.fn(() => true),
|
||||
}
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('@/composables/useToast', () => ({
|
||||
|
||||
@ -48,7 +48,9 @@
|
||||
<community-switch
|
||||
:disabled="isBalanceEmpty"
|
||||
:model-value="form.targetCommunity"
|
||||
:community-identifier="autoCommunityIdentifier"
|
||||
@update:model-value="updateField($event, 'targetCommunity')"
|
||||
@communities-loaded="setCommunities"
|
||||
/>
|
||||
</BCol>
|
||||
</BRow>
|
||||
@ -62,7 +64,7 @@
|
||||
:label="$t('form.recipient')"
|
||||
:placeholder="$t('form.identifier')"
|
||||
:rules="validationSchema.fields.identifier"
|
||||
:disabled="isBalanceEmpty"
|
||||
:disabled="isBalanceEmpty || isCommunitiesEmpty"
|
||||
:disable-smart-valid-state="disableSmartValidState"
|
||||
@update:model-value="updateField"
|
||||
/>
|
||||
@ -171,6 +173,8 @@ const props = defineProps({
|
||||
const entityDataToForm = computed(() => ({ ...props }))
|
||||
const form = reactive({ ...entityDataToForm.value })
|
||||
const disableSmartValidState = ref(false)
|
||||
const communities = ref([])
|
||||
const autoCommunityIdentifier = ref('')
|
||||
|
||||
const emit = defineEmits(['set-transaction'])
|
||||
|
||||
@ -191,6 +195,10 @@ const userIdentifier = computed(() => {
|
||||
return null
|
||||
})
|
||||
|
||||
function setCommunities(returnedCommunities) {
|
||||
communities.value = returnedCommunities
|
||||
}
|
||||
|
||||
const validationSchema = computed(() => {
|
||||
const amountSchema = number()
|
||||
.required()
|
||||
@ -214,7 +222,24 @@ const validationSchema = computed(() => {
|
||||
return object({
|
||||
memo: memoSchema,
|
||||
amount: amountSchema,
|
||||
identifier: identifierSchema,
|
||||
identifier: identifierSchema.test(
|
||||
'community-is-reachable',
|
||||
'form.validation.identifier.communityIsReachable',
|
||||
(value) => {
|
||||
const parts = value.split('/')
|
||||
// early exit if no community id is in identifier string
|
||||
if (parts.length !== 2) {
|
||||
return true
|
||||
}
|
||||
return communities.value.some((community) => {
|
||||
return (
|
||||
community.uuid === parts[0] ||
|
||||
community.name === parts[0] ||
|
||||
community.url === parts[0]
|
||||
)
|
||||
})
|
||||
},
|
||||
),
|
||||
})
|
||||
} else {
|
||||
// don't need identifier schema if it is a transaction link or identifier was set via url
|
||||
@ -224,7 +249,6 @@ const validationSchema = computed(() => {
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
const formIsInvalid = computed(() => !validationSchema.value.isValidSync(form))
|
||||
|
||||
const updateField = (newValue, name) => {
|
||||
@ -234,6 +258,7 @@ const updateField = (newValue, name) => {
|
||||
}
|
||||
|
||||
const isBalanceEmpty = computed(() => props.balance <= 0)
|
||||
const isCommunitiesEmpty = computed(() => communities.value.length === 0)
|
||||
|
||||
const { result: userResult, error: userError } = useQuery(
|
||||
user,
|
||||
@ -258,8 +283,35 @@ watch(userError, (error) => {
|
||||
}
|
||||
})
|
||||
|
||||
// if identifier contain valid community identifier of a reachable community:
|
||||
// set it as target community and change community-switch to show only current value, instead of select
|
||||
watch(
|
||||
() => form.identifier,
|
||||
(value) => {
|
||||
autoCommunityIdentifier.value = ''
|
||||
const parts = value.split('/')
|
||||
if (parts.length === 2) {
|
||||
const com = communities.value.find(
|
||||
(community) =>
|
||||
community.uuid === parts[0] || community.name === parts[0] || community.url === parts[0],
|
||||
)
|
||||
if (com) {
|
||||
form.targetCommunity = com
|
||||
autoCommunityIdentifier.value = com.uuid
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
function onSubmit() {
|
||||
const transformedForm = validationSchema.value.cast(form)
|
||||
const parts = transformedForm.identifier.split('/')
|
||||
if (parts.length === 2) {
|
||||
transformedForm.identifier = parts[1]
|
||||
transformedForm.targetCommunity = communities.value.find((com) => {
|
||||
return com.uuid === parts[0] || com.name === parts[0] || com.url === parts[0]
|
||||
})
|
||||
}
|
||||
emit('set-transaction', {
|
||||
...transformedForm,
|
||||
selected: radioSelected.value,
|
||||
|
||||
9
frontend/src/graphql/communities.graphql
Normal file
9
frontend/src/graphql/communities.graphql
Normal file
@ -0,0 +1,9 @@
|
||||
query reachableCommunities {
|
||||
reachableCommunities {
|
||||
foreign
|
||||
uuid
|
||||
name
|
||||
description
|
||||
url
|
||||
}
|
||||
}
|
||||
@ -91,19 +91,6 @@ export const listGDTEntriesQuery = gql`
|
||||
}
|
||||
}
|
||||
`
|
||||
|
||||
export const selectCommunities = gql`
|
||||
query {
|
||||
communities {
|
||||
uuid
|
||||
name
|
||||
description
|
||||
foreign
|
||||
url
|
||||
}
|
||||
}
|
||||
`
|
||||
|
||||
export const queryOptIn = gql`
|
||||
query ($optIn: String!) {
|
||||
queryOptIn(optIn: $optIn)
|
||||
|
||||
@ -3,4 +3,10 @@ fragment userFields on User {
|
||||
firstName
|
||||
lastName
|
||||
alias
|
||||
}
|
||||
}
|
||||
|
||||
query user($identifier: String!, $communityIdentifier: String) {
|
||||
user(identifier: $identifier, communityIdentifier: $communityIdentifier) {
|
||||
...userFields
|
||||
}
|
||||
}
|
||||
|
||||
@ -235,6 +235,7 @@
|
||||
},
|
||||
"gddSendAmount": "Das Feld {_field_} muss eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein.",
|
||||
"identifier": {
|
||||
"communityIsReachable": "Community nicht gefunden oder nicht erreichbar!",
|
||||
"required": "Der Empfänger ist ein Pflichtfeld.",
|
||||
"typeError": "Der Empfänger muss eine Email, ein Nutzernamen oder eine Gradido ID sein."
|
||||
},
|
||||
|
||||
@ -235,6 +235,7 @@
|
||||
},
|
||||
"gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits after the decimal point.",
|
||||
"identifier": {
|
||||
"communityIsReachable": "Community not found our not reachable!",
|
||||
"required": "The recipient is a required field.",
|
||||
"typeError": "The recipient must be an email, a username or a Gradido ID."
|
||||
},
|
||||
|
||||
@ -189,6 +189,11 @@
|
||||
"to1": "para",
|
||||
"validation": {
|
||||
"gddSendAmount": "El campo {_field_} debe ser un número entre {min} y {max} con un máximo de dos decimales",
|
||||
"identifier": {
|
||||
"communityIsReachable": "Comunidad no encontrada o no alcanzable!",
|
||||
"required": "El destinatario es un campo obligatorio.",
|
||||
"typeError": "El destinatario debe ser un email, un nombre de usuario o un Gradido ID."
|
||||
},
|
||||
"is-not": "No es posible transferirte Gradidos a ti mismo",
|
||||
"requiredField": "El campo {fieldName} es obligatorio",
|
||||
"usernmae-regex": "El nombre de usuario debe comenzar con una letra seguida de al menos dos caracteres alfanuméricos.",
|
||||
|
||||
@ -195,6 +195,11 @@
|
||||
"validation": {
|
||||
"gddCreationTime": "Le champ {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de une décimale.",
|
||||
"gddSendAmount": "Le champ {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de deux chiffres après la virgule",
|
||||
"identifier": {
|
||||
"communityIsReachable": "Communauté non joignable!",
|
||||
"required": "Le destinataire est un champ obligatoire.",
|
||||
"typeError": "Le destinataire doit être un email, un nom d'utilisateur ou un Gradido ID."
|
||||
},
|
||||
"is-not": "Vous ne pouvez pas vous envoyer de Gradido à vous-même",
|
||||
"requiredField": "Le champ {fieldName} est obligatoire",
|
||||
"usernmae-regex": "Le nom d'utilisateur doit commencer par une lettre, suivi d'au moins deux caractères alphanumériques.",
|
||||
|
||||
@ -189,6 +189,11 @@
|
||||
"to1": "aan",
|
||||
"validation": {
|
||||
"gddSendAmount": "Het veld {_field_} moet een getal tussen {min} en {max} met maximaal twee cijfers achter de komma zijn",
|
||||
"identifier": {
|
||||
"communityIsReachable": "Community niet gevonden of niet bereikbaar!",
|
||||
"required": "Ontvanger is een verplicht veld.",
|
||||
"typeError": "Ontvanger moet een email, een gebruikersnaam of een Gradido ID zijn."
|
||||
},
|
||||
"is-not": "Je kunt geen Gradidos aan jezelf overmaken",
|
||||
"requiredField": "{fieldName} is verplicht",
|
||||
"usernmae-regex": "De gebruikersnaam moet met een letter beginnen, waarop minimaal twee alfanumerieke tekens dienen te volgen.",
|
||||
|
||||
@ -28,10 +28,21 @@ export const memo = string()
|
||||
|
||||
export const identifier = string()
|
||||
.required('form.validation.identifier.required')
|
||||
.test(
|
||||
'valid-parts',
|
||||
'form.validation.identifier.partsError',
|
||||
(value) => (value.match(/\//g) || []).length <= 1, // allow only one or zero slash
|
||||
)
|
||||
.test('valid-identifier', 'form.validation.identifier.typeError', (value) => {
|
||||
const isEmail = !!EMAIL_REGEX.test(value)
|
||||
const isUsername = !!value.match(USERNAME_REGEX)
|
||||
let userPart = value
|
||||
const parts = value.split('/')
|
||||
if (parts.length === 2) {
|
||||
userPart = parts[1]
|
||||
}
|
||||
|
||||
const isEmail = !!EMAIL_REGEX.test(userPart)
|
||||
const isUsername = !!userPart.match(USERNAME_REGEX)
|
||||
// TODO: use valibot and rules from shared
|
||||
const isGradidoId = validateUuid(value) && versionUuid(value) === 4
|
||||
const isGradidoId = validateUuid(userPart) && versionUuid(userPart) === 4
|
||||
return isEmail || isUsername || isGradidoId
|
||||
})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user