Merge pull request #20 from sgorman/master

Sanjay · Sanjay · commit 673217801667 · 2015-08-14T10:33:32.000-05:00
Restore the original timezone setting after switching over to UTC.
diff --git a/src/Security/AppAuthenticator.php b/src/Security/AppAuthenticator.php
@@ -87,6 +87,7 @@ private function refreshAuthTicket() {
 	}
 	
 	private function setRefreshInterval($updateRefreshTokenInterval) {
+		$existingTimezone = date_default_timezone_get();
 		if ($this->refreshInterval == null)
 		{
 			date_default_timezone_set("UTC");
@@ -104,8 +105,10 @@ private function setRefreshInterval($updateRefreshTokenInterval) {
 				->setAccessTokenExpiration($accessTokenExpiration)
 				->setRefreshTokenExpiration($refreshTokenExpiration);
 
-        $this->log->info("Access Token Expiration - " . $this->refreshInterval->getAccessTokenExpiration()->format('Y-m-d H:i:s'));
-        $this->log->info("Refresh Token Expiration - " .$this->refreshInterval->getRefreshTokenExpiration()->format('Y-m-d H:i:s'));
+
+       	$this->log->info("Access Token Expiration - " . $this->refreshInterval->getAccessTokenExpiration()->format('Y-m-d H:i:s'));
+       	$this->log->info("Refresh Token Expiration - " .$this->refreshInterval->getRefreshTokenExpiration()->format('Y-m-d H:i:s'));
+       	date_default_timezone_set($existingTimezone);
 	}
 	
 	public function getAppClaim() {
@@ -147,4 +150,4 @@ public static function getInstance() {
 		return static::$instance;
 	}
 }
-?>
+?>

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ private function refreshAuthTicket() {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`private function setRefreshInterval($updateRefreshTokenInterval) {`
	`90`	`+ $existingTimezone = date_default_timezone_get();`
`90`	`91`	`if ($this->refreshInterval == null)`
`91`	`92`	`{`
`92`	`93`	`date_default_timezone_set("UTC");`
`@@ -104,8 +105,10 @@ private function setRefreshInterval($updateRefreshTokenInterval) {`
`104`	`105`	`->setAccessTokenExpiration($accessTokenExpiration)`
`105`	`106`	`->setRefreshTokenExpiration($refreshTokenExpiration);`
`106`	`107`
`107`		`- $this->log->info("Access Token Expiration - " . $this->refreshInterval->getAccessTokenExpiration()->format('Y-m-d H:i:s'));`
`108`		`- $this->log->info("Refresh Token Expiration - " .$this->refreshInterval->getRefreshTokenExpiration()->format('Y-m-d H:i:s'));`
	`108`	`+`
	`109`	`+ $this->log->info("Access Token Expiration - " . $this->refreshInterval->getAccessTokenExpiration()->format('Y-m-d H:i:s'));`
	`110`	`+ $this->log->info("Refresh Token Expiration - " .$this->refreshInterval->getRefreshTokenExpiration()->format('Y-m-d H:i:s'));`
	`111`	`+ date_default_timezone_set($existingTimezone);`
`109`	`112`	`}`
`110`	`113`
`111`	`114`	`public function getAppClaim() {`
`@@ -147,4 +150,4 @@ public static function getInstance() {`
`147`	`150`	`return static::$instance;`
`148`	`151`	`}`
`149`	`152`	`}`
`150`		`-?>`
	`153`	`+?>`