From 235fd6285f2470086af15342f6eee8a24b29d18f Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Fri, 10 Jul 2020 08:44:46 +0000
Subject: [PATCH] remove debugging die, ensure reload login in every request as
 long as email_checked is false

---
 src/Controller/AppController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index 0cace195b..5120d7492 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -158,14 +158,16 @@ class AppController extends Controller
 
         if($session_id != 0) {
           $userStored = $session->read('StateUser');
+          
           $transactionPendings = $session->read('Transactions.pending');
           $transactionExecutings = $session->read('Transaction.executing');
           if($session->read('session_id') != $session_id ||
-             ( $userStored && !isset($userStored['id'])) ||
+             ( $userStored && (!isset($userStored['id']) || !$userStored['email_checked'])) ||
               intval($transactionPendings) > 0 ||
-              intval($transactionExecutings) > 0) {
+              intval($transactionExecutings) > 0 ) {
+          
             $http = new Client();
-
+            
             try {
               $url = $loginServer['host'] . ':' . $loginServer['port'];
 
@@ -240,7 +242,7 @@ class AppController extends Controller
                   } else {
                     $this->Flash->error(__('Konto ist nicht aktiviert!'));
                   }
-                  die(json_encode($json));
+                  //die(json_encode($json));
                   return $this->redirect($this->loginServerUrl . 'account/', 303);
                 }
               }