fix: Improve type definitions in OIDCStrategy.ts

app/scenes/Settings/components/ApiKeyListItem.tsx

@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import { CopyIcon } from "outline-icons";
-import { useState, useRef, useCallback } from "react";
+import React, { useState, useRef, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import ApiKey from "~/models/ApiKey";

plugins/oidc/server/auth/OIDCStrategy.ts

@@ -1,11 +1,19 @@
 import { HttpsProxyAgent } from "https-proxy-agent";
-import OAuth2Strategy, { Strategy } from "passport-oauth2";
+import {
+  Strategy,
+  StrategyOptionsWithRequest,
+  VerifyFunctionWithRequest,
+} from "passport-oauth2";
 import { Request } from "express";
 
+interface OIDCOptions extends StrategyOptionsWithRequest {
+  originalQuery?: Record<string, string | string[]>;
+}
+
 export class OIDCStrategy extends Strategy {
   constructor(
-    options: OAuth2Strategy.StrategyOptionsWithRequest,
-    verify: OAuth2Strategy.VerifyFunctionWithRequest
+    options: StrategyOptionsWithRequest,
+    verify: VerifyFunctionWithRequest
   ) {
     super(options, verify);
 
@@ -16,12 +24,12 @@ export class OIDCStrategy extends Strategy {
   }
 
   authenticate(req: Request, options?: Record<string, unknown>) {
-    options = options || {};
-    options.originalQuery = req.query;
-    super.authenticate(req, options);
+    const opts = options ? { ...options } : ({} as OIDCOptions);
+    opts.originalQuery = req.query as Record<string, string | string[]>;
+    super.authenticate(req, opts);
   }
 
-  authorizationParams(options: Record<string, unknown>) {
+  authorizationParams(options: OIDCOptions) {
     return {
       ...options.originalQuery,
       ...super.authorizationParams?.(options),

shared/utils/naturalSort.ts

@@ -22,7 +22,7 @@ function getSortByField<T extends Record<string, unknown>>(
     typeof keyOrCallback === "string"
       ? item[keyOrCallback]
       : keyOrCallback(item);
-  return cleanValue(String(field));
+  return cleanValue(field);
 }
 
 function naturalSortBy<T extends Record<string, unknown>>(