mitre
diff --git a/‎.gitignore‎
Lines changed: 4 additions & 1 deletion b/‎.gitignore‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎apps/backend/config/app_config.ts‎
Lines changed: 9 additions & 0 deletions b/‎apps/backend/config/app_config.ts‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎apps/backend/package.json‎
Lines changed: 2 additions & 9 deletions b/‎apps/backend/package.json‎
Lines changed: 2 additions & 9 deletions
diff --git a/‎apps/backend/src/authn/authn.module.ts‎
Lines changed: 1 addition & 2 deletions b/‎apps/backend/src/authn/authn.module.ts‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎apps/backend/src/authn/authn.service.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/backend/src/authn/authn.service.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/backend/src/authn/gitlab.strategy.ts‎
Lines changed: 1 addition & 2 deletions b/‎apps/backend/src/authn/gitlab.strategy.ts‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎apps/backend/src/authn/google.strategy.ts‎
Lines changed: 1 addition & 2 deletions b/‎apps/backend/src/authn/google.strategy.ts‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎apps/backend/src/authn/ldap.strategy.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/backend/src/authn/ldap.strategy.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/backend/src/authn/oidc.strategy.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/backend/src/authn/oidc.strategy.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/backend/src/authn/okta.strategy.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/backend/src/authn/okta.strategy.ts‎
Lines changed: 1 addition & 1 deletion
@@ -3,6 +3,9 @@
 apps/backend/dist
 node_modules
 
+# Typescript cache
+*.tsbuildinfo
+
 # Logs
 logs
 *.log
@@ -68,4 +71,4 @@ certs/*.pem
 .pnp.*
 
 # Database Content
-data/*
+data/*
@@ -34,6 +34,15 @@ export default class AppConfig {
     return process.env[key] || this.envConfig[key];
   }
 
+  getExternalUrl(): string {
+    const external_url = this.get('EXTERNAL_URL');
+    if (external_url === undefined) {
+      return '';
+    } else {
+      return external_url;
+    }
+  }
+
   getSplunkHostUrl(): string {
     const splunk_host_url = this.get('SPLUNK_HOST_URL');
     if (splunk_host_url !== undefined) {
 
@@ -41,10 +41,8 @@
     "@nestjs/schematics": "^11.0.0",
     "@nestjs/sequelize": "^11.0.0",
     "@nestjs/serve-static": "^5.0.3",
-    "@types/bcryptjs": "^3.0.0",
     "@types/connect-pg-simple": "^7.0.0",
     "@types/express": "^5.0.0",
-    "@types/express-rate-limit": "^6.0.0",
     "@types/express-session": "^1.17.3",
     "@types/js-levenshtein": "^1.1.0",
     "@types/ms": "^0.7.31",
@@ -53,8 +51,6 @@
     "@types/passport-github": "^1.1.5",
     "@types/passport-jwt": "^4.0.0",
     "@types/passport-local": "^1.0.33",
-    "@types/supertest": "^7.2.0",
-    "@types/triple-beam": "^1.3.2",
     "@types/uuid": "^10.0.0",
     "@types/validator": "^13.0.0",
     "axios": "^1.4.0",
@@ -70,6 +66,7 @@
     "https-proxy-agent": "^8.0.0",
     "js-levenshtein": "^1.1.6",
     "jsonwebtoken": "^9.0.0",
+    "lodash": "^4.17.23",
     "moment": "^2.29.1",
     "ms": "^2.1.3",
     "passport": "^0.7.0",
@@ -80,15 +77,12 @@
     "passport-jwt": "^4.0.0",
     "passport-ldapauth": "^3.0.1",
     "passport-local": "^1.0.0",
-    "passport-oauth2": "^1.5.0",
-    "pg": "^8.2.1",
-    "reflect-metadata": "^0.2.1",
+    "reflect-metadata": "^0.2.2",
     "rimraf": "^6.0.1",
     "rxjs": "^7.2.0",
     "sequelize": "^6.31.0",
     "sequelize-cli": "^6.2.0",
     "sequelize-typescript": "^2.0.0",
-    "ts-loader": "^9.1.0",
     "tsx": "^4.7.1",
     "uuid": "^11.0.2",
     "winston": "^3.3.3"
@@ -98,7 +92,6 @@
     "@swc/core": "^1.13.0",
     "@types/mock-fs": "^4.10.0",
     "mock-fs": "^5.0.0",
-    "supertest": "^7.0.0",
     "unplugin-swc": "^1.5.5",
     "vitest": "^4.0.18"
   }
 
@@ -22,8 +22,7 @@ import {OidcStrategy} from './oidc.strategy';
 import {OktaStrategy} from './okta.strategy';
 
 async function buildHttpsProxyAgent(proxyUrl: string): Promise<Agent> {
-  const {HttpsProxyAgent} =
-    (await import('https-proxy-agent')) as typeof import('https-proxy-agent');
+  const {HttpsProxyAgent} = await import('https-proxy-agent');
   return new HttpsProxyAgent(proxyUrl);
 }
 
 
@@ -7,7 +7,7 @@ import {JwtService} from '@nestjs/jwt';
 import {compare} from 'bcryptjs';
 import * as crypto from 'crypto';
 import jwt from 'jsonwebtoken';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import moment from 'moment';
 import ms from 'ms';
 import winston from 'winston';
 
@@ -26,8 +26,7 @@ export class GitlabStrategy extends PassportStrategy(Strategy, 'gitlab') {
       clientSecret: configService.get('GITLAB_SECRET') || 'disabled',
       baseURL: configService.get('GITLAB_BASEURL'),
       callbackURL:
-        `${configService.get('EXTERNAL_URL')}/authn/gitlab/callback` ||
-        'disabled'
+        `${configService.getExternalUrl()}/authn/gitlab/callback` || 'disabled'
     });
   }
 
 
@@ -28,8 +28,7 @@ export class GoogleStrategy extends PassportStrategy(OAuth2Strategy, 'google') {
       clientID: configService.get('GOOGLE_CLIENTID') || 'disabled',
       clientSecret: configService.get('GOOGLE_CLIENTSECRET') || 'disabled',
       callbackURL:
-        `${configService.get('EXTERNAL_URL')}/authn/google/callback` ||
-        'disabled',
+        `${configService.getExternalUrl()}/authn/google/callback` || 'disabled',
       scope: ['email', 'profile']
     });
   }
 
@@ -1,7 +1,7 @@
 import {Injectable} from '@nestjs/common';
 import {PassportStrategy} from '@nestjs/passport';
 import * as fs from 'fs';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import Strategy from 'passport-ldapauth';
 import {ConfigService} from '../config/config.service';
 import {AuthnService} from './authn.service';
 
@@ -55,7 +55,7 @@ export class OidcStrategy extends PassportStrategy(Strategy as any, 'oidc') {
         userInfoURL: configService.get('OIDC_USER_INFO_URL') || 'disabled',
         clientID: configService.get('OIDC_CLIENTID') || 'disabled',
         clientSecret: configService.get('OIDC_CLIENT_SECRET') || 'disabled',
-        callbackURL: `${configService.get('EXTERNAL_URL')}/authn/oidc_callback`,
+        callbackURL: `${configService.getExternalUrl()}/authn/oidc_callback`,
         pkce:
           configService.get('OIDC_USES_PKCE_S256') === 'true'
             ? 'S256'
 
@@ -58,7 +58,7 @@ export class OktaStrategy extends PassportStrategy(Strategy as any, 'okta') {
           `https://${configService.get('OKTA_DOMAIN') || 'disabled'}/oauth2/v1/userinfo`,
         clientID: configService.get('OKTA_CLIENTID') || 'disabled',
         clientSecret: configService.get('OKTA_CLIENTSECRET') || 'disabled',
-        callbackURL: `${configService.get('EXTERNAL_URL')}/authn/okta_callback`,
+        callbackURL: `${configService.getExternalUrl()}/authn/okta_callback`,
         scope: ['openid', 'email', 'profile'],
         skipUserProfile: false,
         proxy:
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ import {OidcStrategy} from './oidc.strategy';`
`22`	`22`	`import {OktaStrategy} from './okta.strategy';`
`23`	`23`
`24`	`24`	`async function buildHttpsProxyAgent(proxyUrl: string): Promise<Agent> {`
`25`		`- const {HttpsProxyAgent} =`
`26`		`- (await import('https-proxy-agent')) as typeof import('https-proxy-agent');`
	`25`	`+ const {HttpsProxyAgent} = await import('https-proxy-agent');`
`27`	`26`	`return new HttpsProxyAgent(proxyUrl);`
`28`	`27`	`}`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ export class GitlabStrategy extends PassportStrategy(Strategy, 'gitlab') {`
`26`	`26`	`clientSecret: configService.get('GITLAB_SECRET') \|\| 'disabled',`
`27`	`27`	`baseURL: configService.get('GITLAB_BASEURL'),`
`28`	`28`	`callbackURL:`
`29`		- `${configService.get('EXTERNAL_URL')}/authn/gitlab/callback` \|\|
`30`		`- 'disabled'`
	`29`	+ `${configService.getExternalUrl()}/authn/gitlab/callback` \|\| 'disabled'
`31`	`30`	`});`
`32`	`31`	`}`
`33`	`32`