Compatibility with new context providers

silverstripe · Jan 27, 2021 · ebb4c8f · ebb4c8f
1 parent fbe05df
commit ebb4c8f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/GraphQL/Plugins/UnpublishOnDelete.php b/src/GraphQL/Plugins/UnpublishOnDelete.php
@@ -5,6 +5,7 @@
 
 use SilverStripe\Core\Extensible;
 use SilverStripe\GraphQL\QueryHandler\QueryHandler;
+use SilverStripe\GraphQL\QueryHandler\UserContextProvider;
 use SilverStripe\GraphQL\Schema\Field\ModelMutation;
 use SilverStripe\GraphQL\Schema\Interfaces\ModelMutationPlugin;
 use SilverStripe\GraphQL\Schema\Schema;
@@ -65,8 +66,8 @@ public static function unpublishOnDelete(array $context)
                     if (!$object->hasExtension(Versioned::class) || !$object->isPublished()) {
                         continue;
                     }
-
-                    if (!$object->canUnpublish($context[QueryHandler::CURRENT_USER])) {
+                    $member = UserContextProvider::get($context);
+                    if (!$object->canUnpublish($member)) {
                         throw new Exception(sprintf(
                             'Cannot unpublish %s with ID %s',
                             get_class($object),

diff --git a/src/GraphQL/Plugins/VersionedDataObject.php b/src/GraphQL/Plugins/VersionedDataObject.php
@@ -81,7 +81,6 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
         $type->addField('version', 'Int');
 
         $versionType = Type::create($versionName)
-            ->mergeWith($type)
             ->addField('author', ['type' => $memberTypeName] + $resolver)
             ->addField('publisher', ['type' => $memberTypeName] + $resolver)
             ->addField('published', ['type' => 'Boolean'] + $resolver)
@@ -90,6 +89,14 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
             ->addField('draft', ['type' => 'Boolean'] + $resolver)
             ->addField('latestDraftVersion', ['type' => 'Boolean'] + $resolver);
 
+        foreach ($type->getFields() as $field) {
+            $clone = clone $field;
+            $versionType->addField($clone->getName(), $clone);
+        }
+        foreach ($type->getInterfaces() as $interface) {
+            $versionType->addInterface($interface);
+        }
+
         $schema->addType($versionType);
         $type->addField('versions', '[' . $versionName . ']', function (Field $field) use ($type) {
                 $field->setResolver([VersionedResolver::class, 'resolveVersionList'])

diff --git a/src/GraphQL/Resolvers/VersionedResolver.php b/src/GraphQL/Resolvers/VersionedResolver.php
@@ -6,6 +6,7 @@
 use GraphQL\Type\Definition\ResolveInfo;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\GraphQL\QueryHandler\QueryHandler;
+use SilverStripe\GraphQL\QueryHandler\UserContextProvider;
 use SilverStripe\GraphQL\Resolvers\VersionFilters;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
@@ -73,7 +74,8 @@ public static function resolveVersionList(array $resolverContext): Closure
                     $sourceClass
                 ));
             }
-            if (!$object->canViewStage(Versioned::DRAFT, $context[QueryHandler::CURRENT_USER])) {
+            $member = UserContextProvider::get($context);
+            if (!$object->canViewStage(Versioned::DRAFT, $member)) {
                 throw new Exception(sprintf(
                     'Cannot view versions on %s',
                     $this->getDataObjectClass()
@@ -134,10 +136,11 @@ public static function resolveCopyToStage(array $context): Closure
                 throw new InvalidArgumentException("Record {$id} not found");
             }
 
+            $member = UserContextProvider::get($context);
             // Permission check object
             $can = $to === Versioned::LIVE
-                ? $record->canPublish($context[QueryHandler::CURRENT_USER])
-                : $record->canEdit($context[QueryHandler::CURRENT_USER]);
+                ? $record->canPublish($member)
+                : $record->canEdit($member);
             if (!$can) {
                 throw new InvalidArgumentException(sprintf(
                     'Copying %s from %s to %s is not allowed',
@@ -189,7 +192,8 @@ public static function resolvePublishOperation(array $context)
                 ));
             }
             $permissionMethod = $isPublish ? 'canPublish' : 'canUnpublish';
-            if (!$obj->$permissionMethod($context[QueryHandler::CURRENT_USER])) {
+            $member = UserContextProvider::get($context);
+            if (!$obj->$permissionMethod($member)) {
                 throw new Exception(sprintf(
                     'Not allowed to change published state of this %s',
                     $dataClass
@@ -236,7 +240,7 @@ public static function resolveRollback(array $context)
             $record = Versioned::get_latest_version($dataClass, $id);
 
             // Assert permission
-            $user = $context[QueryHandler::CURRENT_USER];
+            $user = UserContextProvider::get($context);
             if (!$record->canEdit($user)) {
                 throw new InvalidArgumentException('Current user does not have permission to roll back this resource');
             }