diff --git a/params.php b/params.php index e40f88d33..822995c5d 100644 --- a/params.php +++ b/params.php @@ -204,11 +204,12 @@ // . "hd=gmail.com", //]; https://https://accounts.google.com/o/oauth2/v2/auth?state=invalid-state&scope=openid&response_type=code&redirect_uri=https://demo.inter-mediator.com/saml-trial/lib/src/INTER-Mediator/vendor/simplesamlphp/simplesamlphp/public/module.php/authoauth2/linkback.php&client_id=353910848422-e08dmcn6s8pc43a94d22s5510b8mnrqj.apps.googleusercontent.com + /* Service Server Behavior * =================== * Port number and host name for service server */ -$notUseServiceServer = true; // Default is TRUE!. It has to set false to work every feature with Service Server. -/* +$notUseServiceServer = false; // Default is TRUE!. It has to set false to work every feature with Service Server. + $activateClientService = true; // Default is FLASE!. $serviceServerProtocol = "ws"; // The Service Server url components to connect from client. $serviceServerHost = "localhost"; // "" for public ip address. @@ -222,7 +223,7 @@ $preventSSAutoBoot = false; $backSeconds = 3600 * 24 * 2; // The seconds value that detect the outdated registering records. $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 index 53d84a487..d6a30e920 100644 --- 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 1f48bf9a70ef48c25633691b4ac12e8a0c0ca843 (Thu Apr 25 19:47:31 2024 +0900) + INTER-Mediator Ver.13 (2024-02-24), + wdio-sync-edge.conf.js, + PHP 8.3.6 (Homebrew based)+MySQL 8.3.0/PostgreSQL 14.10_1/SQLite 3.43.2+MicrosoftEdge (124.0.2478.51 ) on mac, + by Masayuki Nii , OK + - commit 38abab2ef6e372d4ae37376f732b1804cdb9ee05 (Sat Feb 24 18:09:51 2024 +0900), INTER-Mediator Ver.13 (2024-02-24), wdio-sync-edge.conf.js, diff --git a/src/php/DB/Proxy.php b/src/php/DB/Proxy.php index 3e14cff48..52acc3da8 100644 --- a/src/php/DB/Proxy.php +++ b/src/php/DB/Proxy.php @@ -883,6 +883,8 @@ public function initialize(?array $dataSource, ?array $options, ?array $dbSpec, $this->dbSettings->setAggregationFrom($context['aggregation-from'] ?? null); $this->dbSettings->setAggregationGroupBy($context['aggregation-group-by'] ?? null); + $this->collectAuthInfo($options); // Calling the method in the Support\Proxy_Auth trait. + $this->dbSettings->notifyServer = null; if ($this->clientSyncAvailable) { $this->dbSettings->notifyServer = new NotifyServer(); @@ -972,7 +974,6 @@ public function initialize(?array $dataSource, ?array $options, ?array $dbSpec, $this->dbSettings->setClientTZOffset($this->PostData['tzoffset'] ?? 0); $this->dbSettings->setParentOfTarget($this->PostData['parent'] ?? ''); - $this->collectAuthInfo($options); // Calling the method in the Support\Proxy_Auth trait. return true; }