Merge pull request #16 from Staffbase/NFS-616-session-deletion-fix

Ninerian · web-flow · commit 458d54358fda · 2020-05-08T13:13:24.000+02:00
NFS-616: adds pid fallback
diff --git a/src/PluginSession.php b/src/PluginSession.php
@@ -90,15 +90,15 @@ public function __construct($pluginId, $appSecret, SessionHandlerInterface $sess
 		}
 
 		$this->pluginInstanceId = $pid;
-		$this->sessionId = $sid;
+		$this->sessionId = $sid ?: $pid;
 
 		// we update the SSO info every time we get a token
 		if ($jwt) {
 			// decrypt the token
 			$this->sso = new SSOToken($appSecret, $jwt, $leeway);
 
 			$this->pluginInstanceId = $this->sso->getInstanceId();
-			$this->sessionId = $this->sso->getSessionId();
+			$this->sessionId = $this->sso->getSessionId() ?: $this->sso->getInstanceId();
 		}
 
 		// dispatch remote calls from Staffbase

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ public function __construct($pluginId, $appSecret, SessionHandlerInterface $sess`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`$this->pluginInstanceId = $pid;`
`93`		`- $this->sessionId = $sid;`
	`93`	`+ $this->sessionId = $sid ?: $pid;`
`94`	`94`
`95`	`95`	`// we update the SSO info every time we get a token`
`96`	`96`	`if ($jwt) {`
`97`	`97`	`// decrypt the token`
`98`	`98`	`$this->sso = new SSOToken($appSecret, $jwt, $leeway);`
`99`	`99`
`100`	`100`	`$this->pluginInstanceId = $this->sso->getInstanceId();`
`101`		`- $this->sessionId = $this->sso->getSessionId();`
	`101`	`+ $this->sessionId = $this->sso->getSessionId() ?: $this->sso->getInstanceId();`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`// dispatch remote calls from Staffbase`