From da2d0571ab49f534340b9852f4ef89f6e5e0da43 Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Fri, 24 Jan 2025 15:09:12 +0100 Subject: [PATCH] MDL-84323 core_badges: Remove endorsement from JSON The endorsement has been removed from the JSON because, according to the OBv2.0specification, it must not be included in either the badge or the assertion. Including it results in a format error, rendering the badge invalid. --- badges/badge_json.php | 6 ------ badges/classes/assertion.php | 4 ---- badges/tests/classes/badges_testcase.php | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/badges/badge_json.php b/badges/badge_json.php index abcb4fe2489..3c9659e0394 100644 --- a/badges/badge_json.php +++ b/badges/badge_json.php @@ -95,12 +95,6 @@ if ($badge->status != BADGE_STATUS_INACTIVE) { $json['related'] = $relateds; } - $endorsement = $badge->get_endorsement(); - if (!empty($endorsement)) { - $endorsementurl = new moodle_url('/badges/endorsement_json.php', array('id' => $badge->id)); - $json['endorsement'] = $endorsementurl->out(false); - } - $alignments = $badge->get_alignments(); if (!empty($alignments)) { foreach ($alignments as $item) { diff --git a/badges/classes/assertion.php b/badges/classes/assertion.php index 4021c9d1e91..81fcd521893 100644 --- a/badges/classes/assertion.php +++ b/badges/classes/assertion.php @@ -357,10 +357,6 @@ class core_badges_assertion { if (!empty($relatedbadges = $this->get_related_badges($badge))) { $json['related'] = $relatedbadges; } - if ($endorsement = $this->get_endorsement()) { - $endorsementurl = new moodle_url('/badges/endorsement_json.php', array('id' => $this->_data->id)); - $json['endorsement'] = $endorsementurl->out(false); - } if ($alignments = $this->get_alignments()) { $json['alignments'] = $alignments; } diff --git a/badges/tests/classes/badges_testcase.php b/badges/tests/classes/badges_testcase.php index 930de11c619..f7f2c53872e 100644 --- a/badges/tests/classes/badges_testcase.php +++ b/badges/tests/classes/badges_testcase.php @@ -166,7 +166,7 @@ abstract class badges_testcase extends \advanced_testcase { '"criteria":{"id":"%s","narrative":"%s"},"issuer":{"name":"%s","url":"%s","email":"%s",' . '"@context":"https:\/\/w3id.org\/openbadges\/v2","id":"%s","type":"Issuer"},' . '"tags":%s,"@context":"https:\/\/w3id.org\/openbadges\/v2","id":"%s","type":"BadgeClass","version":"%s",' . - '"@language":"en","related":[{"id":"%s","version":"%s","@language":"%s"}],"endorsement":"%s",' . + '"@language":"en","related":[{"id":"%s","version":"%s","@language":"%s"}],' . '"alignments":[{"targetName":"%s","targetUrl":"%s","targetDescription":"%s","targetFramework":"%s",' . '"targetCode":"%s"}]},"verify":{"type":"hosted","url":"%s"},"issuedOn":"%s","evidence":"%s","tags":%s,' . '"@context":"https:\/\/w3id.org\/openbadges\/v2","type":"Assertion","id":"%s"}'; @@ -175,7 +175,7 @@ abstract class badges_testcase extends \advanced_testcase { '"criteria":{"id":"%s","narrative":"%s"},"issuer":{"name":"%s","url":"%s","email":"%s",' . '"@context":"https:\/\/w3id.org\/openbadges\/v2","id":"%s","type":"Issuer"},' . '"tags":%s,"@context":"https:\/\/w3id.org\/openbadges\/v2","id":"%s","type":"BadgeClass","version":"%s",' . - '"@language":"%s","related":[{"id":"%s","version":"%s","@language":"%s"}],"endorsement":"%s",' . + '"@language":"%s","related":[{"id":"%s","version":"%s","@language":"%s"}],' . '"alignments":[{"targetName":"%s","targetUrl":"%s","targetDescription":"%s","targetFramework":"%s",' . '"targetCode":"%s"}]}'; $this->assertion2->issuer = '{"name":"%s","url":"%s","email":"%s",' .