Skip to content

Commit

Permalink
Bug fix in initializing notify server.
Browse files Browse the repository at this point in the history
  • Loading branch information
msyk committed Apr 26, 2024
1 parent 1f48bf9 commit f9e4c32
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
7 changes: 4 additions & 3 deletions params.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions spec/Manual-Tests/End-to-End-Test.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>, OK

- commit 38abab2ef6e372d4ae37376f732b1804cdb9ee05 (Sat Feb 24 18:09:51 2024 +0900),
INTER-Mediator Ver.13 (2024-02-24),
wdio-sync-edge.conf.js,
Expand Down
3 changes: 2 additions & 1 deletion src/php/DB/Proxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit f9e4c32

Please sign in to comment.