refactor to use ensureUrlEndsWithSlash() instead of duplicate code

backend/src/federation/authenticateCommunities.ts

@@ -6,6 +6,7 @@ import { CONFIG } from '@/config'
 // eslint-disable-next-line camelcase
 import { AuthenticationClient as V1_0_AuthenticationClient } from '@/federation/client/1_0/AuthenticationClient'
 import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
 
 import { OpenConnectionArgs } from './client/1_0/model/OpenConnectionArgs'
 import { AuthenticationClientFactory } from './client/AuthenticationClientFactory'
@@ -39,9 +40,7 @@ export async function startCommunityAuthentication(
         const args = new OpenConnectionArgs()
         args.publicKey = homeCom.publicKey.toString('hex')
         // TODO encrypt url with foreignCom.publicKey and sign it with homeCom.privateKey
-        args.url = homeFedCom.endPoint.endsWith('/')
-          ? homeFedCom.endPoint
-          : homeFedCom.endPoint + '/' + homeFedCom.apiVersion
+        args.url = ensureUrlEndsWithSlash(homeFedCom.endPoint).concat(homeFedCom.apiVersion)
         logger.debug(
           'Authentication: before client.openConnection() args:',
           homeCom.publicKey.toString('hex'),

backend/src/federation/client/1_0/AuthenticationClient.ts

@@ -2,6 +2,7 @@ import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCom
 import { GraphQLClient } from 'graphql-request'
 
 import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
 
 import { OpenConnectionArgs } from './model/OpenConnectionArgs'
 import { openConnection } from './query/openConnection'
@@ -13,9 +14,7 @@ export class AuthenticationClient {
 
   constructor(dbCom: DbFederatedCommunity) {
     this.dbCom = dbCom
-    this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
-      dbCom.apiVersion
-    }/`
+    this.endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion)
     this.client = new GraphQLClient(this.endpoint, {
       method: 'POST',
       jsonSerializer: {

backend/src/federation/client/1_0/FederationClient.ts

@@ -4,6 +4,7 @@ import { GraphQLClient } from 'graphql-request'
 import { getPublicCommunityInfo } from '@/federation/client/1_0/query/getPublicCommunityInfo'
 import { getPublicKey } from '@/federation/client/1_0/query/getPublicKey'
 import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
 
 import { PublicCommunityInfoLoggingView } from './logging/PublicCommunityInfoLogging.view'
 import { GetPublicKeyResult } from './model/GetPublicKeyResult'
@@ -16,9 +17,7 @@ export class FederationClient {
 
   constructor(dbCom: DbFederatedCommunity) {
     this.dbCom = dbCom
-    this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
-      dbCom.apiVersion
-    }/`
+    this.endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion)
     this.client = new GraphQLClient(this.endpoint, {
       method: 'GET',
       jsonSerializer: {

backend/src/federation/client/1_0/SendCoinsClient.ts

@@ -3,6 +3,7 @@ import { GraphQLClient } from 'graphql-request'
 
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
 
 import { SendCoinsArgsLoggingView } from './logging/SendCoinsArgsLogging.view'
 import { SendCoinsResultLoggingView } from './logging/SendCoinsResultLogging.view'
@@ -20,9 +21,7 @@ export class SendCoinsClient {
 
   constructor(dbCom: DbFederatedCommunity) {
     this.dbCom = dbCom
-    this.endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
-      dbCom.apiVersion
-    }/`
+    this.endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion)
     this.client = new GraphQLClient(this.endpoint, {
       method: 'POST',
       jsonSerializer: {

backend/src/federation/client/FederationClientFactory.ts

@@ -5,6 +5,7 @@ import { FederationClient as V1_0_FederationClient } from '@/federation/client/1
 // eslint-disable-next-line camelcase
 import { FederationClient as V1_1_FederationClient } from '@/federation/client/1_1/FederationClient'
 import { ApiVersionType } from '@/federation/enum/apiVersionType'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
 
 // eslint-disable-next-line camelcase
 type FederationClient = V1_0_FederationClient | V1_1_FederationClient
@@ -47,10 +48,7 @@ export class FederationClientFactory {
     const instance = FederationClientFactory.instanceArray.find(
       (instance) => instance.id === dbCom.id,
     )
-    // TODO: found a way to prevent double code with FederationClient::constructor
-    const endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
-      dbCom.apiVersion
-    }/`
+    const endpoint = ensureUrlEndsWithSlash(dbCom.endPoint).concat(dbCom.apiVersion)
     // check if endpoint is still the same and not changed meanwhile
     if (instance && instance.client.getEndpoint() === endpoint) {
       return instance.client

backend/src/graphql/model/FederatedCommunity.ts

@@ -1,6 +1,8 @@
 import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 import { ObjectType, Field, Int } from 'type-graphql'
 
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
+
 @ObjectType()
 export class FederatedCommunity {
   constructor(dbCom: DbFederatedCommunity) {
@@ -8,7 +10,7 @@ export class FederatedCommunity {
     this.foreign = dbCom.foreign
     this.publicKey = dbCom.publicKey.toString('hex')
     this.apiVersion = dbCom.apiVersion
-    this.endPoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
+    this.endPoint = ensureUrlEndsWithSlash(dbCom.endPoint)
     this.lastAnnouncedAt = dbCom.lastAnnouncedAt
     this.verifiedAt = dbCom.verifiedAt
     this.lastErrorAt = dbCom.lastErrorAt

backend/src/graphql/resolver/util/authenticateGmsUserPlayground.ts

@@ -4,15 +4,14 @@ import { verifyAuthToken } from '@/apis/gms/GmsClient'
 import { CONFIG } from '@/config'
 import { GmsUserAuthenticationResult } from '@/graphql/model/GmsUserAuthenticationResult'
 import { backendLogger as logger } from '@/server/logger'
+import { ensureUrlEndsWithSlash } from '@/util/utilities'
 
 export async function authenticateGmsUserPlayground(
   token: string,
   dbUser: DbUser,
 ): Promise<GmsUserAuthenticationResult> {
   const result = new GmsUserAuthenticationResult()
-  const dashboardUrl = CONFIG.GMS_DASHBOARD_URL.endsWith('/')
-    ? CONFIG.GMS_DASHBOARD_URL
-    : CONFIG.GMS_DASHBOARD_URL.concat('/')
+  const dashboardUrl = ensureUrlEndsWithSlash(CONFIG.GMS_DASHBOARD_URL)
 
   result.url = dashboardUrl.concat('playground')
   result.token = await verifyAuthToken(dbUser.communityUuid, token)