Merge remote-tracking branch 'origin/develop' into fb_redirectGH1023

Author: cnathe

api/src/org/labkey/api/ApiModule.java

@@ -389,6 +389,7 @@ public void registerServlets(ServletContext servletCtx)
             ApiXmlWriter.TestCase.class,
             ArrayListMap.TestCase.class,
             AssayResultsFileWriter.TestCase.class,
+            AuthenticationManager.ReauthTokenTest.class,
             BaseServerProperties.TestCase.class,
             BooleanFormat.TestCase.class,
             BuilderObjectFactory.TestCase.class,

api/src/org/labkey/api/action/SimpleErrorView.java

@@ -23,8 +23,6 @@
 
 /**
  * View that renders an error collection.
- * User: adam
- * Date: Sep 26, 2007
  */
 public class SimpleErrorView extends JspView<Boolean>
 {

api/src/org/labkey/api/action/SpringActionController.java

@@ -267,14 +267,6 @@ protected static <P extends UrlProvider> P urlProvider(Class<P> inter)
         return PageFlowUtil.urlProvider(inter);
     }
 
-    protected void requiresLogin()
-    {
-        if (getUser().isGuest())
-        {
-            throw new UnauthorizedException();
-        }
-    }
-
     protected ViewBackgroundInfo getViewBackgroundInfo()
     {
         ViewContext vc = getViewContext();

api/src/org/labkey/api/security/AuthenticationConfiguration.java

@@ -114,6 +114,7 @@ interface SSOAuthenticationConfiguration<AP extends SSOAuthenticationProvider<?>
     {
         LinkFactory getLinkFactory();
         URLHelper getUrl(ViewContext ctx);
+        URLHelper getReauthUrl(ViewContext ctx);
 
         /**
          * Allows an SSO auth configuration to specify that it should be used automatically instead of showing the standard

api/src/org/labkey/api/security/AuthenticationManager.java

@@ -307,6 +307,7 @@ class AuthenticationResponse
         private @NotNull Map<String, String> _userAttributeMap = Collections.emptyMap();  // A case-insensitive map of attribute names and values associated with the user
         private @NotNull Map<String, Object> _authenticationProperties = Collections.emptyMap();
         private boolean _requireSecondary = true;                                         // Require secondary authentication
+        private boolean _reauth = false;
         private @Nullable String _successDetails = null;                                  // An optional string describing how successful authentication took place, which will
                                                                                           // appear in the audit log. If null, the configuration's description will be used.
 
@@ -447,6 +448,17 @@ public AuthenticationResponse setRequireSecondary(boolean requireSecondary)
             _requireSecondary = requireSecondary;
             return this;
         }
+
+        public boolean isReauth()
+        {
+            return _reauth;
+        }
+
+        public AuthenticationResponse setReauth(boolean reauth)
+        {
+            _reauth = reauth;
+            return this;
+        }
     }
 
     // FailureReasons are only reported to administrators (in the audit log and/or server log), NOT to users (and potential

api/src/org/labkey/api/security/AuthenticationProvider.java

@@ -35,10 +35,11 @@ public interface LoginUrls extends UrlProvider
     ActionURL getLoginURL(URLHelper returnUrl);
     ActionURL getRegisterURL(Container c, @Nullable URLHelper returnUrl);
     ActionURL getLoginURL(Container c, @Nullable URLHelper returnUrl);
-    ActionURL getForceReauthURL(Container c, @Nullable URLHelper returnUrl);
+    ActionURL getForceReauthURL(Container c, boolean local, @Nullable URLHelper returnUrl);
     ActionURL getLogoutURL(Container c);
     ActionURL getLogoutURL(Container c, URLHelper returnUrl);
     ActionURL getStopImpersonatingURL(Container c, @Nullable URLHelper returnUrl);
     ActionURL getAgreeToTermsURL(Container c, URLHelper returnUrl);
     ActionURL getSSORedirectURL(SSOAuthenticationConfiguration<?> configuration, URLHelper returnUrl, boolean skipProfile);
+    ActionURL getSSOReauthURL(SSOAuthenticationConfiguration<?> configuration, URLHelper returnUrl);
 }

api/src/org/labkey/api/security/LoginUrls.java

@@ -1,5 +1,5 @@
 <form class="auth-form" name="login" method="post">
-    <div class="auth-header">Sign In</div>
+    <div class="auth-header" id="header">Sign In</div>
     <div class="labkey-error" id="errors"></div>
     <div class="auth-form-body">
         <label for="email">Email</label>
@@ -23,7 +23,7 @@
         <div class="auth-item auth-credentials-submit">
             <!-- Note: login.js attaches an authenticateUser() click event to elements with classes "loginSubmitButton" and "signin-btn" -->
             <input type="submit" tabindex="-1" class="loginSubmitButton"/>
-            <button class="labkey-button primary signin-btn" type="button"><span>Sign In</span></button>
+            <button class="labkey-button primary signin-btn" type="button"><span id="sign-in-button">Sign In</span></button>
             <span class="registrationSection" hidden>
                 <a class="labkey-button" id="registerButton" href="login-register.view">Register</a>
             </span>

core/resources/views/login.html

@@ -5,8 +5,7 @@
  */
 import React from 'react';
 import { userEvent } from '@testing-library/user-event';
-import { renderWithAppContext } from '@labkey/components'
-import { getServerContext } from '@labkey/api';
+import { renderWithAppContext } from '@labkey/components';
 
 import { ErrorHandlerImpl } from './ErrorHandler';
 import { ErrorDetails, ErrorType } from './model';
@@ -19,28 +18,33 @@ describe('ErrorHandlerImpl', () => {
             message: 'This is a not found exception',
         };
         renderWithAppContext(<ErrorHandlerImpl context={{ errorDetails }} />);
-        expect(document.querySelector('.labkey-error-heading').innerHTML.includes(errorDetails.message)).toBeTruthy();
+        expect(document.querySelector('.labkey-error-heading').textContent.includes(errorDetails.message)).toBeTruthy();
         expect(document.querySelectorAll('.error-details-container')).toHaveLength(0);
 
         await userEvent.click(document.querySelectorAll('.error-page-button')[2]);
         const question = document.querySelector('.error-details-container');
-        expect(question.innerHTML.includes('What went wrong?')).toBeTruthy();
-        expect(question.innerHTML.includes('Incorrect URL:')).toBeTruthy();
+        expect(question.textContent.includes('What went wrong?')).toBeTruthy();
+        expect(question.textContent.includes('Incorrect URL:')).toBeTruthy();
     });
 
     test('Configuration exception', async () => {
         const errorDetails: ErrorDetails = {
             errorType: ErrorType.configuration,
             message: 'This is a configuration exception',
         };
-        const subheading = 'The requested page cannot be found.';
         renderWithAppContext(<ErrorHandlerImpl context={{ errorDetails }} />);
-        expect(document.querySelector('.labkey-error-subheading').innerHTML.includes(subheading)).toBeTruthy();
+        expect(document.querySelector('.labkey-error-subheading').textContent).toEqual(
+            'This is a configuration exception.'
+        );
         expect(document.querySelectorAll('.error-details-container')).toHaveLength(0);
 
         await userEvent.click(document.querySelectorAll('.error-page-button')[2]);
-        expect(document.querySelector('.labkey-error-details-question').innerHTML.includes('What went wrong?')).toBeTruthy();
-        expect(document.querySelector('div.labkey-error-details').innerHTML.includes('Server Configuration Errors')).toBeTruthy();
+        expect(
+            document.querySelector('.labkey-error-details-question').textContent.includes('What went wrong?')
+        ).toBeTruthy();
+        expect(
+            document.querySelector('div.labkey-error-details').textContent.includes('Server Configuration Errors')
+        ).toBeTruthy();
     });
 
     test('Permission exception', async () => {
@@ -56,14 +60,19 @@ describe('ErrorHandlerImpl', () => {
             serverContext: {
                 impersonatingUser: { displayName: impersonatedUser },
                 user: { displayName: realUser, isSignedIn: true } as any,
-            }
+            },
         });
-        expect(document.querySelector('.labkey-error-subheading').innerHTML.includes(errorDetails.message)).toBeTruthy();
+        expect(
+            document.querySelector('.labkey-error-subheading').textContent.includes(errorDetails.message)
+        ).toBeTruthy();
         expect(document.querySelectorAll('.error-details-container')).toHaveLength(0);
 
         await userEvent.click(document.querySelectorAll('.error-page-button')[2]);
-        const question = document.querySelector('.error-details-container');
-        expect(document.querySelector('.labkey-error-details-question').innerHTML.startsWith('What is a permission error?')).toBeTruthy();
+        expect(
+            document
+                .querySelector('.labkey-error-details-question')
+                .textContent.startsWith('What is a permission error?')
+        ).toBeTruthy();
 
         // FIXME: the following cases are commented out because nearly the entire ErrorHandler component uses
         //  non-component functions to render the contents, which prevents the code from being able to properly use the
@@ -79,7 +88,9 @@ describe('ErrorHandlerImpl', () => {
             message: 'This is a execution exception',
         };
         renderWithAppContext(<ErrorHandlerImpl context={{ errorDetails }} />);
-        expect(document.querySelector('.labkey-error-subheading').innerHTML.includes(errorDetails.message)).toBeTruthy();
+        expect(
+            document.querySelector('.labkey-error-subheading').textContent.includes(errorDetails.message)
+        ).toBeTruthy();
         expect(document.querySelectorAll('.error-details-container')).toHaveLength(0);
 
         await userEvent.click(document.querySelectorAll('.error-page-button')[2]);

core/src/client/ErrorHandler/ErrorHandler.test.tsx

@@ -176,7 +176,6 @@ const PERMISSION_DETAILS = (errorDetails: ErrorDetails) => (
 const CONFIGURATION_HEADING = () => 'Oops! A server configuration error has occurred.';
 const CONFIGURATION_SUBHEADING = (errorMessage?: string) => (
     <>
-        {'The requested page cannot be found. '}
         {errorMessage !== undefined
             ? errorMessage.endsWith('.')
                 ? errorMessage