fix eslint error

Author: PreciousOritsedere

api/server/controllers/AuthController.js

@@ -74,7 +74,14 @@ const resetPasswordController = async (req, res) => {
  * @param {string} [tokenProvider] - 'solid' or 'openid' from cookie so setOpenIDAuthTokens sets the correct token_provider cookie
  * @returns {Promise<boolean>} True if response was sent, false if caller should continue to next handler
  */
-async function performOpenIDRefresh(req, res, openIdConfig, refreshToken, refreshParams = {}, tokenProvider) {
+async function performOpenIDRefresh(
+  req,
+  res,
+  openIdConfig,
+  refreshToken,
+  refreshParams = {},
+  tokenProvider,
+) {
   try {
     const tokenset = await openIdClient.refreshTokenGrant(
       openIdConfig,
@@ -198,7 +205,9 @@ const refreshController = async (req, res) => {
             try {
               return getOpenIdConfig();
             } catch (e) {
-              logger.warn('[refreshController] OpenID config not initialized', { message: e?.message });
+              logger.warn('[refreshController] OpenID config not initialized', {
+                message: e?.message,
+              });
               return null;
             }
           })();

api/server/controllers/auth/solidOpenIdDynamic.js

@@ -68,8 +68,14 @@ async function startSolidOpenIdFlow(req, res, next) {
 
   const provider = getSolidOpenIdProviderByIssuer(issuer.trim());
   if (!provider) {
-    logger.warn('[solidOpenIdDynamic] Unknown or unconfigured issuer', { issuer: issuer.slice(0, 80) });
-    res.status(400).send('Unknown or unconfigured Solid Identity Provider. Use one of the options from the login page.');
+    logger.warn('[solidOpenIdDynamic] Unknown or unconfigured issuer', {
+      issuer: issuer.slice(0, 80),
+    });
+    res
+      .status(400)
+      .send(
+        'Unknown or unconfigured Solid Identity Provider. Use one of the options from the login page.',
+      );
     return;
   }
 
@@ -151,10 +157,13 @@ async function handleSolidOpenIdCallback(req, res, next) {
   if (!code) {
     const errParam = req.query.error;
     const errDesc = req.query.error_description;
-    logger.warn('[solidOpenIdDynamic] Callback missing code - IdP likely rejected the auth request', {
-      error: errParam,
-      error_description: errDesc,
-    });
+    logger.warn(
+      '[solidOpenIdDynamic] Callback missing code - IdP likely rejected the auth request',
+      {
+        error: errParam,
+        error_description: errDesc,
+      },
+    );
     res.redirect(`${process.env.DOMAIN_CLIENT}/login?redirect=false&error=auth_failed`);
     return;
   }
@@ -190,19 +199,12 @@ async function handleSolidOpenIdCallback(req, res, next) {
       discoveryOptions,
     );
 
-    const currentUrl = new URL(
-      req.originalUrl || req.url,
-      process.env.DOMAIN_SERVER,
-    );
+    const currentUrl = new URL(req.originalUrl || req.url, process.env.DOMAIN_SERVER);
 
-    const tokenset = await client.authorizationCodeGrant(
-      config,
-      currentUrl,
-      {
-        expectedState: state,
-        ...(sessionData.code_verifier && { pkceCodeVerifier: sessionData.code_verifier }),
-      },
-    );
+    const tokenset = await client.authorizationCodeGrant(config, currentUrl, {
+      expectedState: state,
+      ...(sessionData.code_verifier && { pkceCodeVerifier: sessionData.code_verifier }),
+    });
 
     delete req.session[SESSION_KEY][state];
     req.session.save(() => {});

api/server/index.js

@@ -168,7 +168,9 @@ const startServer = async () => {
   // Local CSS (and other Solid IdPs) fetch this URL to get redirect_uris; they must match the redirect_uri we send in the auth request.
   app.get('/solid-client-id', (_, res) => {
     const callbackPath =
-      process.env.SOLID_OPENID_CALLBACK_URL || process.env.OPENID_CALLBACK_URL || '/oauth/openid/callback';
+      process.env.SOLID_OPENID_CALLBACK_URL ||
+      process.env.OPENID_CALLBACK_URL ||
+      '/oauth/openid/callback';
     const baseUrl = process.env.DOMAIN_SERVER || 'http://localhost:3080';
     const clientId = `${baseUrl}/solid-client-id`;
     res.set('Content-Type', 'application/ld+json');

api/server/routes/config.js

@@ -96,12 +96,7 @@ router.get('/', async function (req, res) {
         ? [
             ...DEFAULT_ISSUER_OPTIONS,
             ...getSolidOpenIdProviders()
-              .filter(
-                (p) =>
-                  !DEFAULT_ISSUER_OPTIONS.some(
-                    (d) => normalizeIssuer(d.issuer) === p.issuer,
-                  ),
-              )
+              .filter((p) => !DEFAULT_ISSUER_OPTIONS.some((d) => normalizeIssuer(d.issuer) === p.issuer))
               .map((p) => ({ issuer: p.issuer, label: p.label })),
           ]
         : [],

api/server/services/Config/solidOpenId.js

@@ -4,8 +4,7 @@
  */
 
 const defaultScope = process.env.SOLID_OPENID_SCOPE || 'openid webid offline_access';
-const defaultCallbackPath =
-  process.env.SOLID_OPENID_CALLBACK_URL || '/oauth/openid/callback';
+const defaultCallbackPath = process.env.SOLID_OPENID_CALLBACK_URL || '/oauth/openid/callback';
 
 /**
  * Default display labels for known issuers (used when provider config has no label).
@@ -88,7 +87,7 @@ function getSolidOpenIdProviders() {
           callbackPath: (p.callbackPath && String(p.callbackPath).trim()) || defaultCallbackPath,
         });
       }
-    } catch (e) {
+    } catch (_e) {
       // Invalid JSON
     }
   }
@@ -154,16 +153,16 @@ function getSolidOpenIdProviderByIssuer(issuer) {
   if (configured) return configured;
 
   // Custom issuer: use SOLID_OPENID_CUSTOM_* if set and URL is allowed
-  if (
-    process.env.SOLID_OPENID_CUSTOM_CLIENT_ID &&
-    isAllowedCustomIssuer(normalized)
-  ) {
+  if (process.env.SOLID_OPENID_CUSTOM_CLIENT_ID && isAllowedCustomIssuer(normalized)) {
     return {
       issuer: normalized,
       clientId: process.env.SOLID_OPENID_CUSTOM_CLIENT_ID,
       clientSecret: process.env.SOLID_OPENID_CUSTOM_CLIENT_SECRET || '',
       scope: process.env.SOLID_OPENID_CUSTOM_SCOPE || defaultScope,
-      label: KNOWN_ISSUER_LABELS[normalized] || KNOWN_ISSUER_LABELS[normalized.replace(/\/$/, '')] || 'Custom',
+      label:
+        KNOWN_ISSUER_LABELS[normalized] ||
+        KNOWN_ISSUER_LABELS[normalized.replace(/\/$/, '')] ||
+        'Custom',
       callbackPath: defaultCallbackPath,
     };
   }

api/server/socialLogins.js

@@ -15,7 +15,11 @@ const {
   setupSaml,
 } = require('~/strategies');
 const { getLogStores } = require('~/cache');
-const { getSolidOpenIdProviders, getSolidOpenIdProvidersForJwt, isSolidOpenIdEnabled } = require('./services/Config/solidOpenId');
+const {
+  getSolidOpenIdProviders,
+  getSolidOpenIdProvidersForJwt,
+  isSolidOpenIdEnabled,
+} = require('./services/Config/solidOpenId');
 const { ensureSolidJwtRegistered } = require('./services/ensureSolidJwt');
 
 /**
@@ -74,7 +78,9 @@ async function configureSolidOpenIdFromProviders(app) {
 
   const config = await setupSolidOpenIdFromProvider(providers[0]);
   if (!config) {
-    logger.warn('[configureSolidOpenIdFromProviders] Discovery for first provider failed - solidJwt not registered.');
+    logger.warn(
+      '[configureSolidOpenIdFromProviders] Discovery for first provider failed - solidJwt not registered.',
+    );
     return;
   }
   passport.use('solidJwt', openIdJwtLogin(config));
@@ -142,11 +148,7 @@ const configureSocialLogins = async (app) => {
   }
   // Solid: dynamic providers only (SOLID_OPENID_PROVIDERS or SOLID_OPENID_CUSTOM_CLIENT_ID). Session + solidJwt from first provider.
   const solidProvidersForJwt = getSolidOpenIdProvidersForJwt();
-  const solidProvidersFromEnv = getSolidOpenIdProviders();
-  if (
-    process.env.SOLID_OPENID_SESSION_SECRET &&
-    solidProvidersForJwt.length > 0
-  ) {
+  if (process.env.SOLID_OPENID_SESSION_SECRET && solidProvidersForJwt.length > 0) {
     await configureSolidOpenIdFromProviders(app);
   } else if (solidProvidersForJwt.length > 0) {
     await registerSolidJwtFromProviders();

api/strategies/SolidOpenidStrategy.js

@@ -496,7 +496,7 @@ async function verifySolidUser(tokenset, openidConfig) {
  * @function setupSolidOpenId
  * @returns {Promise<Configuration | null>}
  */
-async function setupSolidOpenId() {
+async function _setupSolidOpenId() {
   try {
     const shouldGenerateNonce = isEnabled(process.env.OPENID_GENERATE_NONCE);
 
@@ -524,9 +524,9 @@ async function setupSolidOpenId() {
       },
     );
 
-    const requiredRole = process.env.OPENID_REQUIRED_ROLE;
-    const requiredRoleParameterPath = process.env.OPENID_REQUIRED_ROLE_PARAMETER_PATH;
-    const requiredRoleTokenKind = process.env.OPENID_REQUIRED_ROLE_TOKEN_KIND;
+    const _requiredRole = process.env.OPENID_REQUIRED_ROLE;
+    const _requiredRoleParameterPath = process.env.OPENID_REQUIRED_ROLE_PARAMETER_PATH;
+    const _requiredRoleTokenKind = process.env.OPENID_REQUIRED_ROLE_TOKEN_KIND;
     const usePKCE = isEnabled(process.env.OPENID_USE_PKCE);
     logger.info(`[SolidOpenidStrategy] OpenID authentication configuration`, {
       generateNonce: shouldGenerateNonce,
@@ -537,9 +537,9 @@ async function setupSolidOpenId() {
 
     // Set of env variables that specify how to set if a user is an admin
     // If not set, all users will be treated as regular users
-    const adminRole = process.env.OPENID_ADMIN_ROLE;
-    const adminRoleParameterPath = process.env.OPENID_ADMIN_ROLE_PARAMETER_PATH;
-    const adminRoleTokenKind = process.env.OPENID_ADMIN_ROLE_TOKEN_KIND;
+    const _adminRole = process.env.OPENID_ADMIN_ROLE;
+    const _adminRoleParameterPath = process.env.OPENID_ADMIN_ROLE_PARAMETER_PATH;
+    const _adminRoleTokenKind = process.env.OPENID_ADMIN_ROLE_TOKEN_KIND;
 
     const openidLogin = new CustomOpenIDStrategy(
       {

client/src/components/Auth/SolidLoginButton.tsx

@@ -12,6 +12,8 @@ import {
 } from '@librechat/client';
 import type { TStartupConfig } from 'librechat-data-provider';
 
+import { useLocalize, TranslationKeys } from '~/hooks';
+
 type SolidLoginButtonProps = {
   startupConfig: TStartupConfig;
   label: string;
@@ -34,6 +36,7 @@ function isValidIssuerUrl(url: string): boolean {
  * Redirects to serverDomain + '/oauth/openid?issuer=' + encodeURIComponent(selectedIssuer)
  */
 function SolidLoginButton({ startupConfig, label, Icon }: SolidLoginButtonProps) {
+  const localize = useLocalize();
   const [open, setOpen] = useState(false);
   const [providerUrl, setProviderUrl] = useState('');
   const [selectedOptionIssuer, setSelectedOptionIssuer] = useState<string | null>(null);
@@ -47,7 +50,9 @@ function SolidLoginButton({ startupConfig, label, Icon }: SolidLoginButtonProps)
   const canContinue =
     serverDomain &&
     !!trimmedUrl &&
-    (customEnabled ? isValidIssuerUrl(trimmedUrl) : options.some((opt) => opt.issuer === trimmedUrl));
+    (customEnabled
+      ? isValidIssuerUrl(trimmedUrl)
+      : options.some((opt) => opt.issuer === trimmedUrl));
 
   const handleSelectOption = (issuer: string) => {
     setSelectedOptionIssuer(issuer);
@@ -88,23 +93,22 @@ function SolidLoginButton({ startupConfig, label, Icon }: SolidLoginButtonProps)
         </OGDialogTrigger>
         <OGDialogContent className="max-w-md">
           <OGDialogHeader>
-            <OGDialogTitle>Choose Solid Identity Provider</OGDialogTitle>
+            <OGDialogTitle>
+              {localize('com_auth_solid_idp_modal_title' as TranslationKeys)}
+            </OGDialogTitle>
             <OGDialogDescription>
-              Enter your provider URL or pick one of the providers below.
+              {localize('com_auth_solid_idp_modal_description' as TranslationKeys)}
             </OGDialogDescription>
           </OGDialogHeader>
           <div className="space-y-4 py-4">
             <div className="space-y-2">
-              <label
-                htmlFor="solid-idp-url"
-                className="text-sm font-medium text-text-primary"
-              >
-                Solid Identity Provider
+              <label htmlFor="solid-idp-url" className="text-sm font-medium text-text-primary">
+                {localize('com_auth_solid_idp_label' as TranslationKeys)}
               </label>
               <input
                 id="solid-idp-url"
                 type="url"
-                placeholder="Enter your provider URL"
+                placeholder={localize('com_auth_solid_idp_placeholder' as TranslationKeys)}
                 value={providerUrl}
                 onChange={(e) => {
                   setProviderUrl(e.target.value);
@@ -120,7 +124,7 @@ function SolidLoginButton({ startupConfig, label, Icon }: SolidLoginButtonProps)
             {options.length > 0 && (
               <div className="space-y-2">
                 <p className="text-sm font-medium text-text-secondary">
-                  Or select a provider:
+                  {localize('com_auth_solid_select_provider' as TranslationKeys)}
                 </p>
                 <div className="flex flex-wrap gap-2">
                   {options.map((opt) => {
@@ -146,10 +150,10 @@ function SolidLoginButton({ startupConfig, label, Icon }: SolidLoginButtonProps)
           </div>
           <OGDialogFooter>
             <OGDialogClose asChild>
-              <Button variant="outline">Cancel</Button>
+              <Button variant="outline">{localize('com_ui_cancel' as TranslationKeys)}</Button>
             </OGDialogClose>
             <Button onClick={handleContinue} disabled={!canContinue}>
-              Continue
+              {localize('com_auth_continue' as TranslationKeys)}
             </Button>
           </OGDialogFooter>
         </OGDialogContent>

client/src/locales/en/translation.json

@@ -152,6 +152,11 @@
   "com_auth_click": "Click",
   "com_auth_click_here": "Click here",
   "com_auth_continue": "Continue",
+  "com_auth_solid_idp_modal_description": "Enter your provider URL or pick one of the providers below.",
+  "com_auth_solid_idp_modal_title": "Choose Solid Identity Provider",
+  "com_auth_solid_idp_placeholder": "Enter your provider URL",
+  "com_auth_solid_idp_label": "Solid Identity Provider",
+  "com_auth_solid_select_provider": "Or select a provider:",
   "com_auth_create_account": "Create your account",
   "com_auth_discord_login": "Continue with Discord",
   "com_auth_email": "Email",