Merge pull request INTER-Mediator#1865 from msyk/master

INTERMediator\\SAMLAuth::setSAMLAdditionalRules()'s parameter can be …
msyk · Feb 20, 2024 · dc7b049 · dc7b049
2 parents f62745e + d5040ce
commit dc7b049
Show file tree

Hide file tree

Showing 9 changed files with 446 additions and 347 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/dist-docs/change_log.txt b/dist-docs/change_log.txt
@@ -11,7 +11,7 @@ Also the Migration Guide (Japanese) might be informative:
   https://inter-mediator.info/ja/for-developers/migration.html
 
 Ver.13 (In Development)
-- In the INTERMediator_DBAdapter, XMLHttpRequest programs are replaced with fetch function.
+- In the INTERMediator_DBAdapter, Codes using XMLHttpRequest are replaced with fetch function.
 
 Ver.12 (Februrary 06, 2024)
 - PHP Ver.7.4 is the minimum version.

diff --git a/package-lock.json b/package-lock.json
diff --git a/params.php b/params.php
@@ -198,8 +198,8 @@
 $bootWithInstalledNode = false;
 $preventSSAutoBoot = false;
 $backSeconds = 3600 * 24 * 2; // The seconds value that detect the outdated registering records.
-$foreverLog = '/tmp/nodemon.log'; */
-
+$foreverLog = '/tmp/nodemon.log';
+*/
 /* Operation Log
  * ===================
  * the table named 'operationlog' is required.

diff --git a/spec/Manual-Tests/End-to-End-Test.md b/spec/Manual-Tests/End-to-End-Test.md
@@ -13,6 +13,12 @@ The format of below is: [commit code from git log], [Version from composer.json]
 The test is identified by .conf.js files in the /spec/run directory.
 The test 'wdio-chrome.conf.js' and 'wdio-firefox.conf.js' are running on GitHub Actions.
 
+- commit 7240f8bad63023f01d396e830139e178d3eebda7 (Sun Feb 18 15:09:22 2024 +0900),
+  INTER-Mediator Ver.13 (2024-02-15),
+  wdio-sync-chrome.conf.js,
+  PHP 8.3.2 (Homebrew based)+MySQL 8.3.0/PostgreSQL 14.10_1/SQLite 3.43.2+Chrome (121.0.6167.184) on mac,
+  by Masayuki Nii <[email protected]>, OK
+
 - commit 3783f9cdfda23383f75593be1af890bc9d14ee27 (Thu Feb 15 13:13:02 2024 +0900),
   INTER-Mediator Ver.13 (2024-02-15),
   wdio-edge.conf.js,

diff --git a/spec/Manual-Tests/SAML-Test.md b/spec/Manual-Tests/SAML-Test.md
@@ -32,7 +32,8 @@ committee.
 
 Set the SAML is active ($isSAML = true;), but the built-in auth is inactive ($samlWithBuiltInAuth = false;).
 
-- Open the web app page, and check to show the IdP's login page not the built-in login page.
+- Open the web app page(https://demo.inter-mediator.com/saml-trial/chat.html), 
+  and check to show the IdP's login page not the built-in login page.
 - Try to the wrong account, and check not to log in and repeatedly show the login panel.
 - Try to the valid built-in account, and check not to log in.
 - Try to the valid SAML account, and check to log in correctly.