fix sharing ownership

Signed-off-by: Robert Landers <landers.robert@gmail.com>

Author: withinboredom

cli/lib/api.go

@@ -315,8 +315,8 @@ func Startup(ctx context.Context, js jetstream.JetStream, logger *zap.Logger, po
 		}
 	}
 
-	// POST /resource/{id}/share: share ownership of the resource with another user
-	r.HandleFunc("/resource/{id}/share/{userid}", func(writer http.ResponseWriter, request *http.Request) {
+	// POST /entity/{name}/{id}/share/{userid}: share ownership of the resource with another user
+	r.HandleFunc("/entity/{name}/{id}/share/{userid}", func(writer http.ResponseWriter, request *http.Request) {
 		if stop := handleCors(writer, request); stop {
 			return
 		}
@@ -330,17 +330,19 @@ func Startup(ctx context.Context, js jetstream.JetStream, logger *zap.Logger, po
 		logRequest(logger, request, ctx)
 
 		vars := mux.Vars(request)
-		id := &glue.StateId{
-			Id: strings.TrimSpace(vars["id"]),
+		id := &glue.EntityId{
+			Name: strings.TrimSpace(vars["name"]),
+			Id:   strings.TrimSpace(vars["id"]),
 		}
+		stateId := id.ToStateId()
 
 		// verify the user is authorized to access the resource
-		ctx, done := authorize(writer, request, config, ctx, rm, id, logger, true, auth.Owner)
+		ctx, done := authorize(writer, request, config, ctx, rm, stateId, logger, true, auth.Owner)
 		if done {
 			return
 		}
 
-		r, err := rm.DiscoverResource(ctx, id, logger, true)
+		r, err := rm.DiscoverResource(ctx, stateId, logger, true)
 		if err != nil {
 			logger.Error("Failed to discover resource", zap.Error(err))
 			http.Error(writer, "Not Found", http.StatusNotFound)

src/DurableClient.php

@@ -143,8 +143,8 @@ public function deleteEntity(EntityId $entityId): void
         $this->entityClient->deleteEntity($entityId);
     }
 
-    public function shareOwnership(EntityId|OrchestrationInstance $resource, string $with): void
+    public function shareEntityOwnership(EntityId $id, string $with): void
     {
-        $this->entityClient->shareOwnership($resource, $with);
+        $this->entityClient->shareEntityOwnership($id, $with);
     }
 }

src/EntityClientInterface.php

@@ -27,7 +27,6 @@
 use Bottledcode\DurablePhp\Search\EntityFilter;
 use Bottledcode\DurablePhp\State\EntityId;
 use Bottledcode\DurablePhp\State\EntityState;
-use Bottledcode\DurablePhp\State\OrchestrationInstance;
 use Closure;
 use DateTimeImmutable;
 use Generator;
@@ -82,5 +81,5 @@ public function getEntitySnapshot(EntityId $entityId): ?EntityState;
      */
     public function deleteEntity(EntityId $entityId): void;
 
-    public function shareOwnership(EntityId|OrchestrationInstance $resource, string $with): void;
+    public function shareEntityOwnership(EntityId $id, string $with): void;
 }

src/RemoteEntityClient.php

@@ -31,8 +31,6 @@
 use Bottledcode\DurablePhp\Search\EntityFilter;
 use Bottledcode\DurablePhp\State\EntityId;
 use Bottledcode\DurablePhp\State\EntityState;
-use Bottledcode\DurablePhp\State\Ids\StateId;
-use Bottledcode\DurablePhp\State\OrchestrationInstance;
 use Bottledcode\DurablePhp\State\Serializer;
 use Closure;
 use DateTimeImmutable;
@@ -166,10 +164,9 @@ public function deleteEntity(EntityId $entityId): void
         }
     }
 
-    public function shareOwnership(EntityId|OrchestrationInstance $resource, string $with): void
+    public function shareEntityOwnership(EntityId $id, string $with): void
     {
-        $id = $resource instanceof EntityId ? StateId::fromEntityId($resource) : StateId::fromInstance($resource);
-        $req = new Request("{$this->apiHost}/resource/{$id}/share/{$with}", 'POST');
+        $req = new Request("{$this->apiHost}/entity/{$id->name}/{$id->id}/share/{$with}", 'POST');
         if ($this->userToken) {
             $req->setHeader('Authorization', 'Bearer ' . $this->userToken);
         }