bugfix: graphql resolution

cli/auth/resource.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"github.com/nats-io/nats.go/jetstream"
 	"go.uber.org/zap"
-	"io"
 	"net/http"
 	"os"
 	"slices"
@@ -108,38 +107,8 @@ func (r *Resource) ShareOwnership(newUser UserId, currentUser *User, keepPermiss
 	return nil
 }
 
-// ApplyPerms applies permissions to the Resource identified by the given StateId. It retrieves the permissions from the
-// cache if available, otherwise it retrieves them from the key
-func (r *Resource) getPermissions(id *glue.StateId, ctx context.Context, logger *zap.Logger) (CreatePermissions, error) {
-	if cached, found := cache.Load(id.Name()); found {
-		return cached.(CreatePermissions), nil
-	}
-
-	result, err := os.CreateTemp("", "")
-	if err != nil {
-		return CreatePermissions{}, err
-	}
-
-	env := map[string]string{"STATE_ID": id.String()}
-	glu := glue.NewGlue("", glue.GetPermissions, make([]any, 0), result.Name())
-	glu.Execute(ctx, make(http.Header), logger, env, nil, id)
-
-	data, err := io.ReadAll(result)
-	if err != nil {
-		return CreatePermissions{}, err
-	}
-
-	var perms CreatePermissions
-	if err := json.Unmarshal(data, &perms); err != nil {
-		return CreatePermissions{}, err
-	}
-
-	cache.Store(id.Name(), perms)
-	return perms, nil
-}
-
 func (r *Resource) ApplyPerms(id *glue.StateId, ctx context.Context, logger *zap.Logger) bool {
-	perms, err := r.getPermissions(id, ctx, logger)
+	perms, err := r.getOrCreatePermissions(id, ctx, logger)
 	if err != nil {
 		logger.Error("failed to get permissions", zap.Error(err))
 		return false

cli/cli.go

@@ -271,50 +271,52 @@ func execute(args []string, options map[string]string) int {
 				}
 			}
 
-			outputBillingStatus := func() {
-				costC := func(num interface{}, basis int) float64 {
-					return float64(num.(int)) * float64(basis) / 10_000_000
-				}
-
-				costA := func(dur interface{}, basis int) float64 {
-					duration := dur.(time.Duration)
-					seconds := duration.Seconds()
-					return float64(basis) * seconds / 100_000
-				}
+			/*
+				outputBillingStatus := func() {
+					costC := func(num interface{}, basis int) float64 {
+						return float64(num.(int)) * float64(basis) / 10_000_000
+					}
 
-				avg := func(dur interface{}, count interface{}) time.Duration {
-					seconds := dur.(time.Duration).Seconds()
-					return time.Duration(seconds/float64(count.(int))) * time.Second
-				}
+					costA := func(dur interface{}, basis int) float64 {
+						duration := dur.(time.Duration)
+						seconds := duration.Seconds()
+						return float64(basis) * seconds / 100_000
+					}
 
-				e, _ := billings.Load("e")
-				o, _ := billings.Load("o")
-				ac, _ := billings.Load("ac")
-				a, _ := billings.Load("a")
-
-				ecost := costC(e, cfg.Extensions.Billing.Costs.Entities.Cost)
-				ocost := costC(o, cfg.Extensions.Billing.Costs.Orchestrations.Cost)
-				acost := costA(a, cfg.Extensions.Billing.Costs.Activities.Cost)
-
-				logger.Warn("Billing estimate",
-					zap.Any("launched entities", e),
-					zap.String("entity cost", fmt.Sprintf("$%.2f", ecost)),
-					zap.Any("launched orchestrations", o),
-					zap.String("orchestration cost", fmt.Sprintf("$%.2f", ocost)),
-					zap.Any("activity time", a),
-					zap.Any("activities launced", ac),
-					zap.Any("average activity time", avg(a, ac)),
-					zap.String("activity cost", fmt.Sprintf("$%.2f", acost)),
-					zap.String("total estimate", fmt.Sprintf("$%.2f", ecost+ocost+acost)),
-				)
-			}
+					avg := func(dur interface{}, count interface{}) time.Duration {
+						seconds := dur.(time.Duration).Seconds()
+						return time.Duration(seconds/float64(count.(int))) * time.Second
+					}
 
-			go func() {
-				ticker := time.NewTicker(3 * time.Second)
-				for range ticker.C {
-					outputBillingStatus()
+					e, _ := billings.Load("e")
+					o, _ := billings.Load("o")
+					ac, _ := billings.Load("ac")
+					a, _ := billings.Load("a")
+
+					ecost := costC(e, cfg.Extensions.Billing.Costs.Entities.Cost)
+					ocost := costC(o, cfg.Extensions.Billing.Costs.Orchestrations.Cost)
+					acost := costA(a, cfg.Extensions.Billing.Costs.Activities.Cost)
+
+					logger.Warn("Billing estimate",
+						zap.Any("launched entities", e),
+						zap.String("entity cost", fmt.Sprintf("$%.2f", ecost)),
+						zap.Any("launched orchestrations", o),
+						zap.String("orchestration cost", fmt.Sprintf("$%.2f", ocost)),
+						zap.Any("activity time", a),
+						zap.Any("activities launced", ac),
+						zap.Any("average activity time", avg(a, ac)),
+						zap.String("activity cost", fmt.Sprintf("$%.2f", acost)),
+						zap.String("total estimate", fmt.Sprintf("$%.2f", ecost+ocost+acost)),
+					)
 				}
-			}()
+
+				go func() {
+					ticker := time.NewTicker(3 * time.Second)
+					for range ticker.C {
+						outputBillingStatus()
+					}
+				}()
+			*/
 
 			billingStream, err := js.CreateOrUpdateStream(ctx, jetstream.StreamConfig{
 				Name: "billing",

cli/lib/api.go

@@ -629,6 +629,7 @@ func authorize(
 		return ctx, false
 	}
 	if user, ok := auth.ExtractUser(request, config); ok {
+		logger.Info("Authenticating with user", zap.Any("user", user))
 		ctx = auth.DecorateContextWithUser(ctx, user)
 	}
 	resource, err := rm.DiscoverResource(ctx, id, logger, preventCreation)

src/DurableClient.php

@@ -39,8 +39,7 @@
     public function __construct(
         private EntityClientInterface $entityClient,
         private OrchestrationClientInterface $orchestrationClient
-    ) {
-    }
+    ) {}
 
     public static function get(string $apiHost = 'http://localhost:8080'): self
     {

src/Gateway/Graph/SchemaGenerator.php

@@ -24,23 +24,34 @@
 namespace Bottledcode\DurablePhp\Gateway\Graph;
 
 use Bottledcode\DurablePhp\State\Attributes\Name;
+
 use Bottledcode\DurablePhp\State\EntityId;
 use Bottledcode\DurablePhp\State\OrchestrationInstance;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use DI\Definition\Helper\AutowireDefinitionHelper;
 use DI\Definition\Helper\CreateDefinitionHelper;
 
+use const T_STRING;
+
 class SchemaGenerator
 {
     public array $handlers = [];
+
     private string $bootstrap;
+
     private string $root;
+
     private array $scalars = [
         'Any',
         'Void',
         'State',
         'Date',
     ];
+
     private array $states = [];
+
     private array $searchedStates = [];
 
     public function __construct()
@@ -57,13 +68,13 @@
         ['mutation' => $mutations, 'query' => $queries] = $this->findPhpFiles($projectRoot);
 
         $flipped = array_flip($this->searchedStates);
-        foreach($this->states as $realName => $properties) {
-            if(empty(trim($properties))) {
+        foreach ($this->states as $realName => $properties) {
+            if (empty(trim($properties))) {
                 continue;
             }
 
             $rootName = $this->findRootName($realName, $flipped);
-            if($rootName === $realName) {
+            if ($rootName === $realName) {
                 // todo: warn?
                 continue;
             }
@@ -79,7 +90,7 @@
 
 {$name}(id: ID!): {$name}Snapshot
 EOF;
-            $this->handlers['queries'][] = ['op' => 'entity', 'op-name' => $name];
+            $this->handlers['queries'][] = ['op' => 'entity', 'op-name' => $name, 'realName' => $realName];
 
         }
         $scalars = array_map(fn($x) => 'scalar ' . $x, array_unique($this->scalars));
@@ -142,7 +153,7 @@
     {
         $name = basename($filename, '.php');
         $parsed = MetaParser::parseFile($contents);
-        $realName = $parsed->namespace . "\\" . $name;
+        $realName = $parsed->namespace . '\\' . $name;
         $name = ucfirst($name);
 
         $mutation = <<<GRAPHQL
@@ -157,8 +168,7 @@
 
 GRAPHQL;
 
-
-        $this->handlers['mutations'][] = ['op' => 'StartOrchestration', 'op-name' => "StartNew{$name}Orchestration", 'name' => $realName,];
+        $this->handlers['mutations'][] = ['op' => 'StartOrchestration', 'op-name' => "StartNew{$name}Orchestration", 'name' => $realName];
         $this->handlers['queries'][] = ['op' => 'OrchestrationStatus', 'op-name' => "{$name}Status", 'name' => $realName];
 
         $waitForExternalEventCalls = [];
@@ -167,7 +177,7 @@
         $nextStringIsArgument = false;
         foreach ($tokens as $token) {
             if (is_array($token)) {
-                if ($token[0] === \T_STRING && $token[1] === 'waitForExternalEvent') {
+                if ($token[0] === T_STRING && $token[1] === 'waitForExternalEvent') {
                     $waitForExternalEventFound = true;
                 } elseif ($waitForExternalEventFound && $token[0] === T_CONSTANT_ENCAPSED_STRING) {
                     $waitForExternalEventCalls[] = trim($token[1], '\'"');
@@ -190,20 +200,20 @@
         $parsed = MetaParser::parseFile($contents);
 
         $realName = basename($filename, '.php');
-        $realName = $parsed->namespace . "\\" . $realName;
+        $realName = $parsed->namespace . '\\' . $realName;
 
-        foreach($parsed->attributes as $attribute) {
-            if($attribute['name'] === 'Name' || $attribute['name'] === Name::class) {
+        foreach ($parsed->attributes as $attribute) {
+            if ($attribute['name'] === 'Name' || $attribute['name'] === Name::class) {
                 $className = ucfirst(trim($attribute['args'][0]['type'], '"\''));
                 goto found;
             }
         }
 
-        if(str_contains($contents, 'EntityState')) {
+        if (str_contains($contents, 'EntityState')) {
             $properties = [];
-            foreach($parsed->properties as ['type' => $type, 'name' => $name]) {
+            foreach ($parsed->properties as ['type' => $type, 'name' => $name]) {
                 [$type, $scalar] = $this->extractScalars($type);
-                if($scalar) {
+                if ($scalar) {
                     $this->scalars[] = $scalar;
                 }
                 $name = trim($name, '$');
@@ -213,7 +223,7 @@
             $properties = implode("\n", $properties);
             $this->states[$realName] = $properties;
 
-            return "";
+            return '';
         }
 
         return '';
@@ -222,30 +232,30 @@
 
         $methods = [];
 
-        foreach($parsed->methods as $method) {
+        foreach ($parsed->methods as $method) {
             $originalMethodName = $method['name'];
             $method['name'] = ucfirst($method['name']);
 
             $arguments = ['id: ID!'];
             $method['args'] = array_map(fn(array $args) => ['type' => 'mixed', ...$args], $method['args']);
 
-            foreach($method['args'] as ['type' => $type, 'name' => $name]) {
+            foreach ($method['args'] as ['type' => $type, 'name' => $name]) {
                 [$type, $scalar] = $this->extractScalars($type);
-                if($scalar) {
+                if ($scalar) {
                     $this->scalars[] = $scalar;
                 }
                 $name = trim($name, '$');
 
                 $arguments[] = "$name: $type";
             }
-            $arguments = implode(", ", $arguments);
+            $arguments = implode(', ', $arguments);
 
             /*
             [$returnType, $scalar] = $this->extractScalars($method['return']);
             if($scalar) {
                 $this->scalars[] = $scalar;
             }*/
-            $returnType = "Void!";
+            $returnType = 'Void!';
 
             $methods[] = "Signal{$className}With{$method['name']}($arguments): $returnType";
             $this->handlers['mutations'][] = ['op' => 'SendEntitySignal', 'op-name' => "Signal{$className}With{$method['name']}", 'realName' => $realName, 'method' => $originalMethodName];
@@ -260,7 +270,7 @@
         $scalar = null;
         $nullable = false;
 
-        if(str_contains($type, '|')) {
+        if (str_contains($type, '|')) {
             if (substr_count($type, '|') === 1 && (str_contains($type, '|null') || str_contains($type, 'null|'))) {
                 $nullable = true;
                 $type = str_replace(['|null', 'null|'], '', $type);
@@ -269,19 +279,19 @@
             }
         }
 
-        if(str_contains($type, '?')) {
+        if (str_contains($type, '?')) {
             $nullable = true;
             $type = str_replace('?', '', $type);
         }
 
-        switch($type) {
+        switch ($type) {
             case 'string':
             case 'int':
             case 'float':
                 $type = ucfirst($type);
                 break;
             case 'bool':
-                $type = "Boolean";
+                $type = 'Boolean';
                 break;
             case 'EntityId':
             case EntityId::class:
@@ -291,9 +301,9 @@
             case OrchestrationInstance::class:
                 $type = 'OrchestrationId';
                 break;
-            case \DateTime::class:
-            case \DateTimeImmutable::class:
-            case \DateTimeInterface::class:
+            case DateTime::class:
+            case DateTimeImmutable::class:
+            case DateTimeInterface::class:
                 $type = 'Date';
                 $scalar = 'Date';
                 break;
@@ -326,7 +336,7 @@
             } elseif ($class instanceof CreateDefinitionHelper) {
                 $class = $class->getDefinition('none')->getClassName();
             }
-            if ($class === $parsedName && !in_array($name, $matches, true)) {
+            if ($class === $parsedName && ! in_array($name, $matches, true)) {
                 // we have an alias
                 return $this->findRootName($name, $matches);
             }

src/Gateway/Graph/index.php

@@ -196,7 +196,7 @@
                                     $oargs = $args;
                                     unset($args['id']);
 
-                                    return getEntitySnapshot(['id' => ['id' => $oargs['id'], 'name' => $resolveInfo->fieldName], ...$args], $context);
+                                    return getEntitySnapshot(['id' => ['id' => $oargs['id'], 'name' => $handler['realName']], ...$args], $context);
                                 case 'OrchestrationStatus':
                                     $oargs = $args;
                                     unset($args['id']);

src/Glue/glue.php

@@ -321,6 +321,7 @@
 
         $permissions = json_encode($permissions, JSON_THROW_ON_ERROR);
         header("Permissions: $permissions");
+        echo $permissions;
     }
 
     private function getFromDefinition(Definition $definition): ReflectionClass|ReflectionFunction|null