Add env EXTERNAL_AUTH and replace checks for OPENID_CONNECT with checks for...

Add env EXTERNAL_AUTH and replace checks for OPENID_CONNECT with checks for EXTERNAL_AUTH where applicable (#5480)

* add env EXTERNAL_AUTH and replace env OPENID_CONNECT with it where applicable

* remove OPENID_CONNECT from envAPI

app/controllers/api/v1/api_controller.rb

@@ -89,7 +89,7 @@ module Api
         { sort_column => sort_direction }
       end
 
-      # Checks if external authentication is enabled
+      # Checks if external authentication is enabled (currently only OIDC is implemented)
       def external_authn_enabled?
         ENV['OPENID_CONNECT_ISSUER'].present?
       end

app/controllers/api/v1/env_controller.rb

@@ -25,7 +25,7 @@ module Api
       # Returns basic NON-CONFIDENTIAL information on the environment variables
       def index
         render_data data: {
-          OPENID_CONNECT: ENV['OPENID_CONNECT_ISSUER'].present?,
+          EXTERNAL_AUTH: ENV['OPENID_CONNECT_ISSUER'].present?, # currently only OIDC is implemented
           HCAPTCHA_KEY: ENV.fetch('HCAPTCHA_SITE_KEY', nil),
           VERSION_TAG: ENV.fetch('VERSION_TAG', ''),
           CURRENT_PROVIDER: current_provider,

app/javascript/components/admin/manage_users/ManageUsers.jsx

@@ -81,7 +81,7 @@ export default function ManageUsers() {
                             />
                           )}
                         {
-                          (!envAPI.isLoading && !envAPI.data?.OPENID_CONNECT)
+                          (!envAPI.isLoading && !envAPI.data?.EXTERNAL_AUTH)
                           && (
                             <Modal
                               modalButton={

app/javascript/components/admin/site_settings/registration/Registration.jsx

@@ -52,7 +52,7 @@ export default function Registration() {
         </Dropdown.Item>
       </SettingSelect>
 
-      { env?.OPENID_CONNECT && (
+      { env?.EXTERNAL_AUTH && (
         <Row className="mb-3">
           <SettingsRow
             name="ResyncOnLogin"

app/javascript/components/home/AuthButtons.jsx

@@ -40,7 +40,7 @@ export default function AuthButtons({ direction }) {
     return registrationMethod !== 'invite' || !!inviteToken;
   }
 
-  if (env?.OPENID_CONNECT) {
+  if (env?.EXTERNAL_AUTH) {
     return (
       <Form action={process.env.OMNIAUTH_PATH} method="POST" data-turbo="false">
         <input type="hidden" name="authenticity_token" value={document.querySelector('meta[name="csrf-token"]').content} />

app/javascript/components/rooms/room/join/JoinCard.jsx

@@ -252,7 +252,7 @@ export default function JoinCard() {
         </Row>
         <Row>
           {!currentUser?.signed_in && (
-            env?.OPENID_CONNECT ? (
+            env?.EXTERNAL_AUTH ? (
               <Stack direction="horizontal" className="d-flex justify-content-center text-muted mt-3"> {t('authentication.already_have_account')}
                 <RegularForm action={process.env.OMNIAUTH_PATH} method="POST" data-turbo="false">
                   <input type="hidden" name="authenticity_token" value={document.querySelector('meta[name="csrf-token"]').content} />

app/javascript/components/rooms/room/join/RequireAuthentication.jsx

@@ -38,7 +38,7 @@ export default function RequireAuthentication({ path }) {
         </Card.Body>
         <Card.Footer className="bg-white">
           {
-            env?.OPENID_CONNECT ? (
+            env?.EXTERNAL_AUTH ? (
               <Form action={process.env.OMNIAUTH_PATH} method="POST" data-turbo="false">
                 <input type="hidden" name="authenticity_token" value={document.querySelector('meta[name="csrf-token"]').content} />
                 <Button variant="brand-outline-color" className="btn btn-lg m-2" type="submit">{t('authentication.sign_up')}</Button>

app/javascript/components/users/authentication/Signup.jsx

@@ -32,7 +32,7 @@ export default function Signup() {
   const envAPI = useEnv();
   const isLoading = envAPI.isLoading || registrationMethodSettingAPI.isLoading;
 
-  if (envAPI.data?.OPENID_CONNECT) {
+  if (envAPI.data?.EXTERNAL_AUTH) {
     return <Navigate to="/" replace />;
   }
 

esbuild.dev.mjs

@@ -20,7 +20,7 @@ await esbuild.build({
   },
   define: {
     'process.env.RELATIVE_URL_ROOT': `"${relativeUrlRoot}"`,
-    'process.env.OMNIAUTH_PATH': `"${relativeUrlRoot}/auth/openid_connect"`,
+    'process.env.OMNIAUTH_PATH': `"${relativeUrlRoot}/auth/openid_connect"`, // currently, only OIDC is implemented
   },
 });
 

esbuild.mjs

@@ -14,7 +14,7 @@ await esbuild.build({
   },
   define: {
     'process.env.RELATIVE_URL_ROOT': `"${relativeUrlRoot}"`,
-    'process.env.OMNIAUTH_PATH': `"${relativeUrlRoot}/auth/openid_connect"`,
+    'process.env.OMNIAUTH_PATH': `"${relativeUrlRoot}/auth/openid_connect"`, // currently, only OIDC is implemented
   },
 });