From 9206e75137a1cf12d6b1f03a6330b32cf5ae6111 Mon Sep 17 00:00:00 2001
From: Steve Reis <stevereis93@gmail.com>
Date: Fri, 5 Aug 2022 12:22:04 +0000
Subject: [PATCH] feat: Remove Matomo configuration
---
api/src/config/matomo.config.ts | 10 ----------
api/src/engine/engine.resolver.ts | 2 --
api/src/engine/models/configuration.model.ts | 4 ----
api/src/engine/models/configuration/matomo.model.ts | 13 -------------
api/src/main/app.module.ts | 3 +--
api/src/schema.gql | 7 -------
6 files changed, 1 insertion(+), 38 deletions(-)
delete mode 100644 api/src/config/matomo.config.ts
delete mode 100644 api/src/engine/models/configuration/matomo.model.ts
diff --git a/api/src/config/matomo.config.ts b/api/src/config/matomo.config.ts
deleted file mode 100644
index dacfd17..0000000
--- 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 97b39c7..5c1e6d0 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 854f5c5..08aef51 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 62782ce..0000000
--- 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 6b24156..d488832 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 913fd6d..340c9b6 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
}
--
GitLab