IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-05-04 22:50:06 +02:00
parent c8ef6be2cd
commit 2d03ae938a
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/federation/client/Client.ts
View File

@ -1,4 +1,4 @@
import { Community as DbCommunity } from '@entity/Community' import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { ApiVersionType } from '@/federation/enum/apiVersionType' import { ApiVersionType } from '@/federation/enum/apiVersionType'
@ -26,7 +26,7 @@ export class Client {
// eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
private constructor() {} private constructor() {}
private static createFederationClient = (dbCom: DbCommunity) => { private static createFederationClient = (dbCom: DbFederatedCommunity) => {
switch (dbCom.apiVersion) { switch (dbCom.apiVersion) {
case ApiVersionType.V1_0: case ApiVersionType.V1_0:
return new Client_1_0(dbCom) return new Client_1_0(dbCom)
@ -43,7 +43,7 @@ export class Client {
* This implementation let you subclass the Singleton class while keeping * This implementation let you subclass the Singleton class while keeping
* just one instance of each subclass around. * just one instance of each subclass around.
*/ */
public static getInstance(dbCom: DbCommunity): FederationClient | null { public static getInstance(dbCom: DbFederatedCommunity): FederationClient | null {
const instance = Client.instanceArray.find((instance) => instance.id === dbCom.id) const instance = Client.instanceArray.find((instance) => instance.id === dbCom.id)
if (instance) { if (instance) {
return instance.client return instance.client

6
backend/src/federation/client/Client_1_0.ts
View File

@ -1,4 +1,4 @@
import { Community as DbCommunity } from '@entity/Community' import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { GraphQLClient } from 'graphql-request' import { GraphQLClient } from 'graphql-request'
import { getPublicKey } from '@/federation/query/getPublicKey' import { getPublicKey } from '@/federation/query/getPublicKey'
@ -7,11 +7,11 @@ import { backendLogger as logger } from '@/server/logger'
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
export class Client_1_0 { export class Client_1_0 {
dbCom: DbCommunity dbCom: DbFederatedCommunity
endpoint: string endpoint: string
client: GraphQLClient client: GraphQLClient
constructor(dbCom: DbCommunity) { constructor(dbCom: DbFederatedCommunity) {
this.dbCom = dbCom this.dbCom = dbCom
this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${ this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
dbCom.apiVersion dbCom.apiVersion

13
backend/src/federation/validateCommunities.ts
View File

@ -69,16 +69,3 @@ export async function validateCommunities(): Promise<void> {
} }
} }
} }
async function invokeVersionedRequestGetPublicKey(
dbCom: DbFederatedCommunity,
): Promise<string | undefined> {
switch (dbCom.apiVersion) {
case ApiVersionType.V1_0:
return v1_0_requestGetPublicKey(dbCom)
case ApiVersionType.V1_1:
return v1_1_requestGetPublicKey(dbCom)
default:
return undefined
}
}