diff --git a/api/src/config/matomo.config.ts b/api/src/config/matomo.config.ts deleted file mode 100644 index dacfd178f90073e950116aedf8e296dfaa557808..0000000000000000000000000000000000000000 --- a/api/src/config/matomo.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { registerAs } from '@nestjs/config'; -import { parseToBoolean } from 'src/common/utils/shared.utils'; - -export default registerAs('matomo', () => { - return { - enabled: parseToBoolean(process.env.MATOMO_ENABLED, false), - urlBase: process.env.MATOMO_URL || undefined, - siteId: process.env.MATOMO_SITE_ID || undefined, - }; -}); diff --git a/api/src/engine/engine.resolver.ts b/api/src/engine/engine.resolver.ts index 97b39c736ff064772fc7df701a404965dae187db..5c1e6d080ee9c5f534c4ea938cc206311b8147f9 100644 --- a/api/src/engine/engine.resolver.ts +++ b/api/src/engine/engine.resolver.ts @@ -38,7 +38,6 @@ export class EngineResolver { @Public() configuration(): Configuration { const engineConf = this.engineService.getConfiguration(); - const matomo = this.configSerivce.get('matomo'); const authConf: ConfigType<typeof authConfig> = this.configSerivce.get('auth'); @@ -48,7 +47,6 @@ export class EngineResolver { skipTos: parseToBoolean(this.configSerivce.get(ENGINE_SKIP_TOS)), enableSSO: parseToBoolean(authConf.enableSSO), skipAuth: parseToBoolean(authConf.skipAuth, true), - matomo, ontologyUrl: this.configSerivce.get(ENGINE_ONTOLOGY_URL), contactLink: this.configSerivce.get(ENGINE_CONTACT_LINK), }; diff --git a/api/src/engine/models/configuration.model.ts b/api/src/engine/models/configuration.model.ts index 854f5c5901e83f77fb76ab1e74cb73f82e8bab05..08aef511c2459530f1e1b222d1db8509cba5ebc9 100644 --- a/api/src/engine/models/configuration.model.ts +++ b/api/src/engine/models/configuration.model.ts @@ -1,5 +1,4 @@ import { Field, ObjectType } from '@nestjs/graphql'; -import { Matomo } from './configuration/matomo.model'; @ObjectType() export class Configuration { @Field() @@ -34,9 +33,6 @@ export class Configuration { @Field({ nullable: true, defaultValue: true }) enableSSO?: boolean; - @Field(() => Matomo, { nullable: true }) - matomo?: Matomo; - @Field({ nullable: true }) ontologyUrl?: string; } diff --git a/api/src/engine/models/configuration/matomo.model.ts b/api/src/engine/models/configuration/matomo.model.ts deleted file mode 100644 index 62782ce3f4b63bfdee7cbf8821578dd04d9a6db5..0000000000000000000000000000000000000000 --- a/api/src/engine/models/configuration/matomo.model.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Field, ObjectType } from '@nestjs/graphql'; - -@ObjectType() -export class Matomo { - @Field({ nullable: true, defaultValue: false }) - enabled?: boolean; - - @Field({ nullable: true }) - siteId?: string; - - @Field({ nullable: true }) - urlBase?: string; -} diff --git a/api/src/main/app.module.ts b/api/src/main/app.module.ts index 6b2415689fa0cfb23f66596e388e8ee3d4307e0d..d488832699e9bfbdd5d3ab9cd4e0fa9c232175f5 100644 --- a/api/src/main/app.module.ts +++ b/api/src/main/app.module.ts @@ -9,7 +9,6 @@ import { AuthModule } from 'src/auth/auth.module'; import authConfig from 'src/config/auth.config'; import cacheConfig from 'src/config/cache.config'; import dbConfig from 'src/config/db.config'; -import matomoConfig from 'src/config/matomo.config'; import { EngineModule } from 'src/engine/engine.module'; import { ExperimentsModule } from 'src/experiments/experiments.module'; import { FilesModule } from 'src/files/files.module'; @@ -22,7 +21,7 @@ import { AppService } from './app.service'; ConfigModule.forRoot({ isGlobal: true, envFilePath: ['.env', '.env.defaults'], - load: [dbConfig, matomoConfig, cacheConfig, authConfig], + load: [dbConfig, cacheConfig, authConfig], }), GraphQLModule.forRoot<ApolloDriverConfig>({ driver: ApolloDriver, diff --git a/api/src/schema.gql b/api/src/schema.gql index 913fd6dca93e03650a13765141ebf554c3fbd318..340c9b61c5f3fd9655ba6d158ce62aeb049ee177 100644 --- a/api/src/schema.gql +++ b/api/src/schema.gql @@ -26,12 +26,6 @@ type AuthenticationOutput { refreshToken: String! } -type Matomo { - enabled: Boolean - siteId: String - urlBase: String -} - type Configuration { connectorId: String! hasGalaxy: Boolean @deprecated(reason: "Only used for legacy reason should be avoided") @@ -43,7 +37,6 @@ type Configuration { skipAuth: Boolean skipTos: Boolean enableSSO: Boolean - matomo: Matomo ontologyUrl: String }