@sphereon/ssi-sdk.vc-status-list-issuer-rest-api 0.32.1-next.54 → 0.33.1-feature.vcdm2.4

package/dist/api-functions.d.ts

@@ -3,5 +3,6 @@ import { ICredentialStatusListEndpointOpts, IRequiredContext, IW3CredentialStatu
 export declare function createNewStatusListEndpoint(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts): void;
 export declare function getStatusListCredentialEndpoint(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts): void;
 export declare function getStatusListCredentialIndexStatusEndpoint(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts): void;
-export declare function updateW3CStatusEndpoint(router: Router, context: IRequiredContext, opts: IW3CredentialStatusEndpointOpts): void;
+export declare function getStatusListCredentialIndexStatusEndpointLegacy(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts): void;
+export declare function updateStatusEndpoint(router: Router, context: IRequiredContext, opts: IW3CredentialStatusEndpointOpts): void;
 //# sourceMappingURL=api-functions.d.ts.map

package/dist/api-functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-functions.d.ts","sourceRoot":"","sources":["../src/api-functions.ts"],"names":[],"mappings":"AAQA,OAAO,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAAE,iCAAiC,EAAE,gBAAgB,EAAE,+BAA+B,EAAiC,MAAM,SAAS,CAAA;AAI7I,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QAmB7H;AAcD,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QAkBjI;AAED,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QAmD5I;AACD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,+BAA+B,QAqEvH"}
+{"version":3,"file":"api-functions.d.ts","sourceRoot":"","sources":["../src/api-functions.ts"],"names":[],"mappings":"AASA,OAAO,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAEL,iCAAiC,EACjC,gBAAgB,EAChB,+BAA+B,EAIhC,MAAM,SAAS,CAAA;AAmChB,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QAoB7H;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QAsBjI;AAED,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QA4E5I;AAED,wBAAgB,gDAAgD,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,iCAAiC,QA0DlJ;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,+BAA+B,QAgGpH"}

package/dist/api-functions.js

@@ -1,88 +1,155 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNewStatusListEndpoint = createNewStatusListEndpoint;
-exports.getStatusListCredentialEndpoint = getStatusListCredentialEndpoint;
-exports.getStatusListCredentialIndexStatusEndpoint = getStatusListCredentialIndexStatusEndpoint;
-exports.updateW3CStatusEndpoint = updateW3CStatusEndpoint;
-const ssi_express_support_1 = require("@sphereon/ssi-express-support");
-const ssi_sdk_vc_status_list_1 = require("@sphereon/ssi-sdk.vc-status-list");
-const ssi_sdk_vc_status_list_issuer_drivers_1 = require("@sphereon/ssi-sdk.vc-status-list-issuer-drivers");
-const debug_1 = __importDefault(require("debug"));
-const debug = (0, debug_1.default)('sphereon:ssi-sdk:status-list');
-function createNewStatusListEndpoint(router, context, opts) {
-    var _a;
-    if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
+import { checkAuth, sendErrorResponse } from '@sphereon/ssi-express-support';
+import { checkStatusIndexFromStatusListCredential, updateStatusIndexFromStatusListCredential, } from '@sphereon/ssi-sdk.vc-status-list';
+import { getDriver } from '@sphereon/ssi-sdk.vc-status-list-issuer-drivers';
+import Debug from 'debug';
+import { EntryIdType, StatusListIdType, } from './types';
+import { StatusListType } from '@sphereon/ssi-types';
+const debug = Debug('sphereon:ssi-sdk:status-list');
+function sendStatuslistResponse(details, statuslistPayload, response) {
+    let payload;
+    switch (details.proofFormat) {
+        case 'jwt':
+        case 'cbor':
+            payload = Buffer.from(statuslistPayload, 'ascii');
+            break;
+        default:
+            payload = statuslistPayload;
+    }
+    return response.status(200).setHeader('Content-Type', details.statuslistContentType).send(payload);
+}
+function buildStatusListId(request) {
+    const protocol = request.headers['x-forwarded-proto']?.toString() ?? request.protocol;
+    let host = request.headers['x-forwarded-host']?.toString() ?? request.get('host');
+    const forwardedPort = request.headers['x-forwarded-port']?.toString();
+    if (forwardedPort && !(protocol === 'https' && forwardedPort === '443') && !(protocol === 'http' && forwardedPort === '80')) {
+        host += `:${forwardedPort}`;
+    }
+    const forwardedPrefix = request.headers['x-forwarded-prefix']?.toString() ?? '';
+    return `${protocol}://${host}${forwardedPrefix}${request.originalUrl.split('?')[0].replace(/\/status\/index\/.*/, '')}`;
+}
+export function createNewStatusListEndpoint(router, context, opts) {
+    if (opts?.enabled === false) {
         console.log(`Create new status list endpoint is disabled`);
         return;
     }
-    const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/status-lists';
-    router.post(path, (0, ssi_express_support_1.checkAuth)(opts === null || opts === void 0 ? void 0 : opts.endpoint), (request, response) => __awaiter(this, void 0, void 0, function* () {
+    const path = opts?.path ?? '/status-lists';
+    router.post(path, checkAuth(opts?.endpoint), async (request, response) => {
         try {
             const statusListArgs = request.body.statusList;
             if (!statusListArgs) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, 'No statusList details supplied');
+                return sendErrorResponse(response, 400, 'No statusList details supplied');
             }
-            const statusListDetails = yield context.agent.slCreateStatusList(statusListArgs);
-            return response.send({ statusListDetails });
+            const details = await context.agent.slCreateStatusList(statusListArgs);
+            const statuslistPayload = details.statusListCredential;
+            return sendStatuslistResponse(details, statuslistPayload, response);
         }
         catch (e) {
-            return (0, ssi_express_support_1.sendErrorResponse)(response, 500, e.message, e);
+            return sendErrorResponse(response, 500, e.message, e);
         }
-    }));
+    });
 }
-const buildStatusListId = (request) => {
-    var _a, _b, _c, _d, _e;
-    const protocol = (_b = (_a = request.headers['x-forwarded-proto']) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : request.protocol;
-    let host = (_d = (_c = request.headers['x-forwarded-host']) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : request.get('host');
-    const forwardedPort = (_e = request.headers['x-forwarded-port']) === null || _e === void 0 ? void 0 : _e.toString();
-    if (forwardedPort && !(protocol === 'https' && forwardedPort === '443') && !(protocol === 'http' && forwardedPort === '80')) {
-        host += `:${forwardedPort}`;
-    }
-    return `${protocol}://${host}${request.originalUrl}`;
-};
-function getStatusListCredentialEndpoint(router, context, opts) {
-    var _a;
-    if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
+export function getStatusListCredentialEndpoint(router, context, opts) {
+    if (opts?.enabled === false) {
         console.log(`Get statusList credential endpoint is disabled`);
         return;
     }
-    const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/status-lists/:index';
-    router.get(path, (0, ssi_express_support_1.checkAuth)(opts === null || opts === void 0 ? void 0 : opts.endpoint), (request, response) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    const path = opts?.path ?? '/status-lists/:index';
+    router.get(path, checkAuth(opts?.endpoint), async (request, response) => {
         try {
             //todo: Check index against correlationId first. Then match originalUrl against statusList id
-            const correlationId = (_d = (_b = (_a = request.query.correlationId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : (_c = request.params.index) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : request.originalUrl;
-            const driver = yield (0, ssi_sdk_vc_status_list_issuer_drivers_1.getDriver)({ id: buildStatusListId(request), correlationId, dbName: opts.dbName });
-            const details = yield driver.getStatusList();
+            //const correlationId = request.query.correlationId?.toString() ?? request.params.index?.toString() ?? request.originalUrl TODO I so not get these
+            const correlationId = request.query.correlationId?.toString();
+            const driver = await getDriver({
+                ...(correlationId ? { correlationId } : { id: buildStatusListId(request) }),
+                dbName: opts.dbName,
+            });
+            const details = await driver.getStatusList();
+            const statuslistPayload = details.statusListCredential;
+            return sendStatuslistResponse(details, statuslistPayload, response);
+        }
+        catch (e) {
+            return sendErrorResponse(response, 500, e.message, e);
+        }
+    });
+}
+export function getStatusListCredentialIndexStatusEndpoint(router, context, opts) {
+    if (opts?.enabled === false) {
+        console.log(`Get statusList credential index status endpoint is disabled`);
+        return;
+    }
+    const path = opts?.path ?? '/status-lists/:statusListId/status/entry-by-id/:entryId';
+    router.get(path, checkAuth(opts?.endpoint), async (request, response) => {
+        try {
+            const statusListIdType = request.query.statusListIdType ?? StatusListIdType.StatusListId;
+            const entryIdType = request.query.entryIdType ?? EntryIdType.StatusListIndex;
+            let statusListIndex;
+            let entityCorrelationId;
+            let statusListId;
+            let statusListCorrelationId;
+            if (entryIdType === EntryIdType.StatusListIndex) {
+                try {
+                    statusListIndex = Number.parseInt(request.params.entryId);
+                    if (!statusListIndex || statusListIndex < 0) {
+                        return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`);
+                    }
+                }
+                catch (error) {
+                    return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`);
+                }
+            }
+            else {
+                entityCorrelationId = request.params.entryId;
+            }
+            if (statusListIdType === StatusListIdType.StatusListId) {
+                statusListId = request.params.statusListId;
+            }
+            else {
+                statusListCorrelationId = request.params.statusListId;
+            }
+            const driver = await getDriver({
+                ...(statusListCorrelationId ? { correlationId: statusListCorrelationId } : { id: statusListId }),
+                dbName: opts.dbName,
+            });
+            const details = await driver.getStatusList();
+            if (statusListIndex && statusListIndex > details.length) {
+                return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`);
+            }
+            let entry = await driver.getStatusListEntryByIndex({
+                statusListId: details.id,
+                ...(entityCorrelationId ? { correlationId: entityCorrelationId } : { statusListIndex }),
+                errorOnNotFound: false,
+            });
+            const type = details.type === StatusListType.StatusList2021 ? 'StatusList2021Entry' : details.type;
+            const resultStatusIndex = entry?.statusListIndex ?? statusListIndex ?? 0;
+            const status = await checkStatusIndexFromStatusListCredential({
+                statusListCredential: details.statusListCredential,
+                ...(details.type === StatusListType.StatusList2021 ? { statusPurpose: details.statusList2021?.statusPurpose } : {}),
+                type,
+                id: details.id,
+                statusListIndex: resultStatusIndex,
+            });
+            if (!entry) {
+                entry = {
+                    statusListId: details.id,
+                    value: '0',
+                    statusListIndex: resultStatusIndex,
+                };
+            }
             response.statusCode = 200;
-            return response.send(details.statusListCredential);
+            return response.json({ ...entry, status });
         }
         catch (e) {
-            return (0, ssi_express_support_1.sendErrorResponse)(response, 500, e.message, e);
+            return sendErrorResponse(response, 500, e.message, e);
         }
-    }));
+    });
 }
-function getStatusListCredentialIndexStatusEndpoint(router, context, opts) {
-    var _a;
-    if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
+export function getStatusListCredentialIndexStatusEndpointLegacy(router, context, opts) {
+    if (opts?.enabled === false) {
         console.log(`Get statusList credential index status endpoint is disabled`);
         return;
     }
-    const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/status-lists/:index/status/index/:statusListIndex';
-    router.get(path, (0, ssi_express_support_1.checkAuth)(opts === null || opts === void 0 ? void 0 : opts.endpoint), (request, response) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    const path = opts?.path ?? '/status-lists/:index/status/index/:statusListIndex';
+    router.get(path, checkAuth(opts?.endpoint), async (request, response) => {
         try {
             //todo: Check index against correlationId first. Then match originalUrl against statusList id
             const statusListIndexStr = request.params.statusListIndex;
@@ -91,104 +158,140 @@ function getStatusListCredentialIndexStatusEndpoint(router, context, opts) {
                 statusListIndex = Number.parseInt(statusListIndexStr);
             }
             catch (error) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, `Please provide a proper statusListIndex`);
+                return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`);
             }
             if (!statusListIndex || statusListIndex < 0) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, `Please provide a proper statusListIndex`);
+                return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`);
             }
-            const correlationId = (_d = (_b = (_a = request.query.correlationId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : (_c = request.params.index) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : request.originalUrl;
-            const driver = yield (0, ssi_sdk_vc_status_list_issuer_drivers_1.getDriver)({
-                id: `${request.protocol}://${request.get('host')}${request.originalUrl.replace(/\/status\/index\/.*/, '')}`,
-                correlationId,
+            //const correlationId = request.query.correlationId?.toString() ?? request.params.index?.toString() ?? request.originalUrl TODO I so not get these
+            const statusListCorrelationId = request.query.correlationId?.toString();
+            const driver = await getDriver({
+                ...(statusListCorrelationId ? { correlationId: statusListCorrelationId } : { id: buildStatusListId(request) }),
                 dbName: opts.dbName,
             });
-            const details = yield driver.getStatusList();
+            const details = await driver.getStatusList();
             if (statusListIndex > details.length) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, `Please provide a proper statusListIndex`);
+                return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`);
             }
-            let entry = yield driver.getStatusListEntryByIndex({
-                statusListIndex,
+            const entityCorrelationId = request.query.entityCorrelationId?.toString();
+            let entry = await driver.getStatusListEntryByIndex({
                 statusListId: details.id,
-                correlationId: details.correlationId,
+                ...(entityCorrelationId ? { correlationId: entityCorrelationId } : { statusListIndex: statusListIndex }),
                 errorOnNotFound: false,
             });
-            const status = yield (0, ssi_sdk_vc_status_list_1.checkStatusIndexFromStatusListCredential)(Object.assign(Object.assign({}, details), { statusListIndex }));
+            const type = details.type === StatusListType.StatusList2021 ? 'StatusList2021Entry' : details.type;
+            const status = await checkStatusIndexFromStatusListCredential({
+                statusListCredential: details.statusListCredential,
+                ...(details.type === StatusListType.StatusList2021 ? { statusPurpose: details.statusList2021?.statusPurpose } : {}),
+                type,
+                id: details.id,
+                statusListIndex,
+            });
             if (!entry) {
                 // The fact we have nothing on it means the status is okay
                 entry = {
-                    statusList: details.id,
+                    statusListId: details.id,
                     value: '0',
                     statusListIndex,
                 };
             }
             response.statusCode = 200;
-            return response.send(Object.assign(Object.assign({}, entry), { status }));
+            return response.json({ ...entry, status });
         }
         catch (e) {
-            return (0, ssi_express_support_1.sendErrorResponse)(response, 500, e.message, e);
+            return sendErrorResponse(response, 500, e.message, e);
         }
-    }));
+    });
 }
-function updateW3CStatusEndpoint(router, context, opts) {
-    var _a;
-    if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
+export function updateStatusEndpoint(router, context, opts) {
+    if (opts?.enabled === false) {
         console.log(`Update credential status endpoint is disabled`);
         return;
     }
-    router.post((_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/credentials/status', (0, ssi_express_support_1.checkAuth)(opts === null || opts === void 0 ? void 0 : opts.endpoint), (request, response) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    router.post(opts?.path ?? '/credentials/status', checkAuth(opts?.endpoint), async (request, response) => {
         try {
             debug(JSON.stringify(request.body, null, 2));
             const updateRequest = request.body;
-            const statusListId = (_c = (_a = updateRequest.statusListId) !== null && _a !== void 0 ? _a : (_b = request.query.statusListId) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : opts.statusListId;
-            const statusListCorrelationId = (_f = (_d = updateRequest.statusListCorrelationId) !== null && _d !== void 0 ? _d : (_e = request.query.statusListorrelationId) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : opts.correlationId;
-            const entryCorrelationId = (_g = updateRequest.entryCorrelationId) !== null && _g !== void 0 ? _g : (_h = request.query.entryCorrelationId) === null || _h === void 0 ? void 0 : _h.toString();
-            const credentialId = updateRequest.credentialId;
+            const statusListId = updateRequest.statusListId ?? request.query.statusListId?.toString() ?? opts.statusListId; // TODO why query params when we have a JSON body ??
+            const statusListCorrelationId = updateRequest.statusListCorrelationId ?? request.query.statusListrelationId?.toString() ?? opts.correlationId;
+            const entryCorrelationId = updateRequest.entryCorrelationId ?? request.query.entryCorrelationId?.toString();
             // TODO: Move mostly to driver
-            if (!credentialId) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, 'No statusList credentialId supplied');
+            if (!statusListId && !statusListCorrelationId) {
+                return sendErrorResponse(response, 400, 'No statusList id or correlation Id provided or deduced for the API or in the request');
             }
             else if (!updateRequest.credentialStatus || updateRequest.credentialStatus.length === 0) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, 'No statusList updates supplied');
-            }
-            else if (!statusListId && !statusListCorrelationId) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 400, 'No statusList id or correlation Id provided or deduced for the API or in the request');
-            }
-            const driver = yield (0, ssi_sdk_vc_status_list_issuer_drivers_1.getDriver)({ id: statusListId, correlationId: statusListCorrelationId, dbName: opts.dbName });
-            // unfortunately the W3C API works by credentialId. Which means you will have to map listIndices during issuance
-            const statusListEntry = yield driver.getStatusListEntryByCredentialId({
-                statusListId,
-                statusListCorrelationId,
-                entryCorrelationId,
-                credentialId,
-                errorOnNotFound: true,
+                return sendErrorResponse(response, 400, 'No statusList updates supplied');
+            }
+            const driver = await getDriver({
+                ...(statusListCorrelationId ? { correlationId: statusListCorrelationId } : { id: buildStatusListId(request) }),
+                dbName: opts.dbName,
             });
+            let statusListResult = await driver.getStatusList();
+            // Get status list entry based on request type
+            let statusListEntry;
+            if ('credentialId' in updateRequest) {
+                if (!updateRequest.credentialId) {
+                    return sendErrorResponse(response, 400, 'No credentialId supplied');
+                }
+                // unfortunately the W3C API works by credentialId. Which means you will have to map listIndices during issuance
+                statusListEntry = await driver.getStatusListEntryByCredentialId({
+                    statusListId,
+                    statusListCorrelationId,
+                    entryCorrelationId,
+                    credentialId: updateRequest.credentialId,
+                    errorOnNotFound: true,
+                });
+            }
+            else {
+                statusListEntry = await driver.getStatusListEntryByIndex({
+                    ...(statusListResult.id && { statusListId: statusListResult.id }),
+                    ...(statusListResult.correlationId && { statusListCorrelationId: statusListResult.correlationId }),
+                    ...(entryCorrelationId ? { entryCorrelationId } : { statusListIndex: updateRequest.statusListIndex }),
+                    errorOnNotFound: true,
+                });
+            }
             if (!statusListEntry) {
-                return (0, ssi_express_support_1.sendErrorResponse)(response, 404, `status list index for credential id ${credentialId} was never recorded for ${statusListId}. This means the status will be 0`);
+                const identifier = 'credentialId' in updateRequest ? updateRequest.credentialId : `index ${updateRequest.statusListIndex}`;
+                return sendErrorResponse(response, 404, `Status list entry for ${identifier} not found for ${statusListId}`);
             }
-            const statusListIndex = statusListEntry.statusListIndex;
-            let details = yield driver.getStatusList();
-            let statusListCredential = details.statusListCredential;
+            let statusListCredential = statusListResult.statusListCredential;
             for (const updateItem of updateRequest.credentialStatus) {
-                if (updateItem.type && updateItem.type !== 'StatusList2021') {
-                    return (0, ssi_express_support_1.sendErrorResponse)(response, 400, `Only the optional type 'StatusList2021' is currently supported`);
-                }
                 if (!updateItem.status) {
-                    return (0, ssi_express_support_1.sendErrorResponse)(response, 400, `Required 'status' value was missing in the credentialStatus array for credentialId ${credentialId}`);
+                    return sendErrorResponse(response, 400, `Required 'status' value was missing in the credentialStatus array`);
+                }
+                let value = '1';
+                if (updateItem.status === '0' || updateItem.status.toLowerCase() === 'false') {
+                    value = '0';
+                }
+                else if (updateItem.status !== '1' && updateItem.status.toLowerCase() !== 'true') {
+                    if (updateItem.type === StatusListType.StatusList2021) {
+                        // 2021 only allows 0 and 1
+                        return sendErrorResponse(response, 400, `Invalid 'status' value in the credentialStatus array: ${updateItem.status}`);
+                    }
+                    else if (parseInt(updateItem.status) < 0 || parseInt(updateItem.status) > 255) {
+                        return sendErrorResponse(response, 400, `Invalid 'status' value in the credentialStatus array: ${updateItem.status}`);
+                    }
+                    value = `${parseInt(updateItem.status)}`;
                 }
-                const value = updateItem.status === '0' || updateItem.status.toLowerCase() === 'false' ? false : true;
-                const statusList = statusListId !== null && statusListId !== void 0 ? statusListId : statusListEntry.statusList;
-                yield driver.updateStatusListEntry(Object.assign(Object.assign({}, statusListEntry), { statusListIndex, statusList, credentialId, value: value ? '1' : '0' }));
+                const updStatusListId = statusListId ?? statusListEntry.statusList?.id; // When input was statusListCorrelationId the statusList id should come from statusListEntry
+                if (!updStatusListId) {
+                    return sendErrorResponse(response, 400, 'statuslist id could not be determined');
+                }
+                await driver.updateStatusListEntry({ ...statusListEntry, statusListId: updStatusListId, value });
                 // todo: optimize. We are now creating a new VC for every item passed in. Probably wise to look at DB as well
-                details = yield (0, ssi_sdk_vc_status_list_1.updateStatusIndexFromStatusListCredential)({ statusListCredential, statusListIndex, value, keyRef: opts.keyRef }, context);
-                details = yield driver.updateStatusList({ statusListCredential: details.statusListCredential });
+                statusListResult = await updateStatusIndexFromStatusListCredential({
+                    statusListCredential: statusListCredential,
+                    statusListIndex: statusListEntry.statusListIndex,
+                    value: parseInt(value),
+                    keyRef: opts.keyRef,
+                }, context);
+                statusListResult = await driver.updateStatusList({ statusListCredential: statusListResult.statusListCredential });
             }
-            response.statusCode = 200;
-            return response.send(details.statusListCredential);
+            return sendStatuslistResponse(statusListResult, statusListResult.statusListCredential, response);
         }
         catch (e) {
-            return (0, ssi_express_support_1.sendErrorResponse)(response, 500, e.message, e);
+            return sendErrorResponse(response, 500, e.message, e);
         }
-    }));
+    });
 }
 //# sourceMappingURL=api-functions.js.map

package/dist/api-functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-functions.js","sourceRoot":"","sources":["../src/api-functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-functions.js","sourceRoot":"","sources":["../src/api-functions.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,23 +1,7 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @public
  */
-__exportStar(require("./statuslist-management-api-server"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./api-functions"), exports);
+export * from './statuslist-management-api-server';
+export * from './types';
+export * from './api-functions';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,qEAAkD;AAClD,0CAAuB;AACvB,kDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,oCAAoC,CAAA;AAClD,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA"}

package/dist/statuslist-management-api-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statuslist-management-api-server.d.ts","sourceRoot":"","sources":["../src/statuslist-management-api-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAExF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,OAAO,OAAO,EAAE,EAAE,OAAO,EAAU,MAAM,SAAS,CAAA;AAOlD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAElF,qBAAa,6BAA6B;IACxC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAE3B;IAED,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;gBAEpB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,CAAC;QAAC,cAAc,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,eAAe,CAAA;KAAE;IAgChI,IAAI,KAAK,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAEpC;IAED,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;CACF"}
+{"version":3,"file":"statuslist-management-api-server.d.ts","sourceRoot":"","sources":["../src/statuslist-management-api-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAExF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,OAAO,OAAO,EAAE,EAAE,OAAO,EAAU,MAAM,SAAS,CAAA;AAQlD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAElF,qBAAa,6BAA6B;IACxC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAE3B;IAED,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;gBAEpB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,CAAC;QAAC,cAAc,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,eAAe,CAAA;KAAE;IAiChI,IAAI,KAAK,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAEpC;IAED,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;CACF"}

package/dist/statuslist-management-api-server.js

@@ -1,44 +1,42 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatuslistManagementApiServer = void 0;
-const ssi_express_support_1 = require("@sphereon/ssi-express-support");
-const ssi_sdk_core_1 = require("@sphereon/ssi-sdk.core");
-const express_1 = __importDefault(require("express"));
-const api_functions_1 = require("./api-functions");
-class StatuslistManagementApiServer {
+import { copyGlobalAuthToEndpoint } from '@sphereon/ssi-express-support';
+import { agentContext } from '@sphereon/ssi-sdk.core';
+import express from 'express';
+import { createNewStatusListEndpoint, getStatusListCredentialEndpoint, getStatusListCredentialIndexStatusEndpoint, getStatusListCredentialIndexStatusEndpointLegacy, updateStatusEndpoint, } from './api-functions';
+export class StatuslistManagementApiServer {
     get router() {
         return this._router;
     }
+    _express;
+    _agent;
+    _opts;
+    _router;
     constructor(args) {
-        var _a, _b, _c, _d;
         const { agent, opts } = args;
         this._agent = agent;
-        if ((_a = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _a === void 0 ? void 0 : _a.globalAuth) {
-            (0, ssi_express_support_1.copyGlobalAuthToEndpoint)({ opts, key: 'vcApiCredentialStatus' });
-            (0, ssi_express_support_1.copyGlobalAuthToEndpoint)({ opts, key: 'createStatusList' });
-            (0, ssi_express_support_1.copyGlobalAuthToEndpoint)({ opts, key: 'getStatusList' });
+        if (opts?.endpointOpts?.globalAuth) {
+            copyGlobalAuthToEndpoint({ opts, key: 'vcApiCredentialStatus' });
+            copyGlobalAuthToEndpoint({ opts, key: 'createStatusList' });
+            copyGlobalAuthToEndpoint({ opts, key: 'getStatusList' });
         }
         this._opts = opts;
         this._express = args.expressSupport.express;
-        this._router = express_1.default.Router();
-        const context = (0, ssi_sdk_core_1.agentContext)(agent);
-        const features = (_b = opts === null || opts === void 0 ? void 0 : opts.enableFeatures) !== null && _b !== void 0 ? _b : ['status-list-management', 'status-list-hosting', 'w3c-vc-api-credential-status'];
+        this._router = express.Router();
+        const context = agentContext(agent);
+        const features = opts?.enableFeatures ?? ['status-list-management', 'status-list-hosting', 'w3c-vc-api-credential-status'];
         console.log(`Status List API enabled, with features: ${JSON.stringify(features)}`);
         // Credential Status (List) endpoints
         if (features.includes('status-list-management')) {
-            (0, api_functions_1.createNewStatusListEndpoint)(this.router, context, opts.endpointOpts.createStatusList);
+            createNewStatusListEndpoint(this.router, context, opts.endpointOpts.createStatusList);
         }
         if (features.includes('status-list-hosting')) {
-            (0, api_functions_1.getStatusListCredentialEndpoint)(this.router, context, opts.endpointOpts.getStatusList);
-            (0, api_functions_1.getStatusListCredentialIndexStatusEndpoint)(this.router, context, opts.endpointOpts.getStatusList);
+            getStatusListCredentialEndpoint(this.router, context, opts.endpointOpts.getStatusList);
+            getStatusListCredentialIndexStatusEndpoint(this.router, context, opts.endpointOpts.getStatusList);
+            getStatusListCredentialIndexStatusEndpointLegacy(this.router, context, opts.endpointOpts.getStatusList);
         }
         if (features.includes('w3c-vc-api-credential-status')) {
-            (0, api_functions_1.updateW3CStatusEndpoint)(this.router, context, opts.endpointOpts.vcApiCredentialStatus);
+            updateStatusEndpoint(this.router, context, opts.endpointOpts.vcApiCredentialStatus);
         }
-        this._express.use((_d = (_c = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _c === void 0 ? void 0 : _c.basePath) !== null && _d !== void 0 ? _d : '', this.router);
+        this._express.use(opts?.endpointOpts?.basePath ?? '', this.router);
     }
     get agent() {
         return this._agent;
@@ -50,7 +48,6 @@ class StatuslistManagementApiServer {
         return this._express;
     }
 }
-exports.StatuslistManagementApiServer = StatuslistManagementApiServer;
 /*
 function copyGlobalAuthToEndpoint(opts: IStatusListOpts, key: string) {
     if (opts?.endpointOpts?.globalAuth) {

package/dist/statuslist-management-api-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"statuslist-management-api-server.js","sourceRoot":"","sources":["../src/statuslist-management-api-server.ts"],"names":[],"mappings":";;;;;;AAAA,uEAAwF;AACxF,yDAAqD;AAIrD,sDAAkD;AAClD,mDAKwB;AAIxB,MAAa,6BAA6B;IACxC,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAOD,YAAY,IAAoH;;QAC9H,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,0CAAE,UAAU,EAAE,CAAC;YACnC,IAAA,8CAAwB,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAA;YAChE,IAAA,8CAAwB,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,CAAA;YAC3D,IAAA,8CAAwB,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAA;QAC1D,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,OAAO,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;QAE/B,MAAM,OAAO,GAAG,IAAA,2BAAY,EAAC,KAAK,CAAC,CAAA;QAEnC,MAAM,QAAQ,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,mCAAI,CAAC,wBAAwB,EAAE,qBAAqB,EAAE,8BAA8B,CAAC,CAAA;QAC1H,OAAO,CAAC,GAAG,CAAC,2CAA2C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAElF,qCAAqC;QACrC,IAAI,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAChD,IAAA,2CAA2B,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAA;QACvF,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC7C,IAAA,+CAA+B,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;YACtF,IAAA,0DAA0C,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;QACnG,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;YACtD,IAAA,uCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAA;QACxF,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,0CAAE,QAAQ,mCAAI,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;IACpB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AArDD,sEAqDC;AAED;;;;;;;;;;;;EAYE"}
+{"version":3,"file":"statuslist-management-api-server.js","sourceRoot":"","sources":["../src/statuslist-management-api-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAkB,MAAM,+BAA+B,CAAA;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAIrD,OAAO,OAA4B,MAAM,SAAS,CAAA;AAClD,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,EAC/B,0CAA0C,EAC1C,gDAAgD,EAChD,oBAAoB,GACrB,MAAM,iBAAiB,CAAA;AAIxB,MAAM,OAAO,6BAA6B;IACxC,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAEgB,QAAQ,CAAS;IACjB,MAAM,CAA0B;IAChC,KAAK,CAAkB;IACvB,OAAO,CAAQ;IAEhC,YAAY,IAAoH;QAC9H,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;YACnC,wBAAwB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAA;YAChE,wBAAwB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,CAAA;YAC3D,wBAAwB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAA;QAC1D,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;QAE/B,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;QAEnC,MAAM,QAAQ,GAAG,IAAI,EAAE,cAAc,IAAI,CAAC,wBAAwB,EAAE,qBAAqB,EAAE,8BAA8B,CAAC,CAAA;QAC1H,OAAO,CAAC,GAAG,CAAC,2CAA2C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAElF,qCAAqC;QACrC,IAAI,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAChD,2BAA2B,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAA;QACvF,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC7C,+BAA+B,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;YACtF,0CAA0C,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;YACjG,gDAAgD,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;QACzG,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;YACtD,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAA;QACrF,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,IAAI,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;IACpB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AAED;;;;;;;;;;;;EAYE"}

package/dist/types.d.ts

@@ -24,8 +24,13 @@ export interface IW3CredentialStatusEndpointOpts extends ICredentialStatusListEn
     correlationId?: string;
     keyRef?: string;
 }
-export interface UpdateCredentialStatusRequest {
+export interface UpdateW3cCredentialStatusRequest extends UpdateCredentialStatusRequest {
     credentialId: string;
+}
+export interface UpdateIndexedCredentialStatusRequest extends UpdateCredentialStatusRequest {
+    statusListIndex?: number;
+}
+interface UpdateCredentialStatusRequest {
     credentialStatus: UpdateCredentialStatusItem[];
     statusListId?: string;
     statusListCorrelationId?: string;
@@ -35,4 +40,13 @@ export interface UpdateCredentialStatusItem {
     type?: StatusListType;
     status: string;
 }
+export declare enum StatusListIdType {
+    StatusListId = "StatusListId",
+    StatusListCorrelationId = "StatusListCorrelationId"
+}
+export declare enum EntryIdType {
+    StatusListIndex = "StatusListIndex",
+    EntryCorrelationId = "StatusListCorrelationId"
+}
+export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,CAAA;AAElF,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,uBAAuB,CAAA;IACrC,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACtC;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B,qBAAqB,EAAE,+BAA+B,CAAA;IACtD,gBAAgB,EAAE,iCAAiC,CAAA;IACnD,aAAa,EAAE,iCAAiC,CAAA;CACjD;AAED,MAAM,MAAM,kBAAkB,GAAG,8BAA8B,GAAG,wBAAwB,GAAG,qBAAqB,CAAA;AAElH,MAAM,WAAW,iCAAkC,SAAQ,mBAAmB;IAC5E,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,+BAAgC,SAAQ,iCAAiC;IACxF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,6BAA6B;IAC5C,YAAY,EAAE,MAAM,CAAA;IACpB,gBAAgB,EAAE,0BAA0B,EAAE,CAAA;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,CAAA;AAElF,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,uBAAuB,CAAA;IACrC,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACtC;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B,qBAAqB,EAAE,+BAA+B,CAAA;IACtD,gBAAgB,EAAE,iCAAiC,CAAA;IACnD,aAAa,EAAE,iCAAiC,CAAA;CACjD;AAED,MAAM,MAAM,kBAAkB,GAAG,8BAA8B,GAAG,wBAAwB,GAAG,qBAAqB,CAAA;AAElH,MAAM,WAAW,iCAAkC,SAAQ,mBAAmB;IAC5E,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,+BAAgC,SAAQ,iCAAiC;IACxF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gCAAiC,SAAQ,6BAA6B;IACrF,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,oCAAqC,SAAQ,6BAA6B;IACzF,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,UAAU,6BAA6B;IACrC,gBAAgB,EAAE,0BAA0B,EAAE,CAAA;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,oBAAY,gBAAgB;IAC1B,YAAY,iBAAiB;IAC7B,uBAAuB,4BAA4B;CACpD;AAED,oBAAY,WAAW;IACrB,eAAe,oBAAoB;IACnC,kBAAkB,4BAA4B;CAC/C"}

package/dist/types.js

@@ -1,3 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export var StatusListIdType;
+(function (StatusListIdType) {
+    StatusListIdType["StatusListId"] = "StatusListId";
+    StatusListIdType["StatusListCorrelationId"] = "StatusListCorrelationId";
+})(StatusListIdType || (StatusListIdType = {}));
+export var EntryIdType;
+(function (EntryIdType) {
+    EntryIdType["StatusListIndex"] = "StatusListIndex";
+    EntryIdType["EntryCorrelationId"] = "StatusListCorrelationId";
+})(EntryIdType || (EntryIdType = {}));
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAqDA,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iDAA6B,CAAA;IAC7B,uEAAmD,CAAA;AACrD,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,CAAN,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,kDAAmC,CAAA;IACnC,6DAA8C,CAAA;AAChD,CAAC,EAHW,WAAW,KAAX,WAAW,QAGtB"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.vc-status-list-issuer-rest-api",
   "description": "Sphereon SSI-SDK plugin for Status List management, like StatusList2021. Issuer drivers module",
-  "version": "0.32.1-next.54+3b988a2b",
+  "version": "0.33.1-feature.vcdm2.4+9f634bdb",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,30 +12,31 @@
     "start:dev2": "node --experimental-specifier-resolution=node --loader ts-node/esm  __tests__/agent.ts"
   },
   "dependencies": {
-    "@sphereon/ssi-express-support": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
-    "@sphereon/ssi-sdk.core": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.data-store": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.vc-status-list": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.vc-status-list-issuer-drivers": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-types": "0.32.1-next.54+3b988a2b",
+    "@sphereon/ssi-express-support": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.28.0",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.28.0",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.28.0",
+    "@sphereon/ssi-sdk.core": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.data-store": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.vc-status-list": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.vc-status-list-issuer-drivers": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-types": "0.33.1-feature.vcdm2.4+9f634bdb",
     "@sphereon/vc-status-list": "7.0.0-next.0",
     "@veramo/core": "4.2.0",
     "debug": "^4.3.5",
     "express": "^4.19.2",
-    "reflect-metadata": "^0.1.14",
-    "typeorm": "^0.3.20",
+    "reflect-metadata": "0.2.2",
+    "typeorm": "^0.3.21",
     "uint8arrays": "^3.1.1",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@sphereon/did-uni-client": "^0.6.3",
-    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.27.0",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.0",
-    "@sphereon/ssi-sdk.agent-config": "0.32.1-next.54+3b988a2b",
+    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.28.0",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.28.0",
+    "@sphereon/ssi-sdk.agent-config": "0.33.1-feature.vcdm2.4+9f634bdb",
     "@sphereon/ssi-sdk.data-store": "workspace:*",
-    "@sphereon/ssi-sdk.vc-handler-ld-local": "0.32.1-next.54+3b988a2b",
+    "@sphereon/ssi-sdk.vc-handler-ld-local": "0.33.1-feature.vcdm2.4+9f634bdb",
     "@types/body-parser": "^1.19.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
@@ -79,5 +80,5 @@
     "StatusList2021"
   ],
   "nx": {},
-  "gitHead": "3b988a2bb62a7c4534a2670ea3a0985fd93d00f2"
+  "gitHead": "9f634bdb714061141e277508c124b08d626f6036"
 }

package/src/api-functions.ts

@@ -2,15 +2,55 @@ import { checkAuth, sendErrorResponse } from '@sphereon/ssi-express-support'
 import {
   checkStatusIndexFromStatusListCredential,
   CreateNewStatusListFuncArgs,
+  StatusListResult,
   updateStatusIndexFromStatusListCredential,
 } from '@sphereon/ssi-sdk.vc-status-list'
 import { getDriver } from '@sphereon/ssi-sdk.vc-status-list-issuer-drivers'
 import Debug from 'debug'
 import { Request, Response, Router } from 'express'
-import { ICredentialStatusListEndpointOpts, IRequiredContext, IW3CredentialStatusEndpointOpts, UpdateCredentialStatusRequest } from './types'
+import {
+  EntryIdType,
+  ICredentialStatusListEndpointOpts,
+  IRequiredContext,
+  IW3CredentialStatusEndpointOpts,
+  StatusListIdType,
+  UpdateIndexedCredentialStatusRequest,
+  UpdateW3cCredentialStatusRequest,
+} from './types'
+import { StatusListCredential, StatusListType } from '@sphereon/ssi-types'
+import { IStatusListEntryEntity } from '@sphereon/ssi-sdk.data-store'
 
 const debug = Debug('sphereon:ssi-sdk:status-list')
 
+function sendStatuslistResponse(details: StatusListResult, statuslistPayload: StatusListCredential, response: Response) {
+  let payload: Buffer | StatusListCredential
+
+  switch (details.proofFormat) {
+    case 'jwt':
+    case 'cbor':
+      payload = Buffer.from(statuslistPayload as string, 'ascii')
+      break
+    default:
+      payload = statuslistPayload
+  }
+
+  return response.status(200).setHeader('Content-Type', details.statuslistContentType).send(payload)
+}
+
+function buildStatusListId(request: Request): string {
+  const protocol = request.headers['x-forwarded-proto']?.toString() ?? request.protocol
+  let host = request.headers['x-forwarded-host']?.toString() ?? request.get('host')
+  const forwardedPort = request.headers['x-forwarded-port']?.toString()
+
+  if (forwardedPort && !(protocol === 'https' && forwardedPort === '443') && !(protocol === 'http' && forwardedPort === '80')) {
+    host += `:${forwardedPort}`
+  }
+
+  const forwardedPrefix = request.headers['x-forwarded-prefix']?.toString() ?? ''
+
+  return `${protocol}://${host}${forwardedPrefix}${request.originalUrl.split('?')[0].replace(/\/status\/index\/.*/, '')}`
+}
+
 export function createNewStatusListEndpoint(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts) {
   if (opts?.enabled === false) {
     console.log(`Create new status list endpoint is disabled`)
@@ -24,26 +64,15 @@ export function createNewStatusListEndpoint(router: Router, context: IRequiredCo
       if (!statusListArgs) {
         return sendErrorResponse(response, 400, 'No statusList details supplied')
       }
-      const statusListDetails = await context.agent.slCreateStatusList(statusListArgs)
-      return response.send({ statusListDetails })
+      const details = await context.agent.slCreateStatusList(statusListArgs)
+      const statuslistPayload = details.statusListCredential
+      return sendStatuslistResponse(details, statuslistPayload, response)
     } catch (e) {
-      return sendErrorResponse(response, 500, e.message as string, e)
+      return sendErrorResponse(response, 500, (e as Error).message, e)
     }
   })
 }
 
-const buildStatusListId = (request: Request): string => {
-  const protocol = request.headers['x-forwarded-proto']?.toString() ?? request.protocol
-  let host = request.headers['x-forwarded-host']?.toString() ?? request.get('host')
-  const forwardedPort = request.headers['x-forwarded-port']?.toString()
-
-  if (forwardedPort && !(protocol === 'https' && forwardedPort === '443') && !(protocol === 'http' && forwardedPort === '80')) {
-    host += `:${forwardedPort}`
-  }
-
-  return `${protocol}://${host}${request.originalUrl}`
-}
-
 export function getStatusListCredentialEndpoint(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts) {
   if (opts?.enabled === false) {
     console.log(`Get statusList credential endpoint is disabled`)
@@ -53,13 +82,17 @@ export function getStatusListCredentialEndpoint(router: Router, context: IRequir
   router.get(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
       //todo: Check index against correlationId first. Then match originalUrl against statusList id
-      const correlationId = request.query.correlationId?.toString() ?? request.params.index?.toString() ?? request.originalUrl
-      const driver = await getDriver({ id: buildStatusListId(request), correlationId, dbName: opts.dbName })
+      //const correlationId = request.query.correlationId?.toString() ?? request.params.index?.toString() ?? request.originalUrl TODO I so not get these
+      const correlationId = request.query.correlationId?.toString()
+      const driver = await getDriver({
+        ...(correlationId ? { correlationId } : { id: buildStatusListId(request) }),
+        dbName: opts.dbName,
+      })
       const details = await driver.getStatusList()
-      response.statusCode = 200
-      return response.send(details.statusListCredential)
+      const statuslistPayload = details.statusListCredential
+      return sendStatuslistResponse(details, statuslistPayload, response)
     } catch (e) {
-      return sendErrorResponse(response, 500, e.message as string, e)
+      return sendErrorResponse(response, 500, (e as Error).message, e)
     }
   })
 }
@@ -69,6 +102,84 @@ export function getStatusListCredentialIndexStatusEndpoint(router: Router, conte
     console.log(`Get statusList credential index status endpoint is disabled`)
     return
   }
+
+  const path = opts?.path ?? '/status-lists/:statusListId/status/entry-by-id/:entryId'
+  router.get(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
+    try {
+      const statusListIdType = (request.query.statusListIdType as StatusListIdType) ?? StatusListIdType.StatusListId
+      const entryIdType = (request.query.entryIdType as EntryIdType) ?? EntryIdType.StatusListIndex
+
+      let statusListIndex: number | undefined
+      let entityCorrelationId: string | undefined
+      let statusListId: string | undefined
+      let statusListCorrelationId: string | undefined
+
+      if (entryIdType === EntryIdType.StatusListIndex) {
+        try {
+          statusListIndex = Number.parseInt(request.params.entryId)
+          if (!statusListIndex || statusListIndex < 0) {
+            return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`)
+          }
+        } catch (error) {
+          return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`)
+        }
+      } else {
+        entityCorrelationId = request.params.entryId
+      }
+
+      if (statusListIdType === StatusListIdType.StatusListId) {
+        statusListId = request.params.statusListId
+      } else {
+        statusListCorrelationId = request.params.statusListId
+      }
+
+      const driver = await getDriver({
+        ...(statusListCorrelationId ? { correlationId: statusListCorrelationId } : { id: statusListId }),
+        dbName: opts.dbName,
+      })
+
+      const details = await driver.getStatusList()
+      if (statusListIndex && statusListIndex > details.length) {
+        return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`)
+      }
+
+      let entry = await driver.getStatusListEntryByIndex({
+        statusListId: details.id,
+        ...(entityCorrelationId ? { correlationId: entityCorrelationId } : { statusListIndex }),
+        errorOnNotFound: false,
+      })
+
+      const type = details.type === StatusListType.StatusList2021 ? 'StatusList2021Entry' : details.type
+      const resultStatusIndex = entry?.statusListIndex ?? statusListIndex ?? 0
+      const status = await checkStatusIndexFromStatusListCredential({
+        statusListCredential: details.statusListCredential,
+        ...(details.type === StatusListType.StatusList2021 ? { statusPurpose: details.statusList2021?.statusPurpose } : {}),
+        type,
+        id: details.id,
+        statusListIndex: resultStatusIndex,
+      })
+
+      if (!entry) {
+        entry = {
+          statusListId: details.id,
+          value: '0',
+          statusListIndex: resultStatusIndex,
+        }
+      }
+
+      response.statusCode = 200
+      return response.json({ ...entry, status })
+    } catch (e) {
+      return sendErrorResponse(response, 500, (e as Error).message, e)
+    }
+  })
+}
+
+export function getStatusListCredentialIndexStatusEndpointLegacy(router: Router, context: IRequiredContext, opts: ICredentialStatusListEndpointOpts) {
+  if (opts?.enabled === false) {
+    console.log(`Get statusList credential index status endpoint is disabled`)
+    return
+  }
   const path = opts?.path ?? '/status-lists/:index/status/index/:statusListIndex'
   router.get(path, checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
@@ -83,10 +194,10 @@ export function getStatusListCredentialIndexStatusEndpoint(router: Router, conte
       if (!statusListIndex || statusListIndex < 0) {
         return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`)
       }
-      const correlationId = request.query.correlationId?.toString() ?? request.params.index?.toString() ?? request.originalUrl
+      //const correlationId = request.query.correlationId?.toString() ?? request.params.index?.toString() ?? request.originalUrl TODO I so not get these
+      const statusListCorrelationId = request.query.correlationId?.toString()
       const driver = await getDriver({
-        id: `${request.protocol}://${request.get('host')}${request.originalUrl.replace(/\/status\/index\/.*/, '')}`,
-        correlationId,
+        ...(statusListCorrelationId ? { correlationId: statusListCorrelationId } : { id: buildStatusListId(request) }),
         dbName: opts.dbName,
       })
       const details = await driver.getStatusList()
@@ -94,29 +205,37 @@ export function getStatusListCredentialIndexStatusEndpoint(router: Router, conte
         return sendErrorResponse(response, 400, `Please provide a proper statusListIndex`)
       }
 
+      const entityCorrelationId = request.query.entityCorrelationId?.toString()
       let entry = await driver.getStatusListEntryByIndex({
-        statusListIndex,
         statusListId: details.id,
-        correlationId: details.correlationId,
+        ...(entityCorrelationId ? { correlationId: entityCorrelationId } : { statusListIndex: statusListIndex }),
         errorOnNotFound: false,
       })
-      const status = await checkStatusIndexFromStatusListCredential({ ...details, statusListIndex })
+      const type = details.type === StatusListType.StatusList2021 ? 'StatusList2021Entry' : details.type
+      const status = await checkStatusIndexFromStatusListCredential({
+        statusListCredential: details.statusListCredential,
+        ...(details.type === StatusListType.StatusList2021 ? { statusPurpose: details.statusList2021?.statusPurpose } : {}),
+        type,
+        id: details.id,
+        statusListIndex,
+      })
       if (!entry) {
         // The fact we have nothing on it means the status is okay
         entry = {
-          statusList: details.id,
+          statusListId: details.id,
           value: '0',
           statusListIndex,
         }
       }
       response.statusCode = 200
-      return response.send({ ...entry, status })
+      return response.json({ ...entry, status })
     } catch (e) {
-      return sendErrorResponse(response, 500, e.message as string, e)
+      return sendErrorResponse(response, 500, (e as Error).message, e)
     }
   })
 }
-export function updateW3CStatusEndpoint(router: Router, context: IRequiredContext, opts: IW3CredentialStatusEndpointOpts) {
+
+export function updateStatusEndpoint(router: Router, context: IRequiredContext, opts: IW3CredentialStatusEndpointOpts) {
   if (opts?.enabled === false) {
     console.log(`Update credential status endpoint is disabled`)
     return
@@ -124,65 +243,92 @@ export function updateW3CStatusEndpoint(router: Router, context: IRequiredContex
   router.post(opts?.path ?? '/credentials/status', checkAuth(opts?.endpoint), async (request: Request, response: Response) => {
     try {
       debug(JSON.stringify(request.body, null, 2))
-      const updateRequest = request.body as UpdateCredentialStatusRequest
-      const statusListId = updateRequest.statusListId ?? request.query.statusListId?.toString() ?? opts.statusListId
-      const statusListCorrelationId = updateRequest.statusListCorrelationId ?? request.query.statusListorrelationId?.toString() ?? opts.correlationId
+      const updateRequest = request.body as UpdateW3cCredentialStatusRequest | UpdateIndexedCredentialStatusRequest
+      const statusListId = updateRequest.statusListId ?? request.query.statusListId?.toString() ?? opts.statusListId // TODO why query params when we have a JSON body ??
+      const statusListCorrelationId = updateRequest.statusListCorrelationId ?? request.query.statusListrelationId?.toString() ?? opts.correlationId
       const entryCorrelationId = updateRequest.entryCorrelationId ?? request.query.entryCorrelationId?.toString()
-      const credentialId = updateRequest.credentialId
 
       // TODO: Move mostly to driver
-      if (!credentialId) {
-        return sendErrorResponse(response, 400, 'No statusList credentialId supplied')
+      if (!statusListId && !statusListCorrelationId) {
+        return sendErrorResponse(response, 400, 'No statusList id or correlation Id provided or deduced for the API or in the request')
       } else if (!updateRequest.credentialStatus || updateRequest.credentialStatus.length === 0) {
         return sendErrorResponse(response, 400, 'No statusList updates supplied')
-      } else if (!statusListId && !statusListCorrelationId) {
-        return sendErrorResponse(response, 400, 'No statusList id or correlation Id provided or deduced for the API or in the request')
       }
-      const driver = await getDriver({ id: statusListId, correlationId: statusListCorrelationId, dbName: opts.dbName })
-      // unfortunately the W3C API works by credentialId. Which means you will have to map listIndices during issuance
-      const statusListEntry = await driver.getStatusListEntryByCredentialId({
-        statusListId,
-        statusListCorrelationId,
-        entryCorrelationId,
-        credentialId,
-        errorOnNotFound: true,
+      const driver = await getDriver({
+        ...(statusListCorrelationId ? { correlationId: statusListCorrelationId } : { id: buildStatusListId(request) }),
+        dbName: opts.dbName,
       })
+      let statusListResult: StatusListResult = await driver.getStatusList()
+
+      // Get status list entry based on request type
+      let statusListEntry: IStatusListEntryEntity | undefined
+      if ('credentialId' in updateRequest) {
+        if (!updateRequest.credentialId) {
+          return sendErrorResponse(response, 400, 'No credentialId supplied')
+        }
+        // unfortunately the W3C API works by credentialId. Which means you will have to map listIndices during issuance
+        statusListEntry = await driver.getStatusListEntryByCredentialId({
+          statusListId,
+          statusListCorrelationId,
+          entryCorrelationId,
+          credentialId: updateRequest.credentialId,
+          errorOnNotFound: true,
+        })
+      } else {
+        statusListEntry = await driver.getStatusListEntryByIndex({
+          ...(statusListResult.id && { statusListId: statusListResult.id }),
+          ...(statusListResult.correlationId && { statusListCorrelationId: statusListResult.correlationId }),
+          ...(entryCorrelationId ? { entryCorrelationId } : { statusListIndex: updateRequest.statusListIndex }),
+          errorOnNotFound: true,
+        })
+      }
+
       if (!statusListEntry) {
-        return sendErrorResponse(
-          response,
-          404,
-          `status list index for credential id ${credentialId} was never recorded for ${statusListId}. This means the status will be 0`,
-        )
+        const identifier = 'credentialId' in updateRequest ? updateRequest.credentialId : `index ${updateRequest.statusListIndex}`
+        return sendErrorResponse(response, 404, `Status list entry for ${identifier} not found for ${statusListId}`)
       }
-      const statusListIndex = statusListEntry.statusListIndex
-      let details = await driver.getStatusList()
-      let statusListCredential = details.statusListCredential
 
+      let statusListCredential = statusListResult.statusListCredential
       for (const updateItem of updateRequest.credentialStatus) {
-        if (updateItem.type && updateItem.type !== 'StatusList2021') {
-          return sendErrorResponse(response, 400, `Only the optional type 'StatusList2021' is currently supported`)
+        if (!updateItem.status) {
+          return sendErrorResponse(response, 400, `Required 'status' value was missing in the credentialStatus array`)
         }
 
-        if (!updateItem.status) {
-          return sendErrorResponse(
-            response,
-            400,
-            `Required 'status' value was missing in the credentialStatus array for credentialId ${credentialId}`,
-          )
+        let value: string = '1'
+        if (updateItem.status === '0' || updateItem.status.toLowerCase() === 'false') {
+          value = '0'
+        } else if (updateItem.status !== '1' && updateItem.status.toLowerCase() !== 'true') {
+          if (updateItem.type === StatusListType.StatusList2021) {
+            // 2021 only allows 0 and 1
+            return sendErrorResponse(response, 400, `Invalid 'status' value in the credentialStatus array: ${updateItem.status}`)
+          } else if (parseInt(updateItem.status) < 0 || parseInt(updateItem.status) > 255) {
+            return sendErrorResponse(response, 400, `Invalid 'status' value in the credentialStatus array: ${updateItem.status}`)
+          }
+          value = `${parseInt(updateItem.status)}`
+        }
+
+        const updStatusListId = statusListId ?? statusListEntry.statusList?.id // When input was statusListCorrelationId the statusList id should come from statusListEntry
+        if (!updStatusListId) {
+          return sendErrorResponse(response, 400, 'statuslist id could not be determined')
         }
-        const value = updateItem.status === '0' || updateItem.status.toLowerCase() === 'false' ? false : true
-        const statusList = statusListId ?? statusListEntry.statusList
-        await driver.updateStatusListEntry({ ...statusListEntry, statusListIndex, statusList, credentialId, value: value ? '1' : '0' })
+        await driver.updateStatusListEntry({ ...statusListEntry, statusListId: updStatusListId, value })
 
         // todo: optimize. We are now creating a new VC for every item passed in. Probably wise to look at DB as well
-        details = await updateStatusIndexFromStatusListCredential({ statusListCredential, statusListIndex, value, keyRef: opts.keyRef }, context)
-        details = await driver.updateStatusList({ statusListCredential: details.statusListCredential })
+        statusListResult = await updateStatusIndexFromStatusListCredential(
+          {
+            statusListCredential: statusListCredential,
+            statusListIndex: statusListEntry.statusListIndex,
+            value: parseInt(value),
+            keyRef: opts.keyRef,
+          },
+          context,
+        )
+        statusListResult = await driver.updateStatusList({ statusListCredential: statusListResult.statusListCredential })
       }
 
-      response.statusCode = 200
-      return response.send(details.statusListCredential)
+      return sendStatuslistResponse(statusListResult, statusListResult.statusListCredential, response)
     } catch (e) {
-      return sendErrorResponse(response, 500, e.message as string, e)
+      return sendErrorResponse(response, 500, (e as Error).message, e)
     }
   })
 }

package/src/statuslist-management-api-server.ts

@@ -8,7 +8,8 @@ import {
   createNewStatusListEndpoint,
   getStatusListCredentialEndpoint,
   getStatusListCredentialIndexStatusEndpoint,
-  updateW3CStatusEndpoint,
+  getStatusListCredentialIndexStatusEndpointLegacy,
+  updateStatusEndpoint,
 } from './api-functions'
 import { IStatusListOpts } from './types'
 import { IRequiredPlugins } from '@sphereon/ssi-sdk.vc-status-list-issuer-drivers'
@@ -48,9 +49,10 @@ export class StatuslistManagementApiServer {
     if (features.includes('status-list-hosting')) {
       getStatusListCredentialEndpoint(this.router, context, opts.endpointOpts.getStatusList)
       getStatusListCredentialIndexStatusEndpoint(this.router, context, opts.endpointOpts.getStatusList)
+      getStatusListCredentialIndexStatusEndpointLegacy(this.router, context, opts.endpointOpts.getStatusList)
     }
     if (features.includes('w3c-vc-api-credential-status')) {
-      updateW3CStatusEndpoint(this.router, context, opts.endpointOpts.vcApiCredentialStatus)
+      updateStatusEndpoint(this.router, context, opts.endpointOpts.vcApiCredentialStatus)
     }
     this._express.use(opts?.endpointOpts?.basePath ?? '', this.router)
   }

package/src/types.ts

@@ -31,8 +31,15 @@ export interface IW3CredentialStatusEndpointOpts extends ICredentialStatusListEn
   keyRef?: string
 }
 
-export interface UpdateCredentialStatusRequest {
+export interface UpdateW3cCredentialStatusRequest extends UpdateCredentialStatusRequest {
   credentialId: string
+}
+
+export interface UpdateIndexedCredentialStatusRequest extends UpdateCredentialStatusRequest {
+  statusListIndex?: number
+}
+
+interface UpdateCredentialStatusRequest {
   credentialStatus: UpdateCredentialStatusItem[]
   statusListId?: string // Non spec compliant. Allows us to manage multiple status lists. The VC API endpoint also has this config option, allowing for a default
   statusListCorrelationId?: string // Non spec compliant. Allows us to manage multiple status lists. The VC API endpoint also has this config option, allowing for a default
@@ -43,3 +50,13 @@ export interface UpdateCredentialStatusItem {
   type?: StatusListType // makes very little sense, but listed in the spec. Would expect a purpose
   status: string
 }
+
+export enum StatusListIdType {
+  StatusListId = 'StatusListId',
+  StatusListCorrelationId = 'StatusListCorrelationId',
+}
+
+export enum EntryIdType {
+  StatusListIndex = 'StatusListIndex',
+  EntryCorrelationId = 'StatusListCorrelationId',
+}