Merge pull request #11 from soap/develop

Develop

Author: soap

config/workflow-process.php

@@ -12,16 +12,6 @@
         //     'evaluator' => function (array $variables) { return true; },
         // ],
 
-        // 'authenicated' => \Soap\LaravelWorkflowProcess\GuardFunctions\Authenticated::class,
-
-        'authenticated' => [
-            'compiler' => function ($guard = 'web') {
-                return sprintf('authenticated("%s")', $guard);
-            },
-            'evaluator' => function (array $variables, $guard = 'web') {
-                // This allows checking a specific guard (e.g., 'web', 'api', etc.)
-                return auth()->guard($guard)->check();
-            },
-        ],
+        // 'isAdmin' => \Soap\LaravelWorkflowProcess\GuardFunctions\AdminGuardFunction::class,
     ],
 ];

src/Listeners/WorkflowGuardSubscriber.php

@@ -38,20 +38,13 @@ public function handleOnGuard(GuardEvent $event): void
             $guardExpression = $metaData['guard'];
             // Prepare variables to pass to the evaluator.
             // You can pass the workflow subject, user, or any other required objects.
+
+            $workflowProcess = app('workflow-process');
             $variables = [
                 'subject' => $event->getSubject(),
+                'authenticated' => $workflowProcess->getAuthenticated(),
+                'user' => $workflowProcess->getUser(),
             ];
-            $workflowProcess = app('workflow-process');
-
-            $authenticated = $workflowProcess->getAuthenticated();
-            $user = $workflowProcess->getUser();
-
-            $variables['authenticated'] = $authenticated;
-
-            // Optionally include the authenticated user.
-            if ($authenticated) {
-                $variables['user'] = $workflowProcess->getUser();
-            }
 
             // Evaluate the guard expression using the GuardEvaluator.
             $result = $this->guardEvaluator->evaluate($guardExpression, $variables);

src/WorkflowProcess.php

@@ -41,28 +41,13 @@ public function getAuthenticated()
     public function getUser()
     {
         $guards = config($this->configFile.'.authentication.guards', ['web']);
-        $logic = config($this->configFile.'.authentication.logic', 'or');
-
-        if ($logic === 'and') {
-            // The user is considered authenticated only if all guards return true.
-            $user = null;
+        $user = null;
 
-            foreach ($guards as $guard) {
-                if (auth()->guard($guard)->check()) {
-                    $user = auth()->guard($guard)->user();
-                    break;
-                }
+        foreach ($guards as $guard) {
+            if (auth()->guard($guard)->check()) {
+                $user = auth()->guard($guard)->user();
+                break;
             }
-        } elseif ($logic === 'or') {
-            $user = null;
-            foreach ($guards as $guard) {
-                if (auth()->guard($guard)->check()) {
-                    $user = auth()->guard($guard)->user();
-                    break;
-                }
-            }
-        } else {
-            throw new \InvalidArgumentException('Invalid authentication logic. Use "and" or "or".');
         }
 
         return $user;