5124: Improved stuff

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_cura_login/README.md

@@ -9,7 +9,6 @@ configuration.
 curl "http://$(docker compose port nginx 8080)/os2loop-cura-login/start"
 ```
 
-
 ``` shell
 drush os2loop-cura-login:get-login-url --help
 ```
@@ -18,7 +17,6 @@ drush os2loop-cura-login:get-login-url --help
 drush --uri='http://nginx:8080' os2loop-cura-login:get-login-url [email protected] --secret=$(drush config:get --format string os2loop_cura_login.settings signing_secret --include-overridden) --algorithm=$(drush config:get --format string os2loop_cura_login.settings signing_algorithm --include-overridden)
 ```
 
-
 ## Development and debugging
 
 ``` php

web/profiles/custom/os2loop/modules/os2loop_cura_login/os2loop_cura_login.routing.yml

@@ -1,7 +1,7 @@
 os2loop_cura_login.start:
   path: '/os2loop-cura-login/start'
   defaults:
-    _title: 'Start login hack'
+    _title: 'Start Cura login'
     _controller: '\Drupal\os2loop_cura_login\Controller\Os2loopCuraLoginController::start'
   methods: [GET, POST]
   requirements:
@@ -10,7 +10,7 @@ os2loop_cura_login.start:
 os2loop_cura_login.authenticate:
   path: '/os2loop-login-hack/authenticate'
   defaults:
-    _title: 'Authenticate'
+    _title: 'Authenticate with Cura login'
     _controller: '\Drupal\os2loop_cura_login\Controller\Os2loopCuraLoginController::authenticate'
   methods: [GET]
   requirements:

web/profiles/custom/os2loop/modules/os2loop_cura_login/src/Controller/Os2loopCuraLoginController.php

@@ -59,33 +59,67 @@ public function __construct(
    */
   public function start(Request $request): Response {
     try {
-      $this->info('Request: @request', [
-        '@request' => json_encode([
+            $content = NULL;
+      try {
+        $content = (string) $request->getContent();
+      } catch (\Exception) {}
+      $this->debug('@debug', [
+        '@debug' => json_encode([
           'method' => $request->getMethod(),
           'query' => $request->query->all(),
-          'content' => (string) $request->getContent(),
+          'content' => $content,
         ]),
       ]);
 
       $jwt = Request::METHOD_POST === $request->getMethod()
         ? $request->getContent()
         : $request->query->getString($this->config->get('token_param_name') ?? 'token');
 
+      $this->debug('@debug', [
+        '@debug' => json_encode([
+          'jwt' => $jwt,
+        ]),
+      ]);
+
+      if (empty($jwt)) {
+        throw new BadRequestHttpException('Missing or empty JWT');
+      }
+
       $payload = (array) JWT::decode($jwt, new Key($this->config->get('signing_secret'), $this->config->get('signing_algorithm')));
 
+      $this->debug('@debug', [
+        '@debug' => json_encode([
+          'payload' => $payload,
+        ]),
+      ]);
+
       $username = $payload['username'] ?? NULL;
       if (empty($username)) {
         throw new BadRequestHttpException('Missing username');
       }
 
       $user = $this->loadUser($username);
+
+      $this->debug('@debug', [
+        '@debug' => json_encode([
+          'user' => $user,
+        ]),
+      ]);
+
       if (empty($user)) {
         // Don't disclose whether or not the user exists.
         throw new BadRequestHttpException();
       }
 
       // Check that we can get userinfo.
       $userinfo = $this->getUserinfo($user);
+
+      $this->debug('@debug', [
+        '@debug' => json_encode([
+          'userinfo' => $userinfo,
+        ]),
+      ]);
+
       if (empty($userinfo)) {
         throw new BadRequestHttpException();
       }

web/profiles/custom/os2loop/modules/os2loop_cura_login/src/Form/SettingsForm.php

@@ -8,6 +8,7 @@
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Logger\RfcLogLevel;
+use Drupal\Core\Url;
 
 /**
  * Configure OS2Loop Cura login settings for this site.
@@ -79,6 +80,22 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
       '#default_value' => $config->get('log_level') ?? RfcLogLevel::ERROR,
     ];
 
+    $authenticationStartUrl = Url::fromRoute('os2loop_cura_login.start')->setAbsolute()->toString(true)->getGeneratedUrl();
+    $form['info'] = [
+      '#theme' => 'item_list',
+      '#items' => [
+        '#markup' => $this->t('Use <a href=":url">:url</a> as <code>linkURL</code>.', [':url' => $authenticationStartUrl]),
+      ],
+    ];
+
+    if ($name = $config->get('token_param_name')) {
+      $authenticationStartUrl = Url::fromRoute('os2loop_cura_login.start', [$name => '…'])->setAbsolute()->toString(true)->getGeneratedUrl();
+      $authenticationStartUrl = str_replace(urlencode('…'), '…', $authenticationStartUrl);
+      $form['info']['#items'][] = [
+        '#markup' => $this->t('Use <a href=":url">:url</a> as <code>linkURL</code> for <core>GET</core>.', [':url' => $authenticationStartUrl]),
+      ];
+    }
+
     return parent::buildForm($form, $form_state);
   }