WIP

Makefile

@@ -70,3 +70,7 @@ mri_violations:
 
 dashboard:
 	target=dashboard npm run compile
+
+oidc:
+	target=oidc npm run compile
+

modules/my_preferences/php/my_preferences.class.inc

@@ -349,6 +349,25 @@ class My_Preferences extends \NDB_Form
         $this->tpl_data['notification_rows'] = $notification_rows;
         //------------------------------------------------------------
 
+        $widgets = [];
+        $modules = $this->loris->getActiveModules();
+        foreach ($modules as $module) {
+            if ($module->hasAccess($user)) {
+                $mwidgets = $module->getWidgets(
+                    'userpreference',
+                    $user,
+                    [],
+                );
+                foreach ($mwidgets as $widget) {
+                    if (!($widget instanceof UserPreferenceWidget)) {
+                        continue;
+                    }
+                    $widgets[] = $widget;
+                }
+            }
+        }
+        $this->tpl_data['module_userpreference_widgets'] = $widgets;
+
         // unique key and password rules
         $this->form->addFormRule([&$this, '_validateMyPreferences']);
     }
@@ -468,6 +487,7 @@ class My_Preferences extends \NDB_Form
             [
                 $baseurl . '/js/passwordVisibility.js',
                 $baseurl . '/my_preferences/js/my_preferences_helper.js',
+                $baseurl . '/js/components/CSSGrid.js',
             ]
         );
     }

modules/my_preferences/templates/form_my_preferences.tpl

@@ -1,4 +1,3 @@
-<br />
 <form method="post" name="my_preferences" id="my_preferences" autocomplete="off">
     <h3>Password Rules</h3>
       <ul>
@@ -89,6 +88,26 @@
             {/foreach}
         </tbody>
     </table>
+    {* Add any preferences registered from other modules *}
+    <div id="module_preferences" style="display: flex">
+    {section name=widget loop=$module_userpreference_widgets}
+        {assign var="widget" value=$module_userpreference_widgets[widget]}
+        <div id="widget_{$widget->componentname}">
+            <h3>{$widget->title}</h3>
+            {* Include the widget's javascript before trying to invoke it *}
+            <script src="{$widget->jsurl}" type="text/javascript"></script>
+
+            {* Create a react root to render it into *}
+            <script>
+                const el = document.createElement("div");
+                ReactDOM.createRoot(el).render(
+                    {$widget->componentname}({})
+                );
+                document.getElementById("widget_{$widget->componentname}").appendChild(el);
+            </script>
+        </div>
+    {/section}
+    </div>
     <div class="row form-group">
         <div class="col-sm-2">
             <input class="btn btn-sm btn-primary col-xs-12" name="fire_away" value="Save" type="submit" />

modules/oidc/php/callback.class.inc

@@ -244,6 +244,9 @@ class Callback extends \NDB_Page
                     // it was decoded but the nonce doesn't match, error out.
                     return null;
                 }
+                header('Content-Type: text/plain');
+                var_dump($decoded);
+                exit;
                 return $decoded;
             } catch (\Exception $e) {
                 // it couldn't be decoded with this key, try the next.

modules/oidc/php/module.class.inc

@@ -1,6 +1,7 @@
 <?php
 
 namespace LORIS\oidc;
+use LORIS\my_preferences\UserPreferenceWidget;
 
 /**
  * Class module implements the basic LORIS module functionality
@@ -28,4 +29,33 @@ class Module extends \Module
     {
         return 'OpenID Connect';
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $type    The type of widgets to get.
+     * @param \User  $user    The user widgets are being retrieved for.
+     * @param array  $options A type dependent list of options to provide
+     *                        to the widget.
+     *
+     * @return \LORIS\GUI\Widget[]
+     */
+    public function getWidgets(string $type, \User $user, array $options)
+    {
+        switch($type) {
+        case 'userpreference':
+            $factory = \NDB_Factory::singleton();
+            $baseURL = $factory->settings()->getBaseURL();
+            return [
+                new UserPreferenceWidget(
+                    "External Authentication",
+                    $baseURL . "/oidc/js/AuthenticationPreference.js",
+                    "lorisjs.oidc.AuthenticationPreference.default",
+                    [
+                    ],
+                )
+            ];
+        }
+        return [];
+    }
 }

src/Middleware/ExceptionHandlingMiddleware.php

@@ -34,6 +34,7 @@ public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler
     ) : ResponseInterface {
+            return $handler->handle($request);
         // Catch PHP Fatal errors that aren't exceptions such as type errors
         // or out of memory errors
         register_shutdown_function(
@@ -51,7 +52,6 @@ function () {
         );
 
         try {
-            return $handler->handle($request);
             /* The order of these catch statements matter and should go from
              * most to least specific. Otherwise all Exceptions will be caught
              * as their more generic parent class which reduces precision.

webpack.config.js

@@ -323,6 +323,7 @@ const lorisModules = {
   candidate_profile: ['CandidateInfo'],
   api_docs: ['swagger-ui_custom'],
   dashboard: ['welcome'],
+  oidc: ['AuthenticationPreference'],
 };
 for (const [key] of Object.entries(lorisModules)) {
   const target = process.env.target;