feat: add config setting for server port #315

src/models/openIdInformation.ts

@@ -23,6 +23,7 @@ export interface OpenIdConfiguration {
   useDeviceCodeClientSecret?: boolean;
   usePkce: boolean;
   redirectUri: URL;
+  serverPort?: number;
 }
 
 export interface OpenIdInformation extends UserSession {

src/plugins/oauth2/flow/authorizationCodeFlow.ts

@@ -55,7 +55,8 @@ class AuthorizationCodeFlow implements OpenIdFlow {
 
           registerListener({
             id: state,
-            url: config.redirectUri,
+            port: config.serverPort || Number(config.redirectUri.port),
+            path: config.redirectUri.pathname,
             name: `authorization for ${config.clientId}: ${config.authorizationEndpoint}`,
             resolve: params => {
               if (params.code && params.state === state) {

src/plugins/oauth2/flow/implicitFlow.ts

@@ -53,7 +53,8 @@ class ImplicitFlow implements OpenIdFlow {
 
           registerListener({
             id: state,
-            url: config.redirectUri,
+            port: config.serverPort || Number(config.redirectUri.port),
+            path: config.redirectUri.pathname,
             name: `authorization for ${config.clientId}: ${config.authorizationEndpoint}`,
             resolve: params => {
               if (params.state === state) {

src/plugins/oauth2/flow/openIdHttpServer.ts

@@ -1,9 +1,9 @@
 import { log } from '../../../io';
 import { createServer, Server } from 'http';
-import { URL } from 'url';
 
 interface RequestListener {
-  url: URL;
+  path: string;
+  port: number;
   id: string;
   name: string;
   resolve: (params: Record<string, string>) => { valid: boolean; message: string; statusMessage: string };
@@ -18,7 +18,7 @@ let serverTimeoutTime = 0;
 
 export function registerListener(listener: RequestListener): void {
   listeners.push(listener);
-  initServer(Number(listener.url.port), listener.url.pathname);
+  initServer(listener.port, listener.path);
 }
 
 export function unregisterListener(id: string): void {
@@ -67,7 +67,6 @@ function closeServer() {
 function initServer(port: number, callbackPath: string) {
   resetServer(600);
   if (!server) {
-    log.debug(`open http server on port ${port}`);
     server = createServer((req, res) => {
       try {
         let statusMessage = 'invalid';
@@ -134,6 +133,12 @@ function initServer(port: number, callbackPath: string) {
       }
     });
     server.listen(port);
+    const address = server.address();
+    if (address) {
+      log.debug(`open http server on port ${typeof address === 'string' ? address : address.port}`);
+    } else {
+      log.debug(`open http server on port ${port}`);
+    }
   }
 }
 

src/plugins/oauth2/openIdConfiguration.ts

@@ -9,7 +9,15 @@ export const DEFAULT_CALLBACK_URI = 'http://localhost:3000/callback';
 const DefaultOAuthVariablePrefix = 'oauth2';
 
 function getVariableRaw(variables: models.Variables, name: string, variablePrefix: string): unknown {
-  let varValue = variables[`${variablePrefix}_${name}`];
+  const variableName = `${variablePrefix}_${name}`;
+  let varValue = variables[variableName];
+
+  const caseInsensitiveVariables = Object.entries(variables)
+    .filter(([key]) => key.toLowerCase() === variableName.toLowerCase())
+    .map(([, value]) => value);
+  if (caseInsensitiveVariables.length === 1) {
+    return caseInsensitiveVariables.pop();
+  }
   if (typeof varValue === 'undefined' || varValue === null) {
     varValue = get(variables, `${variablePrefix}.${name}`);
   }
@@ -50,6 +58,10 @@ export function getOpenIdConfiguration(
     const expandedValue = getVariableUnknown(variables, variablePrefix, name);
     return utils.toBoolean(expandedValue, defaultValue);
   };
+  const getNumber = (name: string, defaultValue = undefined) => {
+    const expandedValue = getVariableUnknown(variables, variablePrefix, name);
+    return utils.toNumber(expandedValue, defaultValue);
+  };
 
   const config: models.OpenIdConfiguration = {
     variablePrefix: variablePrefix || DefaultOAuthVariablePrefix,
@@ -71,6 +83,7 @@ export function getOpenIdConfiguration(
     useAuthorizationHeader: getBoolean('useAuthorizationHeader', true),
     useDeviceCodeClientSecret: getBoolean('useDeviceCodeClientSecret'),
     usePkce: getBoolean('usePkce'),
+    serverPort: getNumber('serverPort'),
   };
   return config;
 }

src/utils/index.ts

@@ -10,6 +10,7 @@ export * from './logUtils';
 export * from './markdownUtils';
 export * from './mimeTypeUtils';
 export * from './modelUtils';
+export * from './numberUtils';
 export * from './parserUtils';
 export * from './promiseUtils';
 export * from './repeatUtils';

src/utils/numberUtils.ts

@@ -0,0 +1,15 @@
+import { ensureString } from './stringUtils';
+
+export function toNumber<T>(value: unknown, defaultValue: T | undefined = undefined): number | T | undefined {
+  if (typeof value === 'number') {
+    return value;
+  }
+  const stringValue = ensureString(value);
+  if (stringValue) {
+    const numberValue = Number.parseInt(stringValue.trim(), 10);
+    if (!isNaN(numberValue)) {
+      return numberValue;
+    }
+  }
+  return defaultValue;
+}

src/utils/stringUtils.ts

@@ -16,16 +16,6 @@ export function isString(text: unknown): text is string {
   return typeof text === 'string';
 }
 
-export function toNumber<T>(text: string | undefined, defaultVal?: T | undefined): number | T | undefined {
-  if (text) {
-    const number = Number.parseInt(text, 10);
-    if (!Number.isNaN(number)) {
-      return number;
-    }
-  }
-  return defaultVal;
-}
-
 export function isStringEmpty(text: unknown): boolean {
   return typeof text === 'string' && /^(\s*)?$/u.test(text);
 }