From a050d77db8c6167440624d82c3c7c1cd26c885d1 Mon Sep 17 00:00:00 2001
From: vladimir <vladimir@r-digital.tech>
Date: Tue, 6 Jun 2023 09:26:15 +0300
Subject: [PATCH 1/2] delete joomla login session right after oauth2 authorize
 done

---
 extensions/components/com_redcore/admin/config.xml     | 10 ++++++++++
 .../admin/language/en-GB/en-GB.com_redcore.ini         |  2 ++
 extensions/libraries/redcore/api/oauth2/oauth2.php     |  5 +++++
 3 files changed, 17 insertions(+)

diff --git a/extensions/components/com_redcore/admin/config.xml b/extensions/components/com_redcore/admin/config.xml
index 232613d9..5ab42e21 100644
--- a/extensions/components/com_redcore/admin/config.xml
+++ b/extensions/components/com_redcore/admin/config.xml
@@ -377,6 +377,16 @@
             <option value="1">JYES</option>
             <option value="0">JNO</option>
         </field>
+        <field
+                name="oauth2_joomla_logout_right_after_authorize"
+                class="btn-group"
+                type="radio"
+                default="0"
+                label="COM_REDCORE_CONFIG_OAUTH2_JOOMLA_LOGOUT_RIGHT_AFTER_AUTHORIZE"
+                description="COM_REDCORE_CONFIG_OAUTH2_JOOMLA_LOGOUT_RIGHT_AFTER_AUTHORIZE_DESC">
+            <option value="1">JYES</option>
+            <option value="0">JNO</option>
+        </field>
     </fieldset>
     <fieldset name="REDCORE_PAYMENT_API_OPTIONS"
               addfieldpath="/libraries/redcore/form/fields"
diff --git a/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini b/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini
index 11c82e29..076c7bf2 100644
--- a/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini
+++ b/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini
@@ -542,3 +542,5 @@ COM_REDCORE_PAYMENT_REFUND_PAYMENT_FAILED="Refund payment failed: %s"
 COM_REDCORE_PAYMENT_DELETE_PAYMENT="Delete payment from gateway"
 COM_REDCORE_PAYMENT_DELETE_PAYMENT_SUCCESS="Delete payment from gateway success"
 COM_REDCORE_PAYMENT_DELETE_PAYMENT_FAILED="Delete payment from gateway failed: %s"
+COM_REDCORE_OAUTH_CLIENTS_ORGANIZATION_SPECIFIC_OPTION_YES="Yes"
+COM_REDCORE_OAUTH_CLIENTS_ORGANIZATION_SPECIFIC_OPTION_NO="No"
\ No newline at end of file
diff --git a/extensions/libraries/redcore/api/oauth2/oauth2.php b/extensions/libraries/redcore/api/oauth2/oauth2.php
index a9dce4a3..53fc330b 100644
--- a/extensions/libraries/redcore/api/oauth2/oauth2.php
+++ b/extensions/libraries/redcore/api/oauth2/oauth2.php
@@ -500,6 +500,11 @@ public function apiAuthorize()
 
 		$this->response = $response;
 
+		if (RBootstrap::getConfig('oauth2_joomla_logout_right_after_authorize', false))
+		{
+			JFactory::getApplication()->logout($user->id);
+		}
+
 		return $this;
 	}
 

From 10f9e5bda7b0d27cbb476fe122391a7ce1c4e3be Mon Sep 17 00:00:00 2001
From: vladimir <vladimir@r-digital.tech>
Date: Tue, 6 Jun 2023 09:28:26 +0300
Subject: [PATCH 2/2] add translations

---
 .../com_redcore/admin/language/en-GB/en-GB.com_redcore.ini    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini b/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini
index 076c7bf2..39c03d25 100644
--- a/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini
+++ b/extensions/components/com_redcore/admin/language/en-GB/en-GB.com_redcore.ini
@@ -542,5 +542,5 @@ COM_REDCORE_PAYMENT_REFUND_PAYMENT_FAILED="Refund payment failed: %s"
 COM_REDCORE_PAYMENT_DELETE_PAYMENT="Delete payment from gateway"
 COM_REDCORE_PAYMENT_DELETE_PAYMENT_SUCCESS="Delete payment from gateway success"
 COM_REDCORE_PAYMENT_DELETE_PAYMENT_FAILED="Delete payment from gateway failed: %s"
-COM_REDCORE_OAUTH_CLIENTS_ORGANIZATION_SPECIFIC_OPTION_YES="Yes"
-COM_REDCORE_OAUTH_CLIENTS_ORGANIZATION_SPECIFIC_OPTION_NO="No"
\ No newline at end of file
+COM_REDCORE_CONFIG_OAUTH2_JOOMLA_LOGOUT_RIGHT_AFTER_AUTHORIZE="Joomla logout after authorize"
+COM_REDCORE_CONFIG_OAUTH2_JOOMLA_LOGOUT_RIGHT_AFTER_AUTHORIZE_DESC="Let to not remember Joomla user next time client executes authorize"
\ No newline at end of file