Merge pull request #87 from City-of-Helsinki/UHF-2662

UHF-2662: Tunnistamo fixes
City-of-Helsinki · Oct 6, 2021 · 6a0f804 · 6a0f804
2 parents d91def6 + 7357830
commit 6a0f804
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 76 deletions.
diff --git a/composer.json b/composer.json
@@ -20,9 +20,9 @@
         "drupal/helfi_platform_config": "^2.0",
         "drupal/helfi_proxy": "^1.0",
         "drupal/helfi_tpr": "^1.0",
-        "drupal/helfi_tunnistamo": "^1.0",
-        "drupal/raven": "^3.2",
+        "drupal/helfi_tunnistamo": "^2.0",
         "drupal/purge": "~3.2.0",
+        "drupal/raven": "^3.2",
         "drupal/varnish_purge": "^2.1",
         "drush/drush": "^10.4"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -23,6 +23,7 @@ module:
   entity: 0
   entity_reference_revisions: 0
   entity_usage: 0
+  externalauth: 0
   field: 0
   field_group: 0
   field_ui: 0

diff --git a/conf/cmi/openid_connect.client.tunnistamo.yml b/conf/cmi/openid_connect.client.tunnistamo.yml
@@ -0,0 +1,13 @@
+uuid: 4da7c800-b77c-44ec-ace0-d63f2c5472b0
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tunnistamo
+id: tunnistamo
+label: Tunnistamo
+plugin: tunnistamo
+settings:
+  is_production: 0
+  client_id: placeholder
+  client_secret: placeholder
diff --git a/conf/cmi/openid_connect.settings.facebook.yml b/conf/cmi/openid_connect.settings.facebook.yml
diff --git a/conf/cmi/openid_connect.settings.generic.yml b/conf/cmi/openid_connect.settings.generic.yml
diff --git a/conf/cmi/openid_connect.settings.github.yml b/conf/cmi/openid_connect.settings.github.yml
diff --git a/conf/cmi/openid_connect.settings.google.yml b/conf/cmi/openid_connect.settings.google.yml
diff --git a/conf/cmi/openid_connect.settings.linkedin.yml b/conf/cmi/openid_connect.settings.linkedin.yml
diff --git a/conf/cmi/openid_connect.settings.okta.yml b/conf/cmi/openid_connect.settings.okta.yml
diff --git a/conf/cmi/openid_connect.settings.tunnistamo.yml b/conf/cmi/openid_connect.settings.tunnistamo.yml
diff --git a/conf/cmi/openid_connect.settings.yml b/conf/cmi/openid_connect.settings.yml
@@ -1,5 +1,5 @@
 always_save_userinfo: true
-connect_existing_users: false
+connect_existing_users: true
 override_registration_settings: true
 user_login_display: below
 userinfo_mappings:

diff --git a/public/sites/default/production.settings.php b/public/sites/default/production.settings.php
@@ -1,3 +1,4 @@
 <?php
 
 $config['openid_connect.settings.tunnistamo']['settings']['is_production'] = TRUE;
+$config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/paatoksenteko-ja-hallinto/openid-connect/tunnistamo';
diff --git a/public/sites/default/staging.settings.php b/public/sites/default/staging.settings.php
@@ -7,3 +7,5 @@
   'ru' => 'staging-administration',
 ];
 $config['openid_connect.settings.tunnistamo']['settings']['is_production'] = TRUE;
+$config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/staging-paatoksenteko-ja-hallinto/openid-connect/tunnistamo';
+