5124: Cleaned up

Author: rimi-itk

CHANGELOG.md

@@ -8,6 +8,9 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- [PR-375](https://github.com/itk-dev/os2loop/pull/375)
+  Added Cura login module
+
 ## [1.2.5]
 
 - [374](https://github.com/itk-dev/os2loop/pull/374)

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

@@ -1,7 +1,7 @@
-name: 'OS2Loop Cura login'
+name: "OS2Loop Cura login"
 type: module
-description: 'OS2Loop Cura login'
-package: 'OS2Loop'
+description: "OS2Loop Cura login"
+package: "OS2Loop"
 core_version_requirement: ^10 || ^11
 dependencies:
   - drupal:user

web/profiles/custom/os2loop/modules/os2loop_cura_login/os2loop_cura_login.links.menu.yml

@@ -1,6 +1,6 @@
 os2loop_cura_login.settings:
-  title: 'OS2Loop Cura login settings'
+  title: "OS2Loop Cura login settings"
   route_name: os2loop_cura_login.settings
-  description: 'Configure OS2Loop Cura login settings'
+  description: "Configure OS2Loop Cura login settings"
   parent: os2loop.group.admin
   weight: 100

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

@@ -1,25 +1,25 @@
 os2loop_cura_login.start:
-  path: '/os2loop-cura-login/start'
+  path: "/os2loop-cura-login/start"
   defaults:
-    _title: 'Start Cura login'
+    _title: "Start Cura login"
     _controller: '\Drupal\os2loop_cura_login\Controller\Os2loopCuraLoginController::start'
   methods: [GET, POST]
   requirements:
-    _role: 'anonymous'
+    _role: "anonymous"
 
 os2loop_cura_login.authenticate:
-  path: '/os2loop-login-hack/authenticate'
+  path: "/os2loop-login-hack/authenticate"
   defaults:
-    _title: 'Authenticate with Cura login'
+    _title: "Authenticate with Cura login"
     _controller: '\Drupal\os2loop_cura_login\Controller\Os2loopCuraLoginController::authenticate'
   methods: [GET]
   requirements:
-    _role: 'anonymous'
+    _role: "anonymous"
 
 os2loop_cura_login.settings:
-  path: '/admin/config/os2loop/os2loop_cura_login/settings'
+  path: "/admin/config/os2loop/os2loop_cura_login/settings"
   defaults:
     _form: '\Drupal\os2loop_cura_login\Form\SettingsForm'
-    _title: 'OS2Loop Cura login settings'
+    _title: "OS2Loop Cura login settings"
   requirements:
-    _permission: 'administer site settings'
+    _permission: "administer site settings"

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

@@ -1,4 +1,4 @@
 services:
   logger.channel.os2loop_cura_login:
     parent: logger.channel_base
-    arguments: ['os2loop_cura_login']
+    arguments: ["os2loop_cura_login"]

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

@@ -59,10 +59,12 @@ public function __construct(
    */
   public function start(Request $request): Response {
     try {
-            $content = NULL;
+      $content = NULL;
       try {
         $content = (string) $request->getContent();
-      } catch (\Exception) {}
+      }
+      catch (\Exception) {
+      }
       $this->debug('@debug', [
         '@debug' => json_encode([
           'method' => $request->getMethod(),
@@ -221,9 +223,11 @@ private function getUserinfo(User $user): array {
     ];
   }
 
-  public function log($level, \Stringable|string $message, array $context = []): void
-  {
-    // Lifted from LoggerChannel
+  /**
+   * {@inheritdoc}
+   */
+  public function log($level, \Stringable|string $message, array $context = []): void {
+    // Lifted from LoggerChannel.
     $levels = [
       LogLevel::EMERGENCY => RfcLogLevel::EMERGENCY,
       LogLevel::ALERT => RfcLogLevel::ALERT,
@@ -235,7 +239,7 @@ public function log($level, \Stringable|string $message, array $context = []): v
       LogLevel::DEBUG => RfcLogLevel::DEBUG,
     ];
     $rfcLogLevel = $levels[$level] ?? RfcLogLevel::ERROR;
-    if ((int)$this->config->get('log_level') >= $rfcLogLevel) {
+    if ((int) $this->config->get('log_level') >= $rfcLogLevel) {
       $this->logger->log($level, $message, $context);
     }
   }

web/profiles/custom/os2loop/modules/os2loop_cura_login/src/Drush/Commands/Os2loopCuraLoginCommands.php

@@ -2,24 +2,19 @@
 
 namespace Drupal\os2loop_cura_login\Drush\Commands;
 
-use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\DependencyInjection\AutowireTrait;
 use Drupal\Core\Url;
-use Drupal\Core\Utility\Token;
 use Drush\Attributes as CLI;
 use Drush\Commands\DrushCommands;
 use Firebase\JWT\JWT;
-use Http\Client\HttpClient;
 use Psr\Http\Client\ClientInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * A Drush commandfile.
  */
-final class Os2loopCuraLoginCommands extends DrushCommands
-{
+final class Os2loopCuraLoginCommands extends DrushCommands {
   use AutowireTrait;
 
   /**
@@ -42,10 +37,10 @@ public function __construct(
   public function commandName(
     $username,
     $options = [
-      'get' => null,
-      'secret' => null,
+      'get' => NULL,
+      'secret' => NULL,
       'algorithm' => 'HS256',
-    ]
+    ],
   ) {
     // https://github.com/firebase/php-jwt?tab=readme-ov-file#example
     $payload = [
@@ -62,11 +57,12 @@ public function commandName(
     if ($name = $options['get']) {
       $method = Request::METHOD_GET;
       $routeParameters[$name] = $jwt;
-    } else {
+    }
+    else {
       $method = Request::METHOD_POST;
       $requestOptions['body'] = $jwt;
     }
-    $url = Url::fromRoute('os2loop_cura_login.start', $routeParameters)->setAbsolute()->toString(true)->getGeneratedUrl();
+    $url = Url::fromRoute('os2loop_cura_login.start', $routeParameters)->setAbsolute()->toString(TRUE)->getGeneratedUrl();
     $this->io()->writeln($method === Request::METHOD_POST
       ? sprintf('POST\'ing to %s', $url)
       : sprintf('GET\'ing %s', $url),
@@ -78,7 +74,7 @@ public function commandName(
       $url,
       $request->getStatusCode(),
       $request->getBody()->getContents(),
-    ], true);
+    ], TRUE);
     die(__FILE__ . ':' . __LINE__ . ':' . __METHOD__);
   }
 

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

@@ -80,7 +80,7 @@ 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();
+    $authenticationStartUrl = Url::fromRoute('os2loop_cura_login.start')->setAbsolute()->toString(TRUE)->getGeneratedUrl();
     $form['info'] = [
       '#theme' => 'item_list',
       '#items' => [
@@ -89,7 +89,7 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
     ];
 
     if ($name = $config->get('token_param_name')) {
-      $authenticationStartUrl = Url::fromRoute('os2loop_cura_login.start', [$name => '…'])->setAbsolute()->toString(true)->getGeneratedUrl();
+      $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]),
@@ -99,23 +99,6 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
     return parent::buildForm($form, $form_state);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state): void {
-    // @todo Validate the form here.
-    // Example:
-    // @code
-    //   if ($form_state->getValue('example') === 'wrong') {
-    //     $form_state->setErrorByName(
-    //       'message',
-    //       $this->t('The value is not correct.'),
-    //     );
-    //   }
-    // @endcode
-    parent::validateForm($form, $form_state);
-  }
-
   /**
    * {@inheritdoc}
    */