From 0dc4ad59483597f7ba40f679598b7fdad06a613c Mon Sep 17 00:00:00 2001
From: Alexandr Kazakov <25558907+ferym@users.noreply.github.com>
Date: Fri, 5 Mar 2021 16:41:14 +0300
Subject: [PATCH] Added support for storing settings in sessions, instead of
 settings.json file

---
 src/crest.php    | 41 ++++++++++++++++++++++++++++-------------
 src/settings.php |  3 ++-
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/crest.php b/src/crest.php
index cd98866..a75bb58 100644
--- a/src/crest.php
+++ b/src/crest.php
@@ -1,8 +1,10 @@
 <?php
 	require_once (__DIR__.'/settings.php');
-
+	if (C_REST_USE_SESSIONS === true)
+	    session_start();
+	
 	/**
-	 *  @version 1.36
+	 *  @version 1.37
 	 *  define:
 	 *      C_REST_WEB_HOOK_URL = 'https://rest-api.bitrix24.com/rest/1/doutwqkjxgc3mgc1/'  //url on creat Webhook
 	 *      or
@@ -18,7 +20,7 @@
 
 	class CRest
 	{
-		const VERSION = '1.36';
+		const VERSION = '1.37';
 		const BATCH_COUNT    = 50;//count batch 1 query
 		const TYPE_TRANSPORT = 'json';// json or xml
 
@@ -407,18 +409,26 @@ private static function getAppSettings()
 		protected static function getSettingData()
 		{
 			$return = [];
-			if(file_exists(__DIR__ . '/settings.json'))
+
+			if (!empty($_SESSION['CRestSettings']) && C_REST_USE_SESSIONS === true) {
+                $return = static::expandData($_SESSION['CRestSettings']);
+                $skipSettingsFile = true;
+            }
+
+			if(file_exists(__DIR__ . '/settings.json') && !$skipSettingsFile)
 			{
 				$return = static::expandData(file_get_contents(__DIR__ . '/settings.json'));
-				if(defined("C_REST_CLIENT_ID") && !empty(C_REST_CLIENT_ID))
-				{
-					$return['C_REST_CLIENT_ID'] = C_REST_CLIENT_ID;
-				}
-				if(defined("C_REST_CLIENT_SECRET") && !empty(C_REST_CLIENT_SECRET))
-				{
-					$return['C_REST_CLIENT_SECRET'] = C_REST_CLIENT_SECRET;
-				}
 			}
+
+			if (!empty($return))
+			{
+                if(defined("C_REST_CLIENT_ID") && !empty(C_REST_CLIENT_ID))
+                    $return['C_REST_CLIENT_ID'] = C_REST_CLIENT_ID;
+
+                if(defined("C_REST_CLIENT_SECRET") && !empty(C_REST_CLIENT_SECRET))
+                    $return['C_REST_CLIENT_SECRET'] = C_REST_CLIENT_SECRET;
+
+            }
 			return $return;
 		}
 
@@ -508,7 +518,12 @@ protected static function expandData($data)
 
 		protected static function setSettingData($arSettings)
 		{
-			return  (boolean)file_put_contents(__DIR__ . '/settings.json', static::wrapData($arSettings));
+			if (C_REST_USE_SESSIONS === true) {
+		        $_SESSION['CRestSettings'] = static::wrapData($arSettings);
+		        return ($_SESSION['CRestSettings'] == static::wrapData($arSettings));
+            } else {
+                return  (boolean)file_put_contents(__DIR__ . '/settings.json', static::wrapData($arSettings));
+            }
 		}
 
 		/**
diff --git a/src/settings.php b/src/settings.php
index c57a690..7ac0086 100644
--- a/src/settings.php
+++ b/src/settings.php
@@ -8,4 +8,5 @@
 //define('C_REST_IGNORE_SSL',true);//turn off validate ssl by curl
 //define('C_REST_LOG_TYPE_DUMP',true); //logs save var_export for viewing convenience
 //define('C_REST_BLOCK_LOG',true);//turn off default logs
-//define('C_REST_LOGS_DIR', __DIR__ .'/logs/'); //directory path to save the log
\ No newline at end of file
+//define('C_REST_LOGS_DIR', __DIR__ .'/logs/'); //directory path to save the log
+//define('C_REST_USE_SESSIONS', true); // Save settings to sessions instead of the settings.json file
\ No newline at end of file