refactor: Refactor service module to TS + ESM

.eslintrc.json

@@ -45,7 +45,8 @@
     "@typescript-eslint/no-explicit-any": "off", // temporary until TS refactor is complete
     "@typescript-eslint/no-unused-vars": "off", // temporary until TS refactor is complete
     "@typescript-eslint/no-require-imports": "off", // prevents error on old "require" imports
-    "@typescript-eslint/no-unused-expressions": "off" // prevents error on test "expect" expressions
+    "@typescript-eslint/no-unused-expressions": "off", // prevents error on test "expect" expressions
+    "new-cap": "off" // prevents error on express.Router()
   },
   "settings": {
     "react": {

index.ts

@@ -5,7 +5,7 @@ import { hideBin } from 'yargs/helpers';
 import * as fs from 'fs';
 import { configFile, setConfigFile, validate } from './src/config/file';
 import proxy from './src/proxy';
-import service from './src/service';
+import * as service from './src/service';
 
 const argv = yargs(hideBin(process.argv))
   .usage('Usage: $0 [options]')

package.json

@@ -89,11 +89,17 @@
     "@babel/preset-react": "^7.22.5",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
+    "@types/cors": "^2.8.19",
     "@types/express": "^5.0.1",
     "@types/express-http-proxy": "^1.6.6",
+    "@types/express-session": "^1.18.2",
+    "@types/jsonwebtoken": "^9.0.10",
+    "@types/jwk-to-pem": "^2.0.3",
     "@types/lodash": "^4.17.15",
+    "@types/lusca": "^1.7.5",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.5",
+    "@types/passport-local": "^1.0.38",
     "@types/yargs": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
     "@typescript-eslint/parser": "^8.26.1",

src/config/index.ts

@@ -32,7 +32,7 @@ let _privateOrganizations: string[] = defaultSettings.privateOrganizations;
 let _urlShortener: string = defaultSettings.urlShortener;
 let _contactEmail: string = defaultSettings.contactEmail;
 let _csrfProtection: boolean = defaultSettings.csrfProtection;
-let _domains: Record<string, unknown> = defaultSettings.domains;
+let _domains: Record<string, string> = defaultSettings.domains;
 let _rateLimit: RateLimitConfig = defaultSettings.rateLimit;
 
 // These are not always present in the default config file, so casting is required

src/config/types.ts

@@ -21,7 +21,7 @@ export interface UserSettings {
   urlShortener: string;
   contactEmail: string;
   csrfProtection: boolean;
-  domains: Record<string, unknown>;
+  domains: Record<string, string>;
   rateLimit: RateLimitConfig;
 }
 
@@ -48,7 +48,39 @@ export interface Database {
 export interface Authentication {
   type: string;
   enabled: boolean;
-  options?: Record<string, unknown>;
+  oidcConfig?: OidcConfig;
+  adConfig?: AdConfig;
+  jwtConfig?: JwtConfig;
+
+  // Deprecated fields for backwards compatibility
+  // TODO: remove in future release and keep the ones in adConfig
+  userGroup?: string;
+  adminGroup?: string;
+  domain?: string;
+}
+
+export interface OidcConfig {
+  issuer: string;
+  clientID: string;
+  clientSecret: string;
+  callbackURL: string;
+  scope: string;
+}
+
+export interface AdConfig {
+  url: string;
+  baseDN: string;
+  searchBase: string;
+  userGroup?: string;
+  adminGroup?: string;
+  domain?: string;
+}
+
+export interface JwtConfig {
+  clientID: string;
+  authorityURL: string;
+  roleMapping: Record<string, unknown>;
+  expectedAudience?: string;
 }
 
 export interface TempPasswordConfig {

src/proxy/processors/push-action/pullRemote.ts

@@ -1,11 +1,12 @@
 import { Action, Step } from '../../actions';
 import fs from 'fs';
-import git from 'isomorphic-git';
-import gitHttpClient from 'isomorphic-git/http/node';
 
 const dir = './.remote';
 
 const exec = async (req: any, action: Action): Promise<Action> => {
+  const git = await import('isomorphic-git');
+  const gitHttpClient = await import('isomorphic-git/http/node/index.js');
+
   const step = new Step('pullRemote');
 
   try {

src/proxy/routes/index.ts

@@ -48,7 +48,7 @@ const validGitRequest = (url: string, headers: any): boolean => {
       return false;
     }
     // https://www.git-scm.com/docs/http-protocol#_uploading_data
-    return agent.startsWith('git/') && accept.startsWith('application/x-git-') ;
+    return agent.startsWith('git/') && accept.startsWith('application/x-git-');
   }
   return false;
 };