Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/os2forms_nemid/os2forms_nemid.links.menu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
os2forms_nemid.settings:
title: OS2Forms NemID settings
description: Settings for OS2Forms NemID.
route_name: os2web_nemid.settings_form
parent: system.admin_config_system
7 changes: 7 additions & 0 deletions modules/os2forms_nemid/os2forms_nemid.routing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
os2web_nemid.settings_form:
path: '/admin/config/system/os2forms_nemid'
defaults:
_title: 'OS2Forms Nemid settings'
_form: 'Drupal\os2forms_nemid\Form\SettingsForm'
requirements:
_permission: 'administer site configuration'
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Url;
use Drupal\os2web_nemlogin\Service\AuthProviderService;
use Drupal\os2forms_nemid\Form\SettingsForm;
use Drupal\webform\Entity\Webform;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\KernelEvents;
Expand Down Expand Up @@ -103,7 +104,6 @@ public function redirectToNemlogin(GetResponseEvent $event) {
if (isset($webformNemidSettings['nemlogin_auto_redirect'])) {
$nemlogin_auto_redirect = $webformNemidSettings['nemlogin_auto_redirect'];
}

// Checking if $nemlogin_auto_redirect is on.
if ($nemlogin_auto_redirect) {
// Killing cache so that positive or negative redirect decision is not
Expand All @@ -120,11 +120,14 @@ public function redirectToNemlogin(GetResponseEvent $event) {
$event->stopPropagation();
}
else {
\Drupal::messenger()
->addMessage(t('This webform requires a valid NemID authentication and is not visible without it. You currently have an active NemID authentication session. If you do not want to proceed with this webform press <a href="@logout">log out</a> to return back to the front page.', [
'@logout' => $this->nemloginAuthProvider->getLogoutUrl(['query' => ['destination' => Url::fromRoute('<front>')->toString()]])
->toString(),
]));
$settingFormConfig = \Drupal::config(SettingsForm::$configName);
if (!$settingFormConfig->get('os2forms_nemid_hide_active_nemid_session_message')) {
\Drupal::messenger()
->addMessage(t('This webform requires a valid NemID authentication and is not visible without it. You currently have an active NemID authentication session. If you do not want to proceed with this webform press <a href="@logout">log out</a> to return back to the front page.', [
'@logout' => $this->nemloginAuthProvider->getLogoutUrl(['query' => ['destination' => Url::fromRoute('<front>')->toString()]])
->toString(),
]));
}
}
}
}
Expand Down
65 changes: 65 additions & 0 deletions modules/os2forms_nemid/src/Form/SettingsForm.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php

namespace Drupal\os2forms_nemid\Form;

use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;

/**
* Configure os2web_nemid settings for this site.
*/
class SettingsForm extends ConfigFormBase {

/**
* Name of the config.
*
* @var string
*/
public static $configName = 'os2forms_nemid.settings';

/**
* {@inheritdoc}
*/
public function getFormId() {
return 'os2forms_nemid_settings';
}

/**
* {@inheritdoc}
*/
protected function getEditableConfigNames() {
return [SettingsForm::$configName];
}

/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
// Import settings.
$form['os2forms_nemid_hide_active_nemid_session_message'] = [
'#type' => 'checkbox',
'#title' => t('Hide message about active Nemid session, if it exists.'),
'#description' => t('If checked, meessage aboout active NemID session will not shown on webform page'),
'#default_value' => $this->config(SettingsForm::$configName)
->get('os2forms_nemid_hide_active_nemid_session_message'),
];

return parent::buildForm($form, $form_state);
}

/**
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
$values = $form_state->getValues();

$config = $this->config(SettingsForm::$configName);
foreach ($values as $key => $value) {
$config->set($key, $value);
}
$config->save();

parent::submitForm($form, $form_state);
}

}