Merge pull request #27 from gunet/fix/expiration

Fix expiration display base on first `exp` and then `expiry_date`
gunet · Dec 2, 2024 · 7b70d3e · 7b70d3e
2 parents 23e7eaa + 9544e7b
commit 7b70d3e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/src/components/Credentials/CredentialImage.js b/src/components/Credentials/CredentialImage.js
@@ -25,7 +25,7 @@ const CredentialImage = ({ credential, className, onClick, showRibbon = true, vc
 				<img src={parsedCredential.credentialImage.credentialImageURL} alt={"Credential"} className={className} onClick={onClick} />
 			)}
 			{parsedCredential && showRibbon &&
-				<ExpiredRibbon parsedCredential={parsedCredential} />
+				<ExpiredRibbon parsedCredential={parsedCredential.beautifiedForm} />
 			}
 			{vcEntityInstances && showRibbon &&
 				<UsagesRibbon vcEntityInstances={vcEntityInstances} />

diff --git a/src/components/Credentials/CredentialLayout.js b/src/components/Credentials/CredentialLayout.js
@@ -61,7 +61,7 @@ const CredentialLayout = ({ children, title = null }) => {
 			if ('error' in c) {
 				return;
 			}
-			setIsExpired(CheckExpired(c.beautifiedForm.expiry_date))
+			setIsExpired(CheckExpired(c.beautifiedForm.exp ?? c.beautifiedForm.expiry_date ))
 			setCredentialFriendlyName(c.credentialFriendlyName);
 		});
 	}, [vcEntity, container]);

diff --git a/src/components/Credentials/ExpiredRibbon.js b/src/components/Credentials/ExpiredRibbon.js
@@ -8,8 +8,8 @@ const ExpiredRibbon = ({ parsedCredential }) => {
 
 	return (
 		<>
-			{parsedCredential && CheckExpired(parsedCredential.expiry_date) &&
-				<div className={`absolute bottom-0 right-0 text-white text-xs py-1 px-3 rounded-tl-lg rounded-br-2xl border-t border-l border-white ${CheckExpired(parsedCredential.expirationDate) ? 'bg-red-600' : 'bg-green-500'}`}>
+			{parsedCredential && CheckExpired(parsedCredential.exp ?? parsedCredential.expiry_date) &&
+				<div className={`absolute bottom-0 right-0 text-white text-xs py-1 px-3 rounded-tl-lg rounded-br-2xl border-t border-l border-white ${CheckExpired(parsedCredential.exp ?? parsedCredential.expiry_date) ? 'bg-red-600' : 'bg-green-500'}`}>
 					{t('expiredRibbon.expired')}
 				</div>
 			}

diff --git a/src/components/Credentials/RenderCustomSvgTemplate.js b/src/components/Credentials/RenderCustomSvgTemplate.js
@@ -49,7 +49,7 @@ const renderCustomSvgTemplate = async ({ beautifiedForm, name, description, logo
 			.replace(/{{textColor}}/g, textColor)
 			.replace(/{{description}}/g, description);
 
-		const expiryDate = jsonpointer.get(beautifiedForm, "/expiry_date");
+		const expiryDate = jsonpointer.get(beautifiedForm, "/expiry_date") ?? new Date(jsonpointer.get(beautifiedForm, "/exp") * 1000).toISOString();
 		svgContent = svgContent.replace(/{{\/expiry_date}}/g, expiryDate ? `Expiry Date: ${formatDate(expiryDate, 'date')}` : '');
 
 		return `data:image/svg+xml;utf8,${encodeURIComponent(svgContent)}`;

diff --git a/src/functions/CheckExpired.js b/src/functions/CheckExpired.js
@@ -1,6 +1,11 @@
 // CheckExpired.js
 export function CheckExpired(expiry_date) {
+	if (!expiry_date) {
+		return false;
+	}
+
+	const parsedExpiryDate = typeof expiry_date == 'string' ? expiry_date : new Date(expiry_date * 1000).toISOString();
 	const today = new Date();
-	const expirationDate = new Date(expiry_date);
+	const expirationDate = new Date(parsedExpiryDate);
 	return expirationDate < today;
 };
diff --git a/src/functions/DateFormat.js b/src/functions/DateFormat.js
@@ -38,4 +38,4 @@ export function formatDate(value, format = 'datetime') {
 		: { day: '2-digit', month: '2-digit', year: 'numeric' };
 
 	return date.toLocaleDateString('en-GB', options);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ export function formatDate(value, format = 'datetime') { @@
     		: { day: '2-digit', month: '2-digit', year: 'numeric' };
     	return date.toLocaleDateString('en-GB', options);
-    }
+    }