From f305eaa1648b80d6c458219690d08fe460282aeb Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 07:49:28 -0500 Subject: [PATCH 01/72] setup minimal express --- .gitignore | 1 + package-lock.json | 827 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 23 ++ server.js | 30 ++ src/app.js | 30 ++ 5 files changed, 911 insertions(+) create mode 100644 .gitignore create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 server.js create mode 100644 src/app.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..7d13596 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,827 @@ +{ + "name": "@digitalcredentials/cred-store", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@digitalcredentials/cred-store", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "express": "^5.2.1" + } + }, + "node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "license": "MIT", + "dependencies": { + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/body-parser": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", + "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.3", + "http-errors": "^2.0.0", + "iconv-lite": "^0.7.0", + "on-finished": "^2.4.1", + "qs": "^6.14.1", + "raw-body": "^3.0.1", + "type-is": "^2.0.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/content-disposition": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", + "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", + "license": "MIT", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.1", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "depd": "^2.0.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/finalhandler": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", + "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/iconv-lite": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "license": "MIT" + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/merge-descriptors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", + "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.3", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.1", + "mime-types": "^3.0.2", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/serve-static": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", + "license": "MIT", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "license": "MIT", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..20be148 --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "name": "@digitalcredentials/cred-store", + "version": "1.0.0", + "description": "Relational implementation of a storage/log service for Verifiable Credentials", + "main": "app.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node -r dotenv/config server.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/digitalcredentials/cred-store.git" + }, + "author": "James Chartrand", + "license": "ISC", + "bugs": { + "url": "https://github.com/digitalcredentials/cred-store/issues" + }, + "homepage": "https://github.com/digitalcredentials/cred-store#readme", + "dependencies": { + "express": "^5.2.1" + } +} diff --git a/server.js b/server.js new file mode 100644 index 0000000..471e4ac --- /dev/null +++ b/server.js @@ -0,0 +1,30 @@ +import { build } from './src/app.js' +import { getConfig, setConfig } from './src/config.js' +import https from 'https' +import http from 'http' +import fs from 'fs' + +const run = async () => { + await setConfig() + const { port, enableHttpsForDev } = getConfig() + + const app = await build() + + if (enableHttpsForDev) { + https + .createServer( + { + key: fs.readFileSync('server-dev-only.key'), + cert: fs.readFileSync('server-dev-only.cert') + }, + app + ) + .listen(port, () => console.log(`Server running on port ${port}`)) + } else { + http + .createServer(app) + .listen(port, () => console.log(`Server running on port ${port}`)) + } +} + +run() \ No newline at end of file diff --git a/src/app.js b/src/app.js new file mode 100644 index 0000000..3f31c0c --- /dev/null +++ b/src/app.js @@ -0,0 +1,30 @@ +import express from 'express' +import cors from 'cors' + +export async function build() { + var app = express() + + app.use(express.json()) + app.use(express.urlencoded({ extended: false })) + app.use(cors()) + + app.get('/healthz', async function (req, res) { + try { + + + } catch (e) { + console.log(`exception in healthz: ${JSON.stringify(e)}`) + return res.status(503).json({ + error: `cred-store healthz check failed with error: ${e}`, + healthy: false + }) + } + res.send({ message: 'cred-store server status: ok.', healthy: true }) + }) + + app.get('/', function (req, res) { + res.send({ message: 'cred-store server status: ok.' }) + }) + + return app +} \ No newline at end of file From 3406829f9433120ecfeefc8bc14bcf9d5af638ca Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 17:50:13 -0500 Subject: [PATCH 02/72] add sample database creation script --- setup.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 setup.sql diff --git a/setup.sql b/setup.sql new file mode 100644 index 0000000..8f4fcac --- /dev/null +++ b/setup.sql @@ -0,0 +1,5 @@ +CREATE USER 'creduser'@'localhost' IDENTIFIED BY 'creduser'; +GRANT ALL PRIVILEGES ON *.* TO 'creduser'@'localhost'; +FLUSH PRIVILEGES; + +SHOW GRANTS FOR 'creduser'@'localhost'; \ No newline at end of file From 1aa896c0d84d63985f5271ec0767be605fe15999 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 17:50:29 -0500 Subject: [PATCH 03/72] add db pool --- src/pool.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/pool.js diff --git a/src/pool.js b/src/pool.js new file mode 100644 index 0000000..49b2183 --- /dev/null +++ b/src/pool.js @@ -0,0 +1,12 @@ +import mariadb from 'mariadb'; +const pool = mariadb.createPool({ + host: 'localhost', // Or your DB host + user: 'creduser', + password: 'creduser', + connectionLimit: 5, + database: 'credentials' +}); + +export default pool; + +// pool.end(); // Close the pool when done \ No newline at end of file From 504031da75cce26e23633e05a12192023eb30de5 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 17:50:53 -0500 Subject: [PATCH 04/72] add seed script --- src/seed.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 src/seed.js diff --git a/src/seed.js b/src/seed.js new file mode 100644 index 0000000..c2d0354 --- /dev/null +++ b/src/seed.js @@ -0,0 +1,71 @@ +import mariadb from 'mariadb'; +import pool from './pool.js' + +// Define connection parameters without specifying a 'database' +const connectionConfig = { + host: 'localhost', + port: 3306, // Default MariaDB port + user: 'creduser', // User with CREATE privileges (e.g., 'root') + password: 'creduser', + connectionLimit: 1 // A simple connection is enough for this task +}; + +export async function createDatabase(dbName) { + let conn; + try { + // Establish a connection to the server (not a specific database) + conn = await mariadb.createConnection(connectionConfig); + console.log("Connected to MariaDB server."); + + // Execute the CREATE DATABASE query + const dbQuery = `CREATE DATABASE IF NOT EXISTS credentials`; + await conn.query(dbQuery); + console.log(`Database credentials created.`); + + } catch (err) { + console.error("Error creating database:", err); + } finally { + // Close the connection + if (conn) { + await conn.end(); + console.log("Connection closed."); + } + } +} + +// Call the function to create your new database +//createDatabase(); + +export async function seedDatabase() { + let conn; + try { + conn = await pool.getConnection(); + console.log('Connected to database for seeding...'); + + // --- Create Tables (if not already done) --- + await conn.query(` + CREATE TABLE IF NOT EXISTS credentials ( + id INT AUTO_INCREMENT PRIMARY KEY, + cred_name VARCHAR(100) NOT NULL, + holder VARCHAR(100) NOT NULL, + email VARCHAR(100) UNIQUE + ); + `); + + // --- Insert Seed Data --- + await conn.query("INSERT INTO credentials (cred_name, holder, email) VALUES (?, ?, ?)", ["Badge of Honour", "Alice Allright", "alice@example.com"]); + await conn.query("INSERT INTO credentials (cred_name, holder, email) VALUES (?, ?, ?)", ["Deputy of Doubt", "Bob Best", "bob@example.com"]); + console.log('Credentials seeded successfully!'); + + } catch (err) { + console.error('Error during database seeding:', err); + } finally { + if (conn) { + conn.release(); // Release the connection back to the pool + console.log('Connection released.'); + } + // pool.end(); // Close the pool when done + } +} + +//seedDatabase(); \ No newline at end of file From 6525cc7a94041ea2931708c2b580fbc9894f37db Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 17:51:09 -0500 Subject: [PATCH 05/72] add libs --- package-lock.json | 458 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 11 +- 2 files changed, 466 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7d13596..936b7eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,28 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "express": "^5.2.1" + "cors": "^2.8.6", + "dotenv": "^17.2.3", + "express": "^5.2.1", + "mariadb": "^3.4.5" + }, + "devDependencies": { + "nodemon": "^3.1.11" + } + }, + "node_modules/@types/geojson": { + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "24.10.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.9.tgz", + "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==", + "license": "MIT", + "dependencies": { + "undici-types": "~7.16.0" } }, "node_modules/accepts": { @@ -25,6 +46,40 @@ "node": ">= 0.6" } }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/body-parser": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", @@ -49,6 +104,30 @@ "url": "https://opencollective.com/express" } }, + "node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -87,6 +166,38 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, "node_modules/content-disposition": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", @@ -127,6 +238,23 @@ "node": ">=6.6.0" } }, + "node_modules/cors": { + "version": "2.8.6", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz", + "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -144,6 +272,15 @@ } } }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.10" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -153,6 +290,18 @@ "node": ">= 0.8" } }, + "node_modules/dotenv": { + "version": "17.2.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", + "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -270,6 +419,19 @@ "url": "https://opencollective.com/express" } }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/finalhandler": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", @@ -309,6 +471,21 @@ "node": ">= 0.8" } }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -355,6 +532,19 @@ "node": ">= 0.4" } }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", @@ -367,6 +557,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", @@ -427,6 +627,13 @@ "url": "https://opencollective.com/express" } }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true, + "license": "ISC" + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -442,12 +649,92 @@ "node": ">= 0.10" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-promise": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "license": "MIT" }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/mariadb": { + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.5.tgz", + "integrity": "sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==", + "license": "LGPL-2.1-or-later", + "dependencies": { + "@types/geojson": "^7946.0.16", + "@types/node": "^24.0.13", + "denque": "^2.1.0", + "iconv-lite": "^0.6.3", + "lru-cache": "^10.4.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/mariadb/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -503,6 +790,19 @@ "url": "https://opencollective.com/express" } }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -518,6 +818,54 @@ "node": ">= 0.6" } }, + "node_modules/nodemon": { + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz", + "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -570,6 +918,19 @@ "url": "https://opencollective.com/express" } }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -583,6 +944,13 @@ "node": ">= 0.10" } }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true, + "license": "MIT" + }, "node_modules/qs": { "version": "6.14.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", @@ -622,6 +990,19 @@ "node": ">= 0.10" } }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/router": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", @@ -644,6 +1025,19 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, + "node_modules/semver": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/send": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", @@ -767,6 +1161,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/statuses": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", @@ -776,6 +1183,32 @@ "node": ">= 0.8" } }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -785,6 +1218,16 @@ "node": ">=0.6" } }, + "node_modules/touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true, + "license": "ISC", + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, "node_modules/type-is": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", @@ -799,6 +1242,19 @@ "node": ">= 0.6" } }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true, + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "license": "MIT" + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index 20be148..cc91137 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "main": "app.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start": "node -r dotenv/config server.js" + "start": "node -r dotenv/config server.js", + "dev": "nodemon -r dotenv/config server.js" }, "repository": { "type": "git", @@ -18,6 +19,12 @@ }, "homepage": "https://github.com/digitalcredentials/cred-store#readme", "dependencies": { - "express": "^5.2.1" + "cors": "^2.8.6", + "dotenv": "^17.2.3", + "express": "^5.2.1", + "mariadb": "^3.4.5" + }, + "devDependencies": { + "nodemon": "^3.1.11" } } From 4869a689f3d76d6a3a5c032bae6b1e119d60c14b Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 17:51:53 -0500 Subject: [PATCH 06/72] fix server start script --- server.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 471e4ac..bae7779 100644 --- a/server.js +++ b/server.js @@ -1,12 +1,11 @@ import { build } from './src/app.js' -import { getConfig, setConfig } from './src/config.js' import https from 'https' import http from 'http' import fs from 'fs' const run = async () => { - await setConfig() - const { port, enableHttpsForDev } = getConfig() + const port = 3000; + const enableHttpsForDev = false; const app = await build() From f0b1e1df85ca3c54e7fd51bc57ef47ca0b943d60 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 27 Jan 2026 17:52:13 -0500 Subject: [PATCH 07/72] add credential endpoints --- src/app.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 3f31c0c..c693c6f 100644 --- a/src/app.js +++ b/src/app.js @@ -1,5 +1,7 @@ import express from 'express' import cors from 'cors' +import {createDatabase, seedDatabase} from './seed.js' +import pool from './pool.js' export async function build() { var app = express() @@ -10,8 +12,7 @@ export async function build() { app.get('/healthz', async function (req, res) { try { - - + // TODO add some meaningful check like a select from the DB } catch (e) { console.log(`exception in healthz: ${JSON.stringify(e)}`) return res.status(503).json({ @@ -26,5 +27,48 @@ export async function build() { res.send({ message: 'cred-store server status: ok.' }) }) + app.get('/seed', async function (req, res) { + await createDatabase() + await seedDatabase() + + res.send({ message: 'created and seeded db' }) + }) + + app.post('/credential', async function (req, res) { + let submittedCred = req.body; + try { + const result = await pool.query("insert into credentials (cred_name, holder, email) values (?,?,?)", ['test cred', 'me', 'chartraj@mit.edu']); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.get('/credentials', async function (req, res) { + try { + const result = await pool.query("select * from credentials"); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.get('/credentials/:id', async function (req, res) { + const id = req.params.id + if (id === '0') { + res.send({ message: '0 test worked properly' }) + } else { + try { + const result = await pool.query("select * from credentials where id = ?", [id]); + res.send(result); + } catch (err) { + throw err; + } + } + + }) + + + return app } \ No newline at end of file From e5801f9fb82619f7b7f3851b8b50abb176ede357 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Thu, 5 Feb 2026 14:46:16 -0500 Subject: [PATCH 08/72] add routes, queries, and seeding --- src/app.js | 86 +++++++++++++++--- src/pool.js | 2 +- src/queries.js | 149 ++++++++++++++++++++++++++++++ src/seed.js | 179 ++++++++++++++++++++++++++++++------ src/seedData.js | 235 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 611 insertions(+), 40 deletions(-) create mode 100644 src/queries.js create mode 100644 src/seedData.js diff --git a/src/app.js b/src/app.js index c693c6f..4a8a887 100644 --- a/src/app.js +++ b/src/app.js @@ -1,6 +1,7 @@ import express from 'express' import cors from 'cors' import {createDatabase, seedDatabase} from './seed.js' +import {fetchCredentials, fetchCredentialCount, addCredential, updateCredential, getCredential, getReportData, fetchBatches, fetchTemplates, fetchAllTemplates} from './queries.js' import pool from './pool.js' export async function build() { @@ -20,54 +21,111 @@ export async function build() { healthy: false }) } - res.send({ message: 'cred-store server status: ok.', healthy: true }) + res.json({ message: 'cred-store server status: ok.', healthy: true }) }) app.get('/', function (req, res) { - res.send({ message: 'cred-store server status: ok.' }) + res.json({ message: 'cred-store server status: ok.' }) }) app.get('/seed', async function (req, res) { await createDatabase() await seedDatabase() - res.send({ message: 'created and seeded db' }) + res.json({ message: 'created and seeded db' }) }) app.post('/credential', async function (req, res) { let submittedCred = req.body; try { - const result = await pool.query("insert into credentials (cred_name, holder, email) values (?,?,?)", ['test cred', 'me', 'chartraj@mit.edu']); - res.send(result); + const result = await addCredential(submittedCred) + res.json(result); } catch (err) { throw err; } }) - app.get('/credentials', async function (req, res) { + app.post('/credentials/query', async function (req, res) { + let query = req.body; try { - const result = await pool.query("select * from credentials"); - res.send(result); + const result = await fetchCredentials(query.queryTerm, query.currentPage); + res.json(result); + } catch (err) { + throw err; + } + }) + + app.post('/credentials/count', async function (req, res) { + let query = req.body; + try { + const result = await fetchCredentialCount(query.queryTerm); + res.json(result); } catch (err) { throw err; } }) - app.get('/credentials/:id', async function (req, res) { + app.get('/credential/:id', async function (req, res) { + const id = req.params.id - if (id === '0') { - res.send({ message: '0 test worked properly' }) - } else { try { - const result = await pool.query("select * from credentials where id = ?", [id]); + const result = await getCredential(id); + console.log("and the result: ", result) + res.send(result); + } catch (err) { + throw err; + } + }) + + app.put('/credential/:id', async function (req, res) { + const id = req.params.id + let updatedValues = req.body; + try { + const result = updateCredential(id, updatedValues); res.send(result); } catch (err) { throw err; } - } + }) + + + app.get('/report', async function (req, res) { + try { + const result = await getReportData(); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.get('/batches', async function (req, res) { + try { + const result = await fetchBatches(5); + res.send(result); + } catch (err) { + throw err; + } + }) + app.get('/templates', async function (req, res) { + try { + const result = await fetchAllTemplates(); + res.send(result); + } catch (err) { + throw err; + } }) + app.post('/templates/query', async function (req, res) { + let query = req.body; + try { + const result = await fetchTemplates(query.queryTerm); + res.json(result); + } catch (err) { + throw err; + } + }) + return app diff --git a/src/pool.js b/src/pool.js index 49b2183..35d2ef6 100644 --- a/src/pool.js +++ b/src/pool.js @@ -1,6 +1,6 @@ import mariadb from 'mariadb'; const pool = mariadb.createPool({ - host: 'localhost', // Or your DB host + host: 'localhost', user: 'creduser', password: 'creduser', connectionLimit: 5, diff --git a/src/queries.js b/src/queries.js new file mode 100644 index 0000000..cd3e1aa --- /dev/null +++ b/src/queries.js @@ -0,0 +1,149 @@ +import pool from './pool.js' + +export const fetchAllCredentials = async () => { + return await pool.query("select * from credential"); +} + +export const fetchBatches = async (limit) => { + return await pool.query(`select id, name, description, added_by, date_added from batch${limit?' LIMIT ' + limit:''}`); +} + +export const fetchAllTemplates = async (query) => { + return await pool.query(`select * from template`); +} + +const ITEMS_PER_PAGE = 6; + +export const fetchTemplates = async (queryTerm) => { + + const templates = await pool.query(`SELECT * FROM template WHERE + name LIKE '%${queryTerm}%' OR + description LIKE '%${queryTerm}%' + `); + const count = await fetchTemplateCount(queryTerm) + return {templates,count} +} + +const commonCredQuery = `SELECT + credential.id AS id, + holder.name as holder_name, + holder.email as holder_email, + credential.cred_name as cred_name, + credential.status as status, + credential.date_added as date_added + FROM credential + INNER JOIN holder ON credential.holder_id = holder.id + ` + +export const fetchCredentials = async (queryTerm, currentPage) => { + const offset = (currentPage - 1) * ITEMS_PER_PAGE; + const credentials = await pool.query(`${commonCredQuery} WHERE + holder.name LIKE '%${queryTerm}%' OR + credential.cred_name LIKE '%${queryTerm}%' OR + holder.email LIKE '%${queryTerm}%' OR + credential.status LIKE '%${queryTerm}%' + ORDER BY credential.date_added DESC + LIMIT ${ITEMS_PER_PAGE} OFFSET ${offset} + `); + const count = await fetchCredentialCount(queryTerm) + return {credentials,count} +} + +export const fetchBatchesByQuery = async (queryTerm, currentPage = 1) => { + const offset = (currentPage - 1) * ITEMS_PER_PAGE; + const batches = await pool.query(`SELECT id, name, description, added_by, date_added FROM batch WHERE + name LIKE '%${queryTerm}%' OR + description LIKE '%${queryTerm}%' OR + added_by LIKE '%${queryTerm}%' + ORDER BY date_added DESC + LIMIT ${ITEMS_PER_PAGE} OFFSET ${offset} + `); + const count = await fetchBatchCountForQuery(queryTerm) + return {batches,count} + +} + +export const fetchBatchCountForQuery = async (queryTerm) => { + const result = await pool.query(`SELECT COUNT(*) as count FROM batch WHERE + name LIKE '%${queryTerm}%' OR + description LIKE '%${queryTerm}%' OR + added_by LIKE '%${queryTerm}%' + `); + const count = result[0].count.toString() + return count +} + +export const fetchCredentialCount = async (queryTerm) => { + const result = await pool.query(`SELECT COUNT(*) as count FROM credential + INNER JOIN holder ON credential.holder_id = holder.id + WHERE + holder.name LIKE '%${queryTerm}%' OR + credential.cred_name LIKE '%${queryTerm}%' OR + holder.email LIKE '%${queryTerm}%' OR + credential.status LIKE '%${queryTerm}%' + `); + const count = result[0].count.toString() + return count +} + +export const fetchTemplateCount = async (queryTerm) => { + const result = await pool.query(`SELECT COUNT(*) as count FROM template WHERE + name LIKE '%${queryTerm}%' OR + description LIKE '%${queryTerm}%' + `); + const count = result[0].count.toString() + return count +} + + + + +const convertToNumber = (count) => { + return new Number(count.toString()); +} + +export const getReportData = async () => { + const result = await Promise.all([ + pool.query("SELECT COUNT(*) AS total_credentials FROM credential"), + pool.query("SELECT COUNT(*) AS total_templates FROM template"), + pool.query("SELECT COUNT(*) AS total_batches FROM batch"), + pool.query("SELECT status, COUNT(*) AS count FROM credential GROUP BY status;"), + pool.query("SELECT YEAR(date_added) AS year, MONTH(date_added) AS month, COUNT(*) AS count FROM credential GROUP BY year, month ORDER BY year, month;") + + ]); + + const totalCredentials = result[0][0].total_credentials.toString(); + const totalTemplates = result[1][0].total_templates.toString(); + const totalBatches = result[2][0].total_batches.toString(); + + const byStatus = result[3].reduce( + (accumulator, statusObject) => {accumulator[statusObject.status] = convertToNumber(statusObject.count); return accumulator}, + {} + ); + +//(row=>{row.count = row.count.toString(); return row}) + + const byMonth = result[4].map(row=>{row.count = convertToNumber(row.count); return row}) + return {totalCredentials, totalBatches, totalTemplates, byStatus, byMonth}; +} + +export const getCredential = async id => { + const result = await pool.query(`${commonCredQuery} WHERE + credential.id = ?`, [id]); + return result[0] +} + +export const addCredential = async credential => { + const result = await pool.query(`insert into credential (cred_name, holder_name, holder_email, added_by) values (?,?,?,?)`, [credential.cred_name, credential.holder_name, credential.holder_email, credential.added_by]); + return result; +} + +export const updateCredential = async (id, credential) => { + const result = await pool.query(`UPDATE credential + SET cred_name = ?, + holder_name = ?, + holder_email = ? + WHERE id = ?`, [credential.cred_name, credential.holder_name, credential.holder_email, id]); + return result; +} + diff --git a/src/seed.js b/src/seed.js index c2d0354..3fb9c31 100644 --- a/src/seed.js +++ b/src/seed.js @@ -1,5 +1,6 @@ import mariadb from 'mariadb'; -import pool from './pool.js' +import pool from './pool.js'; +import { credentials, templates, batches, categories, holders } from './seedData.js'; // Define connection parameters without specifying a 'database' const connectionConfig = { @@ -13,12 +14,13 @@ const connectionConfig = { export async function createDatabase(dbName) { let conn; try { - // Establish a connection to the server (not a specific database) + // Establish a connection to the server, + // but not to a specific database because we haven't got one yet conn = await mariadb.createConnection(connectionConfig); console.log("Connected to MariaDB server."); // Execute the CREATE DATABASE query - const dbQuery = `CREATE DATABASE IF NOT EXISTS credentials`; + const dbQuery = `CREATE DATABASE IF NOT EXISTS credential`; await conn.query(dbQuery); console.log(`Database credentials created.`); @@ -33,39 +35,166 @@ export async function createDatabase(dbName) { } } -// Call the function to create your new database -//createDatabase(); +async function dropTables(conn) { -export async function seedDatabase() { - let conn; try { - conn = await pool.getConnection(); - console.log('Connected to database for seeding...'); + console.log('Dropping all tables...'); + await conn.query(`DROP TABLE IF EXISTS credential, category, batch, template, holder;`); + console.log('All tables successfully dropped.'); + } catch (err) { + console.error('Error trying to drop tables:', err); + } +} + +async function addTables(conn) { + + try { + + console.log('Creating tables...'); - // --- Create Tables (if not already done) --- await conn.query(` - CREATE TABLE IF NOT EXISTS credentials ( - id INT AUTO_INCREMENT PRIMARY KEY, + CREATE TABLE IF NOT EXISTS credential ( + id UUID NOT NULL DEFAULT UUID(), cred_name VARCHAR(100) NOT NULL, - holder VARCHAR(100) NOT NULL, - email VARCHAR(100) UNIQUE + verifiable_credential JSON, + batch_id UUID, + category_id UUID, + cred_template_id UUID, + email_template_id UUID, + holder_id UUID NOT NULL, + status ENUM('pending', 'notified', 'collected', 'revoked', 'deactivated') NOT NULL DEFAULT 'pending', + date_added DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, + date_notified DATETIME, + date_collected DATETIME, + date_revoked DATETIME, + revoked_by VARCHAR(100), + added_by VARCHAR(100) NOT NULL, + PRIMARY KEY (id) ); `); + await conn.query(` + CREATE TABLE IF NOT EXISTS template ( + id UUID NOT NULL DEFAULT UUID(), + name VARCHAR(100) NOT NULL, + template_json JSON NOT NULL, + description VARCHAR(255), + image_url VARCHAR(255) NOT NULL, + PRIMARY KEY (id) + ); + `) + + await conn.query(` + CREATE TABLE IF NOT EXISTS holder ( + id UUID NOT NULL DEFAULT UUID(), + name VARCHAR(100) NOT NULL, + email VARCHAR(100), + org_id VARCHAR(100), + did VARCHAR(255), + PRIMARY KEY (id) + ); + `) + + await conn.query(` + CREATE TABLE IF NOT EXISTS batch ( + id UUID NOT NULL DEFAULT UUID(), + name VARCHAR(100) NOT NULL, + uploaded_csv BLOB, + description VARCHAR(255), + date_added DATETIME DEFAULT CURRENT_TIMESTAMP, + added_by VARCHAR(100), + PRIMARY KEY (id) + ); + `) + + await conn.query(` + CREATE TABLE IF NOT EXISTS category ( + id UUID NOT NULL DEFAULT UUID(), + name VARCHAR(100) NOT NULL, + description VARCHAR(255), + date_added DATETIME DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id) + ); + `) + + } catch (err) { + console.error('Error adding tables', err); + } +} + + +async function seedTables(conn) { + + try { + console.log('Started seeding...'); // --- Insert Seed Data --- - await conn.query("INSERT INTO credentials (cred_name, holder, email) VALUES (?, ?, ?)", ["Badge of Honour", "Alice Allright", "alice@example.com"]); - await conn.query("INSERT INTO credentials (cred_name, holder, email) VALUES (?, ?, ?)", ["Deputy of Doubt", "Bob Best", "bob@example.com"]); - console.log('Credentials seeded successfully!'); + const insertedCredentials = await Promise.all( + credentials.map(credential => conn.query(` + INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, category_id, status, date_added) + VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.category_id}', '${credential.status ?? "pending"}', '${credential.date_added}') + `) + ) + ) + + const insertedBatches = await Promise.all( + batches.map(batch => conn.query(` + INSERT IGNORE INTO batch (name, description, uploaded_csv, added_by) + VALUES ('${batch.name}', '${batch.description}', '${batch.uploaded_csv}', '${batch.added_by}') + `) + ) + ) + + const insertedHolder = await Promise.all( + holders.map(holder => conn.query(` + INSERT IGNORE INTO holder (id, name, email, org_id, did) + VALUES ('${holder.id}','${holder.name}', '${holder.email}', '${holder.org_id}', ${holder.did ? "'" + holder.did + "'" : 'NULL'}) + `) + ) + ) + + const insertedCategories = await Promise.all( + categories.map(category => conn.query(` + INSERT IGNORE INTO category (id, name, description) + VALUES ('${category.id}', '${category.name}', '${category.description}') + `) + ) + ) + + const insertedTemplates = await Promise.all( + templates.map(template => conn.query(` + INSERT IGNORE INTO template (id, name, description, template_json, image_url) + VALUES ('${template.id}', '${template.name}', '${template.description}', '${template.template_json}', '${template.image_url}') + `) + ) + ) + + console.log('Credentials seeded!'); } catch (err) { console.error('Error during database seeding:', err); - } finally { - if (conn) { - conn.release(); // Release the connection back to the pool - console.log('Connection released.'); - } - // pool.end(); // Close the pool when done - } + } } -//seedDatabase(); \ No newline at end of file + +export async function seedDatabase() { + let conn; + try { + conn = await pool.getConnection(); + // start transaction (auto-commit is disabled on pooled connections) + await conn.beginTransaction(); + await dropTables(conn); + await addTables(conn); + await seedTables(conn); + await conn.commit(); + console.log("Transaction successful!"); + + } catch (err) { + // roll back the transaction if error + if (conn) await conn.rollback(); + console.error("Transaction failed:", err); + throw err; // re-throw for calling function to handle + } finally { + // release connection back to the pool + if (conn) return conn.release(); + } +} \ No newline at end of file diff --git a/src/seedData.js b/src/seedData.js new file mode 100644 index 0000000..2455d5b --- /dev/null +++ b/src/seedData.js @@ -0,0 +1,235 @@ + +const categories = [ + { + id: 'd6e15727-9fe1-4961-8c5b-ea44a9bd81aa', + name: 'Spring2026', + description: 'Spring Convocation' + }, + { + id: '3958dc9e-712f-4377-85e9-fec4b6a6442a', + name: 'Fall2026', + description: 'Fall Convocation' + }, +]; + +const holders = [ + { + id: 'B21A0736-5F70-4251-B648-1551595DB051', + name: 'James Chartrand', + email: 'jc.chartrand@gmail.com', + did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:me', + org_id: '1' + }, + { + id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', + name: 'Taylor Tuna', + email: 'taylor@pacific.sea', + did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:tuna', + org_id: '2' + }, + { + id: 'C74643D6-6771-4510-B3BC-9442DAED936D', + name: 'Sam Salmon', + email: 'sam@pacific.sea', + did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:salmon', + org_id: '3' + }, + { + id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', + name: 'Charlie Crayfish', + email: 'charlie@pacific.sea', + did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:crayfish', + org_id: '4' + }, + { + id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', + name: 'Harper Haddock', + email: 'harper@pacific.sea', + org_id: '4' + } +]; + + +const templates = [ + { + id: '3958dc9e-742f-4377-85e9-fec4b6a6442a', + template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + name: 'Bachelor of Engineering', + description: 'Standard Bachelor of Engineering', + image_url: '/customers/evil-rabbit.png', + }, + { + id: '76d65c26-f784-44a2-ac19-586678f7c2f2', + template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + name: 'Bachelor of Science', + description: 'Standard Bachelor of Science', + image_url: '/customers/evil-rabbit.png', + }, + { + id: 'CC27C14A-0ACF-4F4A-A6C9-D45682C144B9', + template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + name: 'Bachelor of Arts', + description: 'Standard Bachelor of Arts', + image_url: '/customers/evil-rabbit.png', + }, + { + id: '13D07535-C59E-4157-A011-F8D2EF4E0CBB', + template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + name: 'Master of Science', + description: 'Standard Master of Science', + image_url: '/customers/evil-rabbit.png', + } +]; + +const credentials = [ + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[1].id, + holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', + added_by: 'chartraj@mit.edu', + status: 'collected', + date_added: '2026-01-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[1].id, + holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', + holder_email: 'chartraj@mit.edu', + added_by: 'chartraj@mit.edu', + status: 'collected', + date_added: '2026-01-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[2].id, + holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', + added_by: 'someone@mit.edu', + status: 'notified', + date_added: '2026-01-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[2].id, + holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', + added_by: 'someone@mit.edu', + status: 'notified', + date_added: '2026-01-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[2].id, + holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', + added_by: 'someone@mit.edu', + status: 'notified', + date_added: '2025-12-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[3].id, + holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', + added_by: 'chartraj@mit.edu', + date_added: '2025-12-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[0].id, + holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', + added_by: 'someone@mit.edu', + date_added: '2025-12-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[2].id, + holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', + added_by: 'chartraj@mit.edu', + date_added: '2025-08-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[1].id, + holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', + added_by: 'someone@mit.edu', + date_added: '2025-08-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[3].id, + holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', + added_by: 'chartraj@mit.edu', + date_added: '2025-08-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[3].id, + holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', + added_by: 'someone@mit.edu', + date_added: '2025-08-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[1].id, + holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', + added_by: 'chartraj@mit.edu', + date_added: '2025-08-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[0].id, + holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', + added_by: 'someone@mit.edu', + date_added: '2025-08-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[0].id, + holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', + added_by: 'chartraj@mit.edu', + date_added: '2025-11-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[2].id, + holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', + added_by: 'someone@mit.edu', + date_added: '2025-11-24 14:30:00' + }, + { + category_id: categories[0].id, + cred_name: "Bachelor of Arts", + cred_template_id: templates[2].id, + holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', + added_by: 'chartraj@mit.edu', + date_added: '2025-11-24 14:30:00' + }, + { + category_id: categories[1].id, + cred_name: "Master of Science", + cred_template_id: templates[0].id, + holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', + added_by: 'someone@mit.edu', + date_added: '2025-11-24 14:30:00' + } +]; + +const batches = [ + { name: 'Spring2026', description: '1st batch for spring convocation', uploaded_csv: 'csv data', added_by: 'chartraj@mit.edu' }, + { name: 'Spring2025', description: '1st batch for spring convocation', uploaded_csv: 'csv data', added_by: 'chartraj@mit.edu' }, + { name: 'Fall2025', description: '1st batch for fall convocation', uploaded_csv: 'csv data', added_by: 'chartraj@mit.edu' } +]; + +export { credentials, batches, categories, templates, holders }; From 22fbaf89d4997d180069f181b3a0451edbd5d39e Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Thu, 5 Feb 2026 15:18:54 -0500 Subject: [PATCH 09/72] add holder queries --- src/app.js | 25 +++++++++++++++++++++++-- src/queries.js | 27 +++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 4a8a887..cc1108f 100644 --- a/src/app.js +++ b/src/app.js @@ -1,8 +1,18 @@ import express from 'express' import cors from 'cors' import {createDatabase, seedDatabase} from './seed.js' -import {fetchCredentials, fetchCredentialCount, addCredential, updateCredential, getCredential, getReportData, fetchBatches, fetchTemplates, fetchAllTemplates} from './queries.js' -import pool from './pool.js' +import { + fetchCredentials, + fetchCredentialCount, + addCredential, + updateCredential, + getCredential, + getReportData, + fetchBatches, + fetchTemplates, + fetchAllTemplates, + fetchHolders +} from './queries.js' export async function build() { var app = express() @@ -55,6 +65,17 @@ export async function build() { } }) + app.post('/holders/query', async function (req, res) { + let query = req.body; + try { + const result = await fetchHolders(query.queryTerm, query.currentPage); + res.json(result); + } catch (err) { + throw err; + } + }) + + app.post('/credentials/count', async function (req, res) { let query = req.body; try { diff --git a/src/queries.js b/src/queries.js index cd3e1aa..68e28f5 100644 --- a/src/queries.js +++ b/src/queries.js @@ -48,6 +48,33 @@ export const fetchCredentials = async (queryTerm, currentPage) => { const count = await fetchCredentialCount(queryTerm) return {credentials,count} } + +export const fetchHolders = async (queryTerm, currentPage) => { + const offset = (currentPage - 1) * ITEMS_PER_PAGE; + const holders = await pool.query(`SELECT * FROM holder WHERE + name LIKE '%${queryTerm}%' OR + did LIKE '%${queryTerm}%' OR + email LIKE '%${queryTerm}%' OR + org_id LIKE '%${queryTerm}%' + ORDER BY name DESC + LIMIT ${ITEMS_PER_PAGE} OFFSET ${offset} + `); + const count = await fetchHolderCount(queryTerm) + return {holders,count} +} + + +export const fetchHolderCount = async (queryTerm) => { + const result = await pool.query(`SELECT COUNT(*) as count FROM holder + WHERE + name LIKE '%${queryTerm}%' OR + did LIKE '%${queryTerm}%' OR + email LIKE '%${queryTerm}%' OR + org_id LIKE '%${queryTerm}%' + `); + const count = result[0].count.toString() + return count +} export const fetchBatchesByQuery = async (queryTerm, currentPage = 1) => { const offset = (currentPage - 1) * ITEMS_PER_PAGE; From 328d6c0abc4ca9552d076fb82c4907d1e3cdc47a Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Thu, 5 Feb 2026 17:05:38 -0500 Subject: [PATCH 10/72] add create, read, update for holders --- src/app.js | 49 +++++++++++++++++++++++++++++++++--- src/queries.js | 67 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 87 insertions(+), 29 deletions(-) diff --git a/src/app.js b/src/app.js index cc1108f..bf53754 100644 --- a/src/app.js +++ b/src/app.js @@ -11,7 +11,12 @@ import { fetchBatches, fetchTemplates, fetchAllTemplates, - fetchHolders + fetchHolders, + fetchHolderCount, + getHolder, + addHolder, + updateHolder, + } from './queries.js' export async function build() { @@ -75,6 +80,36 @@ export async function build() { } }) + app.post('/holder', async function (req, res) { + let submittedHolder = req.body; + try { + const result = await addHolder(submittedHolder) + res.json(result); + } catch (err) { + throw err; + } + }) + + app.get('/holder/:id', async function (req, res) { + const id = req.params.id + try { + const result = await getHolder(id); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.put('/holder/:id', async function (req, res) { + const id = req.params.id + let updatedValues = req.body; + try { + const result = updateHolder(id, updatedValues); + res.send(result); + } catch (err) { + throw err; + } + }) app.post('/credentials/count', async function (req, res) { let query = req.body; @@ -86,12 +121,20 @@ export async function build() { } }) - app.get('/credential/:id', async function (req, res) { + app.post('/holders/count', async function (req, res) { + let query = req.body; + try { + const result = await fetchHolderCount(query.queryTerm); + res.json(result); + } catch (err) { + throw err; + } + }) + app.get('/credential/:id', async function (req, res) { const id = req.params.id try { const result = await getCredential(id); - console.log("and the result: ", result) res.send(result); } catch (err) { throw err; diff --git a/src/queries.js b/src/queries.js index 68e28f5..e5b4393 100644 --- a/src/queries.js +++ b/src/queries.js @@ -48,6 +48,26 @@ export const fetchCredentials = async (queryTerm, currentPage) => { const count = await fetchCredentialCount(queryTerm) return {credentials,count} } + +export const getCredential = async id => { + const result = await pool.query(`${commonCredQuery} WHERE + credential.id = ?`, [id]); + return result[0] +} + +export const addCredential = async credential => { + const result = await pool.query(`insert into credential (cred_name, holder_name, holder_email, added_by) values (?,?,?,?)`, [credential.cred_name, credential.holder_name, credential.holder_email, credential.added_by]); + return result; +} + +export const updateCredential = async (id, credential) => { + const result = await pool.query(`UPDATE credential + SET cred_name = ?, + holder_name = ?, + holder_email = ? + WHERE id = ?`, [credential.cred_name, credential.holder_name, credential.holder_email, id]); + return result; +} export const fetchHolders = async (queryTerm, currentPage) => { const offset = (currentPage - 1) * ITEMS_PER_PAGE; @@ -76,6 +96,26 @@ export const fetchHolderCount = async (queryTerm) => { return count } +export const getHolder = async id => { + const result = await pool.query(`SELECT * FROM holder WHERE id = ?`, [id]); + return result[0] +} + +export const addHolder = async holder => { + const result = await pool.query(`insert into holder (name, did, email, org_id) values (?,?,?,?)`, [holder.name, holder.did, holder.email, holder.org_id]); + return result; +} + +export const updateHolder = async (id, holder) => { + const result = await pool.query(`UPDATE holder + SET name = ?, + did = ?, + email = ?, + org_id = ? + WHERE id = ?`, [holder.name, holder.did, holder.email, holder.org_id, id]); + return result; +} + export const fetchBatchesByQuery = async (queryTerm, currentPage = 1) => { const offset = (currentPage - 1) * ITEMS_PER_PAGE; const batches = await pool.query(`SELECT id, name, description, added_by, date_added FROM batch WHERE @@ -136,41 +176,16 @@ export const getReportData = async () => { pool.query("SELECT COUNT(*) AS total_batches FROM batch"), pool.query("SELECT status, COUNT(*) AS count FROM credential GROUP BY status;"), pool.query("SELECT YEAR(date_added) AS year, MONTH(date_added) AS month, COUNT(*) AS count FROM credential GROUP BY year, month ORDER BY year, month;") - ]); - const totalCredentials = result[0][0].total_credentials.toString(); const totalTemplates = result[1][0].total_templates.toString(); const totalBatches = result[2][0].total_batches.toString(); - const byStatus = result[3].reduce( (accumulator, statusObject) => {accumulator[statusObject.status] = convertToNumber(statusObject.count); return accumulator}, - {} - ); - -//(row=>{row.count = row.count.toString(); return row}) - + {}); const byMonth = result[4].map(row=>{row.count = convertToNumber(row.count); return row}) return {totalCredentials, totalBatches, totalTemplates, byStatus, byMonth}; } -export const getCredential = async id => { - const result = await pool.query(`${commonCredQuery} WHERE - credential.id = ?`, [id]); - return result[0] -} - -export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_name, holder_email, added_by) values (?,?,?,?)`, [credential.cred_name, credential.holder_name, credential.holder_email, credential.added_by]); - return result; -} -export const updateCredential = async (id, credential) => { - const result = await pool.query(`UPDATE credential - SET cred_name = ?, - holder_name = ?, - holder_email = ? - WHERE id = ?`, [credential.cred_name, credential.holder_name, credential.holder_email, id]); - return result; -} From ae545adebdf79b98bc54467b7e13e903623f7e79 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 9 Feb 2026 16:29:13 -0500 Subject: [PATCH 11/72] fix duplicate holder org id --- src/seedData.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seedData.js b/src/seedData.js index 2455d5b..05310c6 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -45,7 +45,7 @@ const holders = [ id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', name: 'Harper Haddock', email: 'harper@pacific.sea', - org_id: '4' + org_id: '5' } ]; From 01b6421a40f4d886618e76f2902714fceca48072 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 9 Feb 2026 16:29:30 -0500 Subject: [PATCH 12/72] add endpoints and queries for holder credentials --- src/app.js | 25 ++++++++++++++++++++++++- src/queries.js | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index bf53754..27a8468 100644 --- a/src/app.js +++ b/src/app.js @@ -16,7 +16,8 @@ import { getHolder, addHolder, updateHolder, - + fetchCredentialsForHolder, + fetchCredentialCountForHolder } from './queries.js' export async function build() { @@ -70,6 +71,28 @@ export async function build() { } }) + app.post('/holder/credentials/:id', async function (req, res) { + const id = req.params.id + let query = req.body; + try { + const result = await fetchCredentialsForHolder(id, query.queryTerm, query.currentPage); + res.json(result); + } catch (err) { + throw err; + } + }) + + app.post('/holder/credentials/count/:id', async function (req, res) { + const id = req.params.id + let query = req.body; + try { + const result = await fetchCredentialCountForHolder(id,query.queryTerm); + res.json(result); + } catch (err) { + throw err; + } + }) + app.post('/holders/query', async function (req, res) { let query = req.body; try { diff --git a/src/queries.js b/src/queries.js index e5b4393..88303ba 100644 --- a/src/queries.js +++ b/src/queries.js @@ -96,6 +96,44 @@ export const fetchHolderCount = async (queryTerm) => { return count } +export const fetchCredentialsForHolder = async (orgId, queryTerm, currentPage) => { + const offset = (currentPage - 1) * ITEMS_PER_PAGE; + const theQuery = `${commonCredQuery} WHERE + holder.org_id = '${orgId}' AND + ( + holder.name LIKE '%${queryTerm}%' OR + credential.cred_name LIKE '%${queryTerm}%' OR + holder.email LIKE '%${queryTerm}%' OR + credential.status LIKE '%${queryTerm}%' + ) + ORDER BY credential.date_added DESC + LIMIT ${ITEMS_PER_PAGE} OFFSET ${offset} + ` + console.log("the query in get credentials for holder", theQuery) + const credentials = await pool.query(theQuery); + const count = await fetchCredentialCountForHolder(queryTerm) + return {credentials,count} +} + + +export const fetchCredentialCountForHolder = async (orgId, queryTerm) => { + const result = await pool.query(`SELECT COUNT(*) as count FROM credential + INNER JOIN holder ON credential.holder_id = holder.id + WHERE + holder.org_id = '${orgId}' AND + ( + holder.name LIKE '%${queryTerm}%' OR + credential.cred_name LIKE '%${queryTerm}%' OR + holder.email LIKE '%${queryTerm}%' OR + credential.status LIKE '%${queryTerm}%' + ) + `); + const count = result[0].count.toString() + return count +} + + + export const getHolder = async id => { const result = await pool.query(`SELECT * FROM holder WHERE id = ?`, [id]); return result[0] From a562293c3d6a28242f3ebcc90498282cfc84b5e7 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 17 Feb 2026 15:38:30 -0500 Subject: [PATCH 13/72] fix update queries to use holderId --- src/app.js | 8 ++++---- src/queries.js | 24 +++++++----------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/app.js b/src/app.js index 27a8468..8fe6c29 100644 --- a/src/app.js +++ b/src/app.js @@ -55,7 +55,8 @@ export async function build() { let submittedCred = req.body; try { const result = await addCredential(submittedCred) - res.json(result); + console.log("result in app.js: ", result) + res.json({message: 'credential created'}); } catch (err) { throw err; } @@ -71,11 +72,10 @@ export async function build() { } }) - app.post('/holder/credentials/:id', async function (req, res) { + app.get('/holder/credentials/:id', async function (req, res) { const id = req.params.id - let query = req.body; try { - const result = await fetchCredentialsForHolder(id, query.queryTerm, query.currentPage); + const result = await fetchCredentialsForHolder(id); res.json(result); } catch (err) { throw err; diff --git a/src/queries.js b/src/queries.js index 88303ba..5da91f2 100644 --- a/src/queries.js +++ b/src/queries.js @@ -56,16 +56,15 @@ export const getCredential = async id => { } export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_name, holder_email, added_by) values (?,?,?,?)`, [credential.cred_name, credential.holder_name, credential.holder_email, credential.added_by]); + const result = await pool.query(`insert into credential (cred_name, holder_id, added_by) values (?,?,?)`, [credential.cred_name, credential.holder_id, credential.added_by]); return result; } export const updateCredential = async (id, credential) => { const result = await pool.query(`UPDATE credential SET cred_name = ?, - holder_name = ?, - holder_email = ? - WHERE id = ?`, [credential.cred_name, credential.holder_name, credential.holder_email, id]); + holder_id = ? + WHERE id = ?`, [credential.cred_name, credential.holder_id, id]); return result; } @@ -96,23 +95,14 @@ export const fetchHolderCount = async (queryTerm) => { return count } -export const fetchCredentialsForHolder = async (orgId, queryTerm, currentPage) => { - const offset = (currentPage - 1) * ITEMS_PER_PAGE; +export const fetchCredentialsForHolder = async (orgId) => { + const theQuery = `${commonCredQuery} WHERE - holder.org_id = '${orgId}' AND - ( - holder.name LIKE '%${queryTerm}%' OR - credential.cred_name LIKE '%${queryTerm}%' OR - holder.email LIKE '%${queryTerm}%' OR - credential.status LIKE '%${queryTerm}%' - ) + holder.org_id = '${orgId}' ORDER BY credential.date_added DESC - LIMIT ${ITEMS_PER_PAGE} OFFSET ${offset} ` - console.log("the query in get credentials for holder", theQuery) const credentials = await pool.query(theQuery); - const count = await fetchCredentialCountForHolder(queryTerm) - return {credentials,count} + return credentials } From 31cb7da8a74d09badee13746aa3e62f0830c6cec Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 18 Feb 2026 14:50:47 -0500 Subject: [PATCH 14/72] change credential query to return separate holder property --- src/queries.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/queries.js b/src/queries.js index 5da91f2..5b874f4 100644 --- a/src/queries.js +++ b/src/queries.js @@ -26,8 +26,11 @@ export const fetchTemplates = async (queryTerm) => { const commonCredQuery = `SELECT credential.id AS id, + holder.id as holder_id, holder.name as holder_name, holder.email as holder_email, + holder.did as holder_did, + holder.org_id as holder_org_id, credential.cred_name as cred_name, credential.status as status, credential.date_added as date_added @@ -52,7 +55,10 @@ export const fetchCredentials = async (queryTerm, currentPage) => { export const getCredential = async id => { const result = await pool.query(`${commonCredQuery} WHERE credential.id = ?`, [id]); - return result[0] + const credential = result[0] + const holder = {id: credential.holder_id, name: credential.holder_name, did: credential.holder_did, org_id: credential.holder_org_id, email: credential.holder_email} + return {credential, holder} + } export const addCredential = async credential => { From ce800b74abd9b193b2324e1bd6db4d3a584db108 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 18 Feb 2026 17:12:46 -0500 Subject: [PATCH 15/72] add notification and pickup tables --- src/seed.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/seed.js b/src/seed.js index 3fb9c31..63f11f4 100644 --- a/src/seed.js +++ b/src/seed.js @@ -84,6 +84,28 @@ async function addTables(conn) { ); `) + await conn.query(` + CREATE TABLE IF NOT EXISTS pickup ( + id UUID NOT NULL DEFAULT UUID(), + credential_id UUID NOT NULL, + template_id UUID NOT NULL, + date_collected DATETIME, + pickup_token UUID NOT NULL, + PRIMARY KEY (id) + ); + `) + + await conn.query(` + CREATE TABLE IF NOT EXISTS notification ( + id UUID NOT NULL DEFAULT UUID(), + credential_id UUID NOT NULL, + email VARCHAR(100) NOT NULL, + date_notifed DATETIME, + pickup_token UUID NOT NULL, + PRIMARY KEY (id) + ); + `) + await conn.query(` CREATE TABLE IF NOT EXISTS holder ( id UUID NOT NULL DEFAULT UUID(), From e670a1dfbd5fc09bedc52806edd85086187101bf Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 18 Feb 2026 17:34:42 -0500 Subject: [PATCH 16/72] add pickup and notification endpoints --- src/app.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 8fe6c29..29e32b5 100644 --- a/src/app.js +++ b/src/app.js @@ -17,7 +17,9 @@ import { addHolder, updateHolder, fetchCredentialsForHolder, - fetchCredentialCountForHolder + fetchCredentialCountForHolder, + addPickup, + addNotification } from './queries.js' export async function build() { @@ -213,7 +215,26 @@ export async function build() { } }) + app.post('/notification', async function (req, res) { + let submittedNotification = req.body; + try { + const result = await addNotification(submittedNotification) + console.log(result) + res.json(result); + } catch (err) { + throw err; + } + }) + app.post('/pickup', async function (req, res) { + let submittedPickup = req.body; + try { + const result = await addPickup(submittedPickup) + res.json(result); + } catch (err) { + throw err; + } + }) return app } \ No newline at end of file From b81eec770ecc0d3244c98ab650c478885dc44c60 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 18 Feb 2026 17:35:15 -0500 Subject: [PATCH 17/72] update seed scripts for notification and pickup tables --- src/seed.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/seed.js b/src/seed.js index 63f11f4..ec838b0 100644 --- a/src/seed.js +++ b/src/seed.js @@ -89,7 +89,7 @@ async function addTables(conn) { id UUID NOT NULL DEFAULT UUID(), credential_id UUID NOT NULL, template_id UUID NOT NULL, - date_collected DATETIME, + date_collected DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, pickup_token UUID NOT NULL, PRIMARY KEY (id) ); @@ -100,8 +100,8 @@ async function addTables(conn) { id UUID NOT NULL DEFAULT UUID(), credential_id UUID NOT NULL, email VARCHAR(100) NOT NULL, - date_notifed DATETIME, - pickup_token UUID NOT NULL, + date_notifed DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, + pickup_token UUID NOT NULL DEFAULT UUID(), PRIMARY KEY (id) ); `) From 968858dead833c56c4f56e081a91a2fd7c9fbf6d Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 18 Feb 2026 17:35:40 -0500 Subject: [PATCH 18/72] set static uuid for one credential in seed data --- src/seedData.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/seedData.js b/src/seedData.js index 05310c6..0a07caf 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -120,6 +120,7 @@ const credentials = [ date_added: '2026-01-24 14:30:00' }, { + id: 'CDEDCB59-39A0-43F7-A7A9-BE6BD30B1A46', category_id: categories[1].id, cred_name: "Master of Science", cred_template_id: templates[2].id, From 1abfc0c0460c70b57a05d5011d4b7709fdda7c58 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 18 Feb 2026 17:36:09 -0500 Subject: [PATCH 19/72] add notification and pickup insert queries --- src/queries.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/queries.js b/src/queries.js index 5b874f4..ef4aef2 100644 --- a/src/queries.js +++ b/src/queries.js @@ -150,6 +150,16 @@ export const updateHolder = async (id, holder) => { return result; } +export const addPickup = async pickup => { + const result = await pool.query(`INSERT INTO pickup (credential_id, template_id, pickup_token) VALUES (?,?,?) RETURNING id`, [pickup.credential_id, pickup.template_id, pickup.pickup_token]); + return result[0]; +} + +export const addNotification = async notification => { + const result = await pool.query(`INSERT INTO notification (credential_id, email) VALUES (?,?) RETURNING pickup_token`, [notification.credential_id, notification.email]); + return result[0]; +} + export const fetchBatchesByQuery = async (queryTerm, currentPage = 1) => { const offset = (currentPage - 1) * ITEMS_PER_PAGE; const batches = await pool.query(`SELECT id, name, description, added_by, date_added FROM batch WHERE From d2a86d0c2c0d0897d9a08ba45fb064a69296d447 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 20 Feb 2026 10:27:51 -0500 Subject: [PATCH 20/72] add token lookup endpoint --- src/app.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 29e32b5..041b668 100644 --- a/src/app.js +++ b/src/app.js @@ -19,7 +19,8 @@ import { fetchCredentialsForHolder, fetchCredentialCountForHolder, addPickup, - addNotification + addNotification, + lookupPickupToken } from './queries.js' export async function build() { @@ -226,6 +227,18 @@ export async function build() { } }) + app.get('/notification/:pickuptoken', async function (req, res) { + const pickupToken = req.params.pickuptoken + console.log("the pickup token: ", pickupToken) + try { + const result = await lookupPickupToken(pickupToken) + console.log(result) + res.json(result); + } catch (err) { + throw err; + } + }) + app.post('/pickup', async function (req, res) { let submittedPickup = req.body; try { From 0b85d96fee2887f4e3b2d772ca9e6895c1e9e5ce Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 20 Feb 2026 10:28:21 -0500 Subject: [PATCH 21/72] add token lookup queries --- src/queries.js | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/src/queries.js b/src/queries.js index ef4aef2..5e3e21d 100644 --- a/src/queries.js +++ b/src/queries.js @@ -53,11 +53,24 @@ export const fetchCredentials = async (queryTerm, currentPage) => { } export const getCredential = async id => { - const result = await pool.query(`${commonCredQuery} WHERE - credential.id = ?`, [id]); + console.log("the credential id: ", id) + const result = await pool.query(`${commonCredQuery} WHERE credential.id = ?`, [id]); const credential = result[0] - const holder = {id: credential.holder_id, name: credential.holder_name, did: credential.holder_did, org_id: credential.holder_org_id, email: credential.holder_email} - return {credential, holder} + console.log("the credential result: ", credential) + const holder = { + id: credential.holder_id, + name: credential.holder_name, + did: credential.holder_did, + org_id: credential.holder_org_id, + email: credential.holder_email + } + delete credential.holder_id + delete credential.holder_name + delete credential.holder_did + delete credential.holder_org_id + delete credential.holder_email + + return {credential, holder} } @@ -101,10 +114,10 @@ export const fetchHolderCount = async (queryTerm) => { return count } -export const fetchCredentialsForHolder = async (orgId) => { +export const fetchCredentialsForHolder = async (holderId) => { const theQuery = `${commonCredQuery} WHERE - holder.org_id = '${orgId}' + holder.id = '${holderId}' ORDER BY credential.date_added DESC ` const credentials = await pool.query(theQuery); @@ -155,8 +168,17 @@ export const addPickup = async pickup => { return result[0]; } +export const lookupPickupToken = async pickupToken => { + //we do the pickup lookup separately so that + //we can show a different message if the token is good, but there are no creds for the holder + const tokenLookupResult = await pool.query(`SELECT * FROM notification WHERE pickup_token = ?`, [pickupToken]); + console.log("token lookup result: ", tokenLookupResult) + const holderId = tokenLookupResult[0].holder_id; + return fetchCredentialsForHolder(holderId) +} + export const addNotification = async notification => { - const result = await pool.query(`INSERT INTO notification (credential_id, email) VALUES (?,?) RETURNING pickup_token`, [notification.credential_id, notification.email]); + const result = await pool.query(`INSERT INTO notification (credential_id, email, holder_id) VALUES (?,?,?) RETURNING pickup_token`, [notification.credential_id, notification.email, notification.holder_id]); return result[0]; } From 30baced5b762201adeabb5ea7c3e53e423eeb352 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 20 Feb 2026 10:30:05 -0500 Subject: [PATCH 22/72] fix seeding for notification and pickup --- src/seed.js | 3 ++- src/seedData.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/seed.js b/src/seed.js index ec838b0..668d6d6 100644 --- a/src/seed.js +++ b/src/seed.js @@ -39,7 +39,7 @@ async function dropTables(conn) { try { console.log('Dropping all tables...'); - await conn.query(`DROP TABLE IF EXISTS credential, category, batch, template, holder;`); + await conn.query(`DROP TABLE IF EXISTS credential, category, batch, template, holder, notification, pickup;`); console.log('All tables successfully dropped.'); } catch (err) { console.error('Error trying to drop tables:', err); @@ -99,6 +99,7 @@ async function addTables(conn) { CREATE TABLE IF NOT EXISTS notification ( id UUID NOT NULL DEFAULT UUID(), credential_id UUID NOT NULL, + holder_id UUID NOT NULL, email VARCHAR(100) NOT NULL, date_notifed DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, pickup_token UUID NOT NULL DEFAULT UUID(), diff --git a/src/seedData.js b/src/seedData.js index 0a07caf..3e4fe0e 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -122,7 +122,7 @@ const credentials = [ { id: 'CDEDCB59-39A0-43F7-A7A9-BE6BD30B1A46', category_id: categories[1].id, - cred_name: "Master of Science", + cred_name: "Master of Scientific", cred_template_id: templates[2].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', From 54219394193d42e00a151e8730b96852291a61a8 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 23 Feb 2026 16:00:51 -0500 Subject: [PATCH 23/72] add template endpoint --- src/app.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/app.js b/src/app.js index 041b668..f65efb6 100644 --- a/src/app.js +++ b/src/app.js @@ -11,6 +11,7 @@ import { fetchBatches, fetchTemplates, fetchAllTemplates, + getTemplate, fetchHolders, fetchHolderCount, getHolder, @@ -85,6 +86,16 @@ export async function build() { } }) + app.get('/template/:id', async function (req, res) { + const id = req.params.id + try { + const result = await getTemplate(id); + res.json(result); + } catch (err) { + throw err; + } + }) + app.post('/holder/credentials/count/:id', async function (req, res) { const id = req.params.id let query = req.body; From 7bf4c4bb37ded5e28bb0b169a0317199a381d8b5 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 23 Feb 2026 16:01:06 -0500 Subject: [PATCH 24/72] add template query --- src/queries.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/queries.js b/src/queries.js index 5e3e21d..b0b2b49 100644 --- a/src/queries.js +++ b/src/queries.js @@ -52,11 +52,16 @@ export const fetchCredentials = async (queryTerm, currentPage) => { return {credentials,count} } +export const getTemplate = async id => { + const result = await pool.query(`${commonCredQuery} WHERE template.id = ?`, [id]); + const template = result[0] + return template +} + export const getCredential = async id => { - console.log("the credential id: ", id) + const result = await pool.query(`${commonCredQuery} WHERE credential.id = ?`, [id]); const credential = result[0] - console.log("the credential result: ", credential) const holder = { id: credential.holder_id, name: credential.holder_name, From 531ed00d9833f30b4b44d787c57a1ebf56564a2c Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 23 Feb 2026 16:01:35 -0500 Subject: [PATCH 25/72] comment cleanup --- src/seed.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/seed.js b/src/seed.js index 668d6d6..342019b 100644 --- a/src/seed.js +++ b/src/seed.js @@ -2,13 +2,14 @@ import mariadb from 'mariadb'; import pool from './pool.js'; import { credentials, templates, batches, categories, holders } from './seedData.js'; -// Define connection parameters without specifying a 'database' +// Define connection parameters without +// specifying a 'database' because we haven't got one yet const connectionConfig = { host: 'localhost', port: 3306, // Default MariaDB port - user: 'creduser', // User with CREATE privileges (e.g., 'root') + user: 'creduser', password: 'creduser', - connectionLimit: 1 // A simple connection is enough for this task + connectionLimit: 1 }; export async function createDatabase(dbName) { From bfe95aa03a76f9fbea64540a6a7d9af3b3e2dff2 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 23 Feb 2026 16:24:36 -0500 Subject: [PATCH 26/72] add template to credential query --- src/queries.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/queries.js b/src/queries.js index b0b2b49..ed6a4f7 100644 --- a/src/queries.js +++ b/src/queries.js @@ -33,7 +33,8 @@ const commonCredQuery = `SELECT holder.org_id as holder_org_id, credential.cred_name as cred_name, credential.status as status, - credential.date_added as date_added + credential.date_added as date_added, + credential.cred_template_id FROM credential INNER JOIN holder ON credential.holder_id = holder.id ` @@ -80,15 +81,17 @@ export const getCredential = async id => { } export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_id, added_by) values (?,?,?)`, [credential.cred_name, credential.holder_id, credential.added_by]); + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, added_by) values (?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.added_by]); return result; } export const updateCredential = async (id, credential) => { + console.log("credential: ", credential) const result = await pool.query(`UPDATE credential SET cred_name = ?, - holder_id = ? - WHERE id = ?`, [credential.cred_name, credential.holder_id, id]); + holder_id = ?, + cred_template_id = ? + WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, id]); return result; } From 78d3bb33bbd1a40a30c7426d3de3c7a35fa1421c Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 08:59:44 -0500 Subject: [PATCH 27/72] add test templates --- src/vc-templates/test-vc.js | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/vc-templates/test-vc.js diff --git a/src/vc-templates/test-vc.js b/src/vc-templates/test-vc.js new file mode 100644 index 0000000..b6f61c9 --- /dev/null +++ b/src/vc-templates/test-vc.js @@ -0,0 +1,47 @@ +export default JSON.stringify({ + "@context": [ + "https://www.w3.org/ns/credentials/v2", + "https://purl.imsglobal.org/spec/ob/v3p0/context-3.0.3.json", + "https://w3id.org/security/suites/ed25519-2020/v1" + ], + "id": "urn:uuid:19281fe8-90d2-4eao-a9da-6188898a6c", + "type": [ + "VerifiableCredential", + "OpenBadgeCredential" + ], + "issuer": { + "type": [ + "Profile" + ], + "name": "The Learned", + "image": { + "id": "https://digitalcredentials.github.io/badge-assets/classroom.png", + "type": "Image", + "caption": "Learned logo" + } + }, + "validFrom": "2025-02-24T00:00:00Z", + "name": "Parker Pearl", + "credentialSubject": { + "type": [ + "AchievementSubject" + ], + "achievement": { + "id": "https://something.org/theProgram", + + "type": [ + "Achievement" + ], + "image": { + "id": "https://digitalcredentials.github.io/badge-assets/brain.png", + "type": "Image", + "caption": "Certificate logo" + }, + "criteria": { + "narrative": "Objectively told the truth" + }, + "description": "Successfully completed all modules.", + "name": "Truth, veracity, candor, and verisimilitude." + } + } +}) \ No newline at end of file From 61f737536ff973f29a9b521746a39ab0c20110ab Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 09:01:55 -0500 Subject: [PATCH 28/72] remove console logs --- src/app.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app.js b/src/app.js index f65efb6..96317fe 100644 --- a/src/app.js +++ b/src/app.js @@ -59,7 +59,6 @@ export async function build() { let submittedCred = req.body; try { const result = await addCredential(submittedCred) - console.log("result in app.js: ", result) res.json({message: 'credential created'}); } catch (err) { throw err; @@ -90,7 +89,7 @@ export async function build() { const id = req.params.id try { const result = await getTemplate(id); - res.json(result); + res.json(result); } catch (err) { throw err; } @@ -231,7 +230,6 @@ export async function build() { let submittedNotification = req.body; try { const result = await addNotification(submittedNotification) - console.log(result) res.json(result); } catch (err) { throw err; @@ -240,10 +238,8 @@ export async function build() { app.get('/notification/:pickuptoken', async function (req, res) { const pickupToken = req.params.pickuptoken - console.log("the pickup token: ", pickupToken) try { const result = await lookupPickupToken(pickupToken) - console.log(result) res.json(result); } catch (err) { throw err; From 8a7f4642acb109cadbd05ec2dc2e07f50e96ad6b Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 09:03:18 -0500 Subject: [PATCH 29/72] fix template query --- src/queries.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/queries.js b/src/queries.js index ed6a4f7..62da72c 100644 --- a/src/queries.js +++ b/src/queries.js @@ -54,7 +54,7 @@ export const fetchCredentials = async (queryTerm, currentPage) => { } export const getTemplate = async id => { - const result = await pool.query(`${commonCredQuery} WHERE template.id = ?`, [id]); + const result = await pool.query(`SELECT * FROM template WHERE id = ?`, [id]); const template = result[0] return template } @@ -86,7 +86,6 @@ export const addCredential = async credential => { } export const updateCredential = async (id, credential) => { - console.log("credential: ", credential) const result = await pool.query(`UPDATE credential SET cred_name = ?, holder_id = ?, From b37aac7424db17eba7fbea41d0f056a866eef1ad Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 09:05:11 -0500 Subject: [PATCH 30/72] add test vcs to template seed data --- src/seed.js | 17 +++++++++-------- src/seedData.js | 10 ++++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/seed.js b/src/seed.js index 342019b..a9b5742 100644 --- a/src/seed.js +++ b/src/seed.js @@ -176,21 +176,22 @@ async function seedTables(conn) { ) ) - const insertedCategories = await Promise.all( - categories.map(category => conn.query(` - INSERT IGNORE INTO category (id, name, description) - VALUES ('${category.id}', '${category.name}', '${category.description}') + const insertedTemplates = await Promise.all( + templates.map(template => conn.query(` + INSERT IGNORE INTO template (id, name, description, template_json, image_url) + VALUES ('${template.id}', '${template.name}', '${template.description}', '${template.template_json}', '${template.image_url}') `) ) ) - const insertedTemplates = await Promise.all( - templates.map(template => conn.query(` - INSERT IGNORE INTO template (id, name, description, template_json, image_url) - VALUES ('${template.id}', '${template.name}', '${template.description}', '${template.template_json}', '${template.image_url}') + const insertedCategories = await Promise.all( + categories.map(category => conn.query(` + INSERT IGNORE INTO category (id, name, description) + VALUES ('${category.id}', '${category.name}', '${category.description}') `) ) ) + console.log('Credentials seeded!'); diff --git a/src/seedData.js b/src/seedData.js index 3e4fe0e..c390171 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -1,4 +1,6 @@ +import testVC from './vc-templates/test-vc.js' + const categories = [ { id: 'd6e15727-9fe1-4961-8c5b-ea44a9bd81aa', @@ -53,28 +55,28 @@ const holders = [ const templates = [ { id: '3958dc9e-742f-4377-85e9-fec4b6a6442a', - template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + template_json: testVC, name: 'Bachelor of Engineering', description: 'Standard Bachelor of Engineering', image_url: '/customers/evil-rabbit.png', }, { id: '76d65c26-f784-44a2-ac19-586678f7c2f2', - template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + template_json: testVC, name: 'Bachelor of Science', description: 'Standard Bachelor of Science', image_url: '/customers/evil-rabbit.png', }, { id: 'CC27C14A-0ACF-4F4A-A6C9-D45682C144B9', - template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + template_json: testVC, name: 'Bachelor of Arts', description: 'Standard Bachelor of Arts', image_url: '/customers/evil-rabbit.png', }, { id: '13D07535-C59E-4157-A011-F8D2EF4E0CBB', - template_json: `{"vc": "will go here", "paths": "paths to replace might go here"}`, + template_json: testVC, name: 'Master of Science', description: 'Standard Master of Science', image_url: '/customers/evil-rabbit.png', From 95e3449a8a02d09a640a044eaa4816fc152eb1ec Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 16:08:21 -0500 Subject: [PATCH 31/72] add tenant_name column --- src/seed.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/seed.js b/src/seed.js index a9b5742..aa3cb2b 100644 --- a/src/seed.js +++ b/src/seed.js @@ -59,6 +59,7 @@ async function addTables(conn) { cred_name VARCHAR(100) NOT NULL, verifiable_credential JSON, batch_id UUID, + tenant_name VARCHAR(100) NOT NULL, category_id UUID, cred_template_id UUID, email_template_id UUID, From b5e4f90df6011245e9d15b8a562290a2ad13bf13 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 16:08:47 -0500 Subject: [PATCH 32/72] add tenant names to seed data --- src/seedData.js | 51 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/src/seedData.js b/src/seedData.js index c390171..47e08fc 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -91,7 +91,8 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'chartraj@mit.edu', status: 'collected', - date_added: '2026-01-24 14:30:00' + date_added: '2026-01-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -101,7 +102,8 @@ const credentials = [ holder_email: 'chartraj@mit.edu', added_by: 'chartraj@mit.edu', status: 'collected', - date_added: '2026-01-24 14:30:00' + date_added: '2026-01-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[1].id, @@ -110,7 +112,8 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', status: 'notified', - date_added: '2026-01-24 14:30:00' + date_added: '2026-01-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[1].id, @@ -119,7 +122,8 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'someone@mit.edu', status: 'notified', - date_added: '2026-01-24 14:30:00' + date_added: '2026-01-24 14:30:00', + tenant_name: 'testing' }, { id: 'CDEDCB59-39A0-43F7-A7A9-BE6BD30B1A46', @@ -129,7 +133,8 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', status: 'notified', - date_added: '2025-12-24 14:30:00' + date_added: '2025-12-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -137,7 +142,8 @@ const credentials = [ cred_template_id: templates[3].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', - date_added: '2025-12-24 14:30:00' + date_added: '2025-12-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[1].id, @@ -145,7 +151,8 @@ const credentials = [ cred_template_id: templates[0].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', - date_added: '2025-12-24 14:30:00' + date_added: '2025-12-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -153,7 +160,8 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', - date_added: '2025-08-24 14:30:00' + date_added: '2025-08-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[1].id, @@ -161,7 +169,8 @@ const credentials = [ cred_template_id: templates[1].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', - date_added: '2025-08-24 14:30:00' + date_added: '2025-08-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -169,7 +178,8 @@ const credentials = [ cred_template_id: templates[3].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', - date_added: '2025-08-24 14:30:00' + date_added: '2025-08-24 14:30:00', + tenant_name: 'test' }, { category_id: categories[1].id, @@ -177,7 +187,8 @@ const credentials = [ cred_template_id: templates[3].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', - date_added: '2025-08-24 14:30:00' + date_added: '2025-08-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -185,7 +196,8 @@ const credentials = [ cred_template_id: templates[1].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', - date_added: '2025-08-24 14:30:00' + date_added: '2025-08-24 14:30:00', + tenant_name: 'test' }, { category_id: categories[1].id, @@ -193,7 +205,8 @@ const credentials = [ cred_template_id: templates[0].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', - date_added: '2025-08-24 14:30:00' + date_added: '2025-08-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -201,7 +214,8 @@ const credentials = [ cred_template_id: templates[0].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', - date_added: '2025-11-24 14:30:00' + date_added: '2025-11-24 14:30:00', + tenant_name: 'test' }, { category_id: categories[1].id, @@ -209,7 +223,8 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', - date_added: '2025-11-24 14:30:00' + date_added: '2025-11-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[0].id, @@ -217,7 +232,8 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', - date_added: '2025-11-24 14:30:00' + date_added: '2025-11-24 14:30:00', + tenant_name: 'testing' }, { category_id: categories[1].id, @@ -225,7 +241,8 @@ const credentials = [ cred_template_id: templates[0].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', - date_added: '2025-11-24 14:30:00' + date_added: '2025-11-24 14:30:00', + tenant_name: 'test' } ]; From 05e64c207679e515ed4ef3e980c95db8945d2c4e Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 16:10:02 -0500 Subject: [PATCH 33/72] add tenant name to queries --- src/queries.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/queries.js b/src/queries.js index 62da72c..2adae2f 100644 --- a/src/queries.js +++ b/src/queries.js @@ -34,7 +34,8 @@ const commonCredQuery = `SELECT credential.cred_name as cred_name, credential.status as status, credential.date_added as date_added, - credential.cred_template_id + credential.cred_template_id, + credential.tenant_name, FROM credential INNER JOIN holder ON credential.holder_id = holder.id ` @@ -81,7 +82,7 @@ export const getCredential = async id => { } export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, added_by) values (?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.added_by]); + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_name, added_by) values (?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_name, credential.added_by]); return result; } @@ -89,8 +90,9 @@ export const updateCredential = async (id, credential) => { const result = await pool.query(`UPDATE credential SET cred_name = ?, holder_id = ?, - cred_template_id = ? - WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, id]); + cred_template_id = ?, + tenant_name = ? + WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_name, id]); return result; } From 3d9389047cd48619458d5d801ac586bd87418b02 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 16:24:27 -0500 Subject: [PATCH 34/72] remove bad comma from cred query --- src/queries.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/queries.js b/src/queries.js index 2adae2f..c8ab2e4 100644 --- a/src/queries.js +++ b/src/queries.js @@ -35,7 +35,7 @@ const commonCredQuery = `SELECT credential.status as status, credential.date_added as date_added, credential.cred_template_id, - credential.tenant_name, + credential.tenant_name FROM credential INNER JOIN holder ON credential.holder_id = holder.id ` From 397388312df37a981b651c9b01b26f30c68a3352 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 16:25:03 -0500 Subject: [PATCH 35/72] add tenant name from seed data during seeding --- src/seed.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/seed.js b/src/seed.js index aa3cb2b..95d67b0 100644 --- a/src/seed.js +++ b/src/seed.js @@ -155,8 +155,8 @@ async function seedTables(conn) { // --- Insert Seed Data --- const insertedCredentials = await Promise.all( credentials.map(credential => conn.query(` - INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, category_id, status, date_added) - VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.category_id}', '${credential.status ?? "pending"}', '${credential.date_added}') + INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, category_id, status, date_added, tenant_name) + VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.category_id}', '${credential.status ?? "pending"}', '${credential.date_added}', '${credential.tenant_name}') `) ) ) From 1659968f17278a4cd55dc4309b69258ac4784e7a Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 24 Feb 2026 16:25:24 -0500 Subject: [PATCH 36/72] lowercase UUID --- src/seedData.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seedData.js b/src/seedData.js index 47e08fc..17ff1af 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -126,7 +126,7 @@ const credentials = [ tenant_name: 'testing' }, { - id: 'CDEDCB59-39A0-43F7-A7A9-BE6BD30B1A46', + id: 'cdedcb59-39a0-43f7-a7a9-be6bd30b1a46', category_id: categories[1].id, cred_name: "Master of Scientific", cred_template_id: templates[2].id, From 4c2bbffd079e120a2c3a4cf46c806d2a6670954d Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 11:02:31 -0500 Subject: [PATCH 37/72] add tenant seed data --- src/seedData.js | 78 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 13 deletions(-) diff --git a/src/seedData.js b/src/seedData.js index 17ff1af..006b5b0 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -51,6 +51,58 @@ const holders = [ } ]; +const tenants = [ + { + id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8', + name: 'Economics Department', + email: 'jc.chartrand@gmail.com', + desciption: 'Economics Department Signer', + env_name: 'UN_PROTECTED_TEST', + issuer_name: 'Wonderful U - Department of Economics', + issuer_url: 'https://econ.wonderfulu.edu', + issuer_image_url: 'https://digitalcredentials.github.io/badge-assets/classroom.png' + }, + { + id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF', + name: 'Chemistry Department', + email: 'jc.chartrand@gmail.com', + desciption: 'Chemistry Department Signer', + env_name: 'PROTECTED_TEST', + issuer_name: 'Wonderful U - Department of Che istry', + issuer_url: 'https://chem.wonderfulu.edu', + issuer_image_url: 'https://digitalcredentials.github.io/badge-assets/classroom.png' + }, + { + id: '262F661C-4A25-4279-8474-0EB302D714BD', + name: 'Continuing Education', + email: 'jc.chartrand@gmail.com', + desciption: 'Continuing Education Signer', + env_name: 'RANDOMING_TESTING', + issuer_name: 'Wonderful U - Continuing Education', + issuer_url: 'https://con-ed.wonderfulu.edu', + issuer_image_url: 'https://digitalcredentials.github.io/badge-assets/classroom.png' + }, + { + id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1', + name: 'Registrar', + email: 'jc.chartrand@gmail.com', + desciption: 'For signing miscellaneous registrarial documents,', + env_name: 'TEST', + issuer_name: 'Wonderful U - Registrar', + issuer_url: 'https://registrar.wonderfulu.edu', + issuer_image_url: 'https://digitalcredentials.github.io/badge-assets/classroom.png' + }, + { + id: '90A5CC2F-660F-47B6-918F-FA7064961CC8', + name: 'Human Resources', + email: 'jc.chartrand@gmail.com', + desciption: 'For signing records of employment.', + env_name: 'TESTING', + issuer_name: 'Wonderful U - Human Resources', + issuer_url: 'https://hr.wonderfulu.edu', + issuer_image_url: 'https://digitalcredentials.github.io/badge-assets/classroom.png' + } +]; const templates = [ { @@ -92,7 +144,7 @@ const credentials = [ added_by: 'chartraj@mit.edu', status: 'collected', date_added: '2026-01-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -103,7 +155,7 @@ const credentials = [ added_by: 'chartraj@mit.edu', status: 'collected', date_added: '2026-01-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[1].id, @@ -113,7 +165,7 @@ const credentials = [ added_by: 'someone@mit.edu', status: 'notified', date_added: '2026-01-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[1].id, @@ -123,7 +175,7 @@ const credentials = [ added_by: 'someone@mit.edu', status: 'notified', date_added: '2026-01-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { id: 'cdedcb59-39a0-43f7-a7a9-be6bd30b1a46', @@ -134,7 +186,7 @@ const credentials = [ added_by: 'someone@mit.edu', status: 'notified', date_added: '2025-12-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -143,7 +195,7 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', date_added: '2025-12-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[1].id, @@ -152,7 +204,7 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-12-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -161,7 +213,7 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[1].id, @@ -170,7 +222,7 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -188,7 +240,7 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -206,7 +258,7 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -224,7 +276,7 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[0].id, @@ -233,7 +285,7 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_name: 'testing' + tenant_name: 'test' }, { category_id: categories[1].id, From 3b6824074a5af62f0ffaa8ef5d496e9287652124 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 11:02:49 -0500 Subject: [PATCH 38/72] add tenant queries --- src/queries.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/queries.js b/src/queries.js index c8ab2e4..b21bc47 100644 --- a/src/queries.js +++ b/src/queries.js @@ -8,10 +8,14 @@ export const fetchBatches = async (limit) => { return await pool.query(`select id, name, description, added_by, date_added from batch${limit?' LIMIT ' + limit:''}`); } -export const fetchAllTemplates = async (query) => { +export const fetchAllTemplates = async () => { return await pool.query(`select * from template`); } +export const fetchAllTenants = async () => { + return await pool.query(`select * from tenant`); +} + const ITEMS_PER_PAGE = 6; export const fetchTemplates = async (queryTerm) => { From f50388034caedf176070f1195cb567970b4e2c77 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 11:03:09 -0500 Subject: [PATCH 39/72] add tenant endpoints --- src/app.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 96317fe..50c8e52 100644 --- a/src/app.js +++ b/src/app.js @@ -21,7 +21,8 @@ import { fetchCredentialCountForHolder, addPickup, addNotification, - lookupPickupToken + lookupPickupToken, + fetchAllTenants } from './queries.js' export async function build() { @@ -216,6 +217,15 @@ export async function build() { } }) + app.get('/tenants', async function (req, res) { + try { + const result = await fetchAllTenants(); + res.send(result); + } catch (err) { + throw err; + } + }) + app.post('/templates/query', async function (req, res) { let query = req.body; try { From 307f84d8dc747d5509ef3a09af77d47217ab9540 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 11:03:33 -0500 Subject: [PATCH 40/72] add tenant table and seeding --- src/seed.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/seed.js b/src/seed.js index 95d67b0..1500f74 100644 --- a/src/seed.js +++ b/src/seed.js @@ -40,7 +40,7 @@ async function dropTables(conn) { try { console.log('Dropping all tables...'); - await conn.query(`DROP TABLE IF EXISTS credential, category, batch, template, holder, notification, pickup;`); + await conn.query(`DROP TABLE IF EXISTS credential, category, batch, template, holder, notification, pickup, tenant;`); console.log('All tables successfully dropped.'); } catch (err) { console.error('Error trying to drop tables:', err); @@ -120,6 +120,20 @@ async function addTables(conn) { ); `) + await conn.query(` + CREATE TABLE IF NOT EXISTS tenant ( + id UUID NOT NULL DEFAULT UUID(), + name VARCHAR(100) NOT NULL, + description VARCHAR(255), + email VARCHAR(100) NOT NULL, + issuer_name VARCHAR(100) NOT NULL, + issuer_image_url VARCHAR(300) NOT NULL, + issuer_url VARCHAR(300) NOT NULL, + env_name VARCHAR(100) NOT NULL, + PRIMARY KEY (id) + ); + `) + await conn.query(` CREATE TABLE IF NOT EXISTS batch ( id UUID NOT NULL DEFAULT UUID(), @@ -177,6 +191,14 @@ async function seedTables(conn) { ) ) + const insertedTenants = await Promise.all( + holders.map(tenant => conn.query(` + INSERT IGNORE INTO tenant (id, name, description, email, issuer_name, issuer_url, issuer_image_url, env_name ) + VALUES ('${tenant.id}','${tenant.name}', '${tenant.description}', '${tenant.email}', '${tenant.issuer_name}', '${tenant.issuer_url}', '${tenant.issuer_image_url}', '${tenant.env_name}' ) + `) + ) + ) + const insertedTemplates = await Promise.all( templates.map(template => conn.query(` INSERT IGNORE INTO template (id, name, description, template_json, image_url) From f063e8e91896024042ed60246c29dee5d4f20ce5 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 11:27:10 -0500 Subject: [PATCH 41/72] fix tenant seeding --- src/seed.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/seed.js b/src/seed.js index 1500f74..aef4767 100644 --- a/src/seed.js +++ b/src/seed.js @@ -1,6 +1,6 @@ import mariadb from 'mariadb'; import pool from './pool.js'; -import { credentials, templates, batches, categories, holders } from './seedData.js'; +import { credentials, templates, batches, categories, holders, tenants } from './seedData.js'; // Define connection parameters without // specifying a 'database' because we haven't got one yet @@ -192,7 +192,7 @@ async function seedTables(conn) { ) const insertedTenants = await Promise.all( - holders.map(tenant => conn.query(` + tenants.map(tenant => conn.query(` INSERT IGNORE INTO tenant (id, name, description, email, issuer_name, issuer_url, issuer_image_url, env_name ) VALUES ('${tenant.id}','${tenant.name}', '${tenant.description}', '${tenant.email}', '${tenant.issuer_name}', '${tenant.issuer_url}', '${tenant.issuer_image_url}', '${tenant.env_name}' ) `) From 8c2a59b972b7f230fe9427e3539ed0c7c4e40737 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 11:27:35 -0500 Subject: [PATCH 42/72] export tenant seed data --- src/seedData.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seedData.js b/src/seedData.js index 006b5b0..14577b8 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -304,4 +304,4 @@ const batches = [ { name: 'Fall2025', description: '1st batch for fall convocation', uploaded_csv: 'csv data', added_by: 'chartraj@mit.edu' } ]; -export { credentials, batches, categories, templates, holders }; +export { credentials, batches, categories, templates, holders, tenants }; From 16779aff686ba67910ccc6cad98775e187d78619 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 14:56:44 -0500 Subject: [PATCH 43/72] switch tenant name to tenant id --- src/queries.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/queries.js b/src/queries.js index b21bc47..8de4114 100644 --- a/src/queries.js +++ b/src/queries.js @@ -39,7 +39,7 @@ const commonCredQuery = `SELECT credential.status as status, credential.date_added as date_added, credential.cred_template_id, - credential.tenant_name + credential.tenant_id FROM credential INNER JOIN holder ON credential.holder_id = holder.id ` @@ -86,7 +86,7 @@ export const getCredential = async id => { } export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_name, added_by) values (?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_name, credential.added_by]); + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, added_by) values (?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.added_by]); return result; } @@ -95,8 +95,8 @@ export const updateCredential = async (id, credential) => { SET cred_name = ?, holder_id = ?, cred_template_id = ?, - tenant_name = ? - WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_name, id]); + tenant_id = ? + WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, id]); return result; } From ad1702f30052c18ea9a84250ef361598578c5f3c Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 14:57:50 -0500 Subject: [PATCH 44/72] switch tenant name to tenant id --- src/seed.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/seed.js b/src/seed.js index aef4767..cc5654c 100644 --- a/src/seed.js +++ b/src/seed.js @@ -59,7 +59,7 @@ async function addTables(conn) { cred_name VARCHAR(100) NOT NULL, verifiable_credential JSON, batch_id UUID, - tenant_name VARCHAR(100) NOT NULL, + tenant_id UUID NOT NULL, category_id UUID, cred_template_id UUID, email_template_id UUID, @@ -169,8 +169,8 @@ async function seedTables(conn) { // --- Insert Seed Data --- const insertedCredentials = await Promise.all( credentials.map(credential => conn.query(` - INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, category_id, status, date_added, tenant_name) - VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.category_id}', '${credential.status ?? "pending"}', '${credential.date_added}', '${credential.tenant_name}') + INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, category_id, status, date_added, tenant_id) + VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.category_id}', '${credential.status ?? "pending"}', '${credential.date_added}', '${credential.tenant_id}') `) ) ) From 8ee667b5e5b0efca172a463d5b69f97b799891a5 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 25 Feb 2026 14:58:40 -0500 Subject: [PATCH 45/72] change tenant name to id in seed data --- src/seedData.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/seedData.js b/src/seedData.js index 14577b8..b9cc949 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -144,7 +144,7 @@ const credentials = [ added_by: 'chartraj@mit.edu', status: 'collected', date_added: '2026-01-24 14:30:00', - tenant_name: 'test' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { category_id: categories[0].id, @@ -155,7 +155,7 @@ const credentials = [ added_by: 'chartraj@mit.edu', status: 'collected', date_added: '2026-01-24 14:30:00', - tenant_name: 'test' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { category_id: categories[1].id, @@ -165,7 +165,7 @@ const credentials = [ added_by: 'someone@mit.edu', status: 'notified', date_added: '2026-01-24 14:30:00', - tenant_name: 'test' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { category_id: categories[1].id, @@ -175,7 +175,7 @@ const credentials = [ added_by: 'someone@mit.edu', status: 'notified', date_added: '2026-01-24 14:30:00', - tenant_name: 'test' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { id: 'cdedcb59-39a0-43f7-a7a9-be6bd30b1a46', @@ -186,7 +186,7 @@ const credentials = [ added_by: 'someone@mit.edu', status: 'notified', date_added: '2025-12-24 14:30:00', - tenant_name: 'test' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { category_id: categories[0].id, @@ -195,7 +195,7 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', date_added: '2025-12-24 14:30:00', - tenant_name: 'test' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { category_id: categories[1].id, @@ -204,7 +204,7 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-12-24 14:30:00', - tenant_name: 'test' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { category_id: categories[0].id, @@ -213,7 +213,7 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'test' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { category_id: categories[1].id, @@ -222,7 +222,7 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'test' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { category_id: categories[0].id, @@ -231,7 +231,7 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'test' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { category_id: categories[1].id, @@ -240,7 +240,7 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'test' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { category_id: categories[0].id, @@ -249,7 +249,7 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'test' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { category_id: categories[1].id, @@ -258,7 +258,7 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_name: 'test' + tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' }, { category_id: categories[0].id, @@ -267,7 +267,7 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_name: 'test' + tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' }, { category_id: categories[1].id, @@ -276,7 +276,7 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_name: 'test' + tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' }, { category_id: categories[0].id, @@ -285,7 +285,7 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_name: 'test' + tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8' }, { category_id: categories[1].id, @@ -294,7 +294,7 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_name: 'test' + tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8' } ]; From 19b5c04136957bf477777992ad891b4083dab83b Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Thu, 26 Feb 2026 07:39:00 -0500 Subject: [PATCH 46/72] add template data to credential result --- src/queries.js | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/src/queries.js b/src/queries.js index 8de4114..3e1bc32 100644 --- a/src/queries.js +++ b/src/queries.js @@ -39,9 +39,20 @@ const commonCredQuery = `SELECT credential.status as status, credential.date_added as date_added, credential.cred_template_id, - credential.tenant_id + tenant.id as tenant_id, + tenant.env_name as tenant_env_name, + tenant.issuer_name as tenant_issuer_name, + tenant.issuer_image_url as tenant_issuer_image_url, + tenant.issuer_url as tenant_issuer_url, + template.id as template_id, + template.template_json as template_json, + template.name as template_name, + template.description as template_description, + template.image_url as template_image_url FROM credential INNER JOIN holder ON credential.holder_id = holder.id + INNER JOIN tenant ON credential.tenant_id = tenant.id + INNER JOIN template ON credential.cred_template_id = template.id ` export const fetchCredentials = async (queryTerm, currentPage) => { @@ -68,6 +79,7 @@ export const getCredential = async id => { const result = await pool.query(`${commonCredQuery} WHERE credential.id = ?`, [id]); const credential = result[0] + console.log("thge result: ", result) const holder = { id: credential.holder_id, name: credential.holder_name, @@ -75,13 +87,43 @@ export const getCredential = async id => { org_id: credential.holder_org_id, email: credential.holder_email } + + const tenant = { + id: credential.tenant_id, + issuer_name: credential.tenant_issuer_name, + issuer_url: credential.tenant_issuer_url, + issuer_image_url: credential.tenant_issuer_image_url, + env_name: credential.tenant_env_name + } + + const template = { + id: credential.template_id, + template_json: credential.template_json, + name: credential.template_name, + description: credential.template_description, + image_url: credential.template_image_url + } + delete credential.holder_id delete credential.holder_name delete credential.holder_did delete credential.holder_org_id delete credential.holder_email - - return {credential, holder} + + delete credential.tenant_id + delete credential.tenant_issuer_name + delete credential.tenant_issuer_url + delete credential.tenant_issuer_image_url + delete credential.tenant_env_name + + delete credential.template_id + delete credential.template_name + delete credential.template_description + delete credential.template_image_url + delete credential.template_json + + + return {credential, holder, tenant, template} } From a3acdd9a0821edaafd5de6fe4f0bd0a294037ad5 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Thu, 26 Feb 2026 08:09:27 -0500 Subject: [PATCH 47/72] remove console log --- src/queries.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/queries.js b/src/queries.js index 3e1bc32..8240c30 100644 --- a/src/queries.js +++ b/src/queries.js @@ -79,7 +79,6 @@ export const getCredential = async id => { const result = await pool.query(`${commonCredQuery} WHERE credential.id = ?`, [id]); const credential = result[0] - console.log("thge result: ", result) const holder = { id: credential.holder_id, name: credential.holder_name, From b32558aa883542f65b0ac17d7574f70f537d401e Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 2 Mar 2026 12:59:43 -0500 Subject: [PATCH 48/72] remove unused template id --- src/queries.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/queries.js b/src/queries.js index 8240c30..5dbcd50 100644 --- a/src/queries.js +++ b/src/queries.js @@ -120,6 +120,7 @@ export const getCredential = async id => { delete credential.template_description delete credential.template_image_url delete credential.template_json + delete credential.cred_template_id return {credential, holder, tenant, template} From e272d75539cd42057d6e737a2e32dcc95e943561 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 4 Mar 2026 17:07:48 -0500 Subject: [PATCH 49/72] add batch endpoint --- src/app.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 50c8e52..8330a97 100644 --- a/src/app.js +++ b/src/app.js @@ -22,7 +22,8 @@ import { addPickup, addNotification, lookupPickupToken, - fetchAllTenants + fetchAllTenants, + addBatch } from './queries.js' export async function build() { @@ -66,6 +67,16 @@ export async function build() { } }) + app.post('/batch', async function (req, res) { + let submittedBatch = req.body; + try { + const result = await addBatch(submittedBatch) + res.json({message: 'batch added'}); + } catch (err) { + throw err; + } + }) + app.post('/credentials/query', async function (req, res) { let query = req.body; try { From a7b8e55e921d2925c6c70630bd355355cffa0dd3 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Wed, 4 Mar 2026 17:21:56 -0500 Subject: [PATCH 50/72] add batch queries --- src/queries.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/queries.js b/src/queries.js index 5dbcd50..8d9a902 100644 --- a/src/queries.js +++ b/src/queries.js @@ -127,6 +127,39 @@ export const getCredential = async id => { } +export const addBatch = async batch => { + let conn; + try { + conn = await pool.getConnection(); + await conn.beginTransaction(); + + await addHolders(conn, batch.holders); + await addCredentials(conn, batch.credentials); + + await conn.commit(); + console.log("Transaction successful!"); + + } catch (err) { + if (conn) await conn.rollback(); + console.error("Transaction failed:", err); + throw err; + } finally { + if (conn) return conn.release(); + } +} + +export const addHolders = async holders => { + const queryValues = holders.map(holder=>`${holder.name},${holder.did},${holder.email},${holder.org_id},`).join(',') + const result = await pool.query(`insert into holder (name, did, email, org_id) values ${queryValues}`); + return result; +} + +export const addCredentials = async credentials => { + const queryValues = credentials.map(credential=>`${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.added_by}`).join(',') + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, added_by) values ${queryValues}`); + return result; +} + export const addCredential = async credential => { const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, added_by) values (?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.added_by]); return result; From b5eb681ebbbb77d707ff9bac98bcdaac53fc7619 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 6 Mar 2026 08:24:30 -0500 Subject: [PATCH 51/72] make holder email unique --- src/seed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seed.js b/src/seed.js index cc5654c..fc73d06 100644 --- a/src/seed.js +++ b/src/seed.js @@ -113,7 +113,7 @@ async function addTables(conn) { CREATE TABLE IF NOT EXISTS holder ( id UUID NOT NULL DEFAULT UUID(), name VARCHAR(100) NOT NULL, - email VARCHAR(100), + email VARCHAR(100) NOT NULL UNIQUE, org_id VARCHAR(100), did VARCHAR(255), PRIMARY KEY (id) From ceed0d61c2154616720cc9155edb027b4fa57abf Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 9 Mar 2026 16:09:22 -0400 Subject: [PATCH 52/72] add endpoint to check for email duplicates --- src/app.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 8330a97..7a84f3c 100644 --- a/src/app.js +++ b/src/app.js @@ -19,6 +19,7 @@ import { updateHolder, fetchCredentialsForHolder, fetchCredentialCountForHolder, + checkForHolderDuplicates, addPickup, addNotification, lookupPickupToken, @@ -152,13 +153,24 @@ export async function build() { const id = req.params.id let updatedValues = req.body; try { - const result = updateHolder(id, updatedValues); - res.send(result); + const result = await updateHolder(id, updatedValues); + res.send(result); } catch (err) { throw err; } }) + app.post('/holders/duplicates', async function (req, res) { + const emailList = req.body; + try { + const result = await checkForHolderDuplicates(emailList); + res.json(result) + } catch (e) { + throw e + } + + }) + app.post('/credentials/count', async function (req, res) { let query = req.body; try { From 047a83c63bce6eb3b85c6c8c58a96a384c29d42b Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 9 Mar 2026 16:09:41 -0400 Subject: [PATCH 53/72] add query to check for email duplicates --- src/queries.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/queries.js b/src/queries.js index 8d9a902..cb6c2df 100644 --- a/src/queries.js +++ b/src/queries.js @@ -148,14 +148,23 @@ export const addBatch = async batch => { } } -export const addHolders = async holders => { - const queryValues = holders.map(holder=>`${holder.name},${holder.did},${holder.email},${holder.org_id},`).join(',') - const result = await pool.query(`insert into holder (name, did, email, org_id) values ${queryValues}`); +export const checkForHolderDuplicates = async emailList => { + const emailsAsStrings = emailList.map(email=>`'${email}'`).join(',') + const query = `SELECT * FROM holder WHERE email IN (${emailsAsStrings})`; + const result = await pool.query(query); + return result +} + +export const addHolders = async data => { + const added_by = data.added_by + const queryValues = data.holders.map(holder=>`(${holder.name},${holder.did},${holder.email},${holder.org_id}, ${added_by})`).join(',') + const result = await pool.query(`insert into holder (name, did, email, org_id, added_by) values ${queryValues}`); return result; } export const addCredentials = async credentials => { - const queryValues = credentials.map(credential=>`${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.added_by}`).join(',') + // TODO, this is a batch so will need to add the batch info, ie., batch description (category???), templateId, csv file. + const queryValues = credentials.map(credential=>`(${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.added_by})`).join(',') const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, added_by) values ${queryValues}`); return result; } From cc6934917ce30b851478c0a43d312bbb8d9d9b0f Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 9 Mar 2026 16:10:35 -0400 Subject: [PATCH 54/72] add template id to batch record --- src/seed.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/seed.js b/src/seed.js index fc73d06..02e57e2 100644 --- a/src/seed.js +++ b/src/seed.js @@ -140,6 +140,7 @@ async function addTables(conn) { name VARCHAR(100) NOT NULL, uploaded_csv BLOB, description VARCHAR(255), + template_id UUID NOT NULL, date_added DATETIME DEFAULT CURRENT_TIMESTAMP, added_by VARCHAR(100), PRIMARY KEY (id) From b22568c4e0bca56488e63355ca05ad9d7d2f11bb Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 10 Mar 2026 07:54:33 -0400 Subject: [PATCH 55/72] add addHolders endpoint' --- src/app.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/app.js b/src/app.js index 7a84f3c..116d8db 100644 --- a/src/app.js +++ b/src/app.js @@ -16,6 +16,7 @@ import { fetchHolderCount, getHolder, addHolder, + addHolders, updateHolder, fetchCredentialsForHolder, fetchCredentialCountForHolder, @@ -139,6 +140,16 @@ export async function build() { } }) + app.post('/holders', async function (req, res) { + let holders = req.body; + try { + const result = await addHolders(holders) + res.json(result); + } catch (err) { + throw err; + } + }) + app.get('/holder/:id', async function (req, res) { const id = req.params.id try { From 7c361bc4cd127481ec544a226489248b55cb5fb4 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 10 Mar 2026 09:45:20 -0400 Subject: [PATCH 56/72] add added_by and updated_by columns for holder table --- src/seed.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/seed.js b/src/seed.js index 02e57e2..49ac098 100644 --- a/src/seed.js +++ b/src/seed.js @@ -116,6 +116,8 @@ async function addTables(conn) { email VARCHAR(100) NOT NULL UNIQUE, org_id VARCHAR(100), did VARCHAR(255), + added_by VARCHAR(100) NOT NULL, + updated_by VARCHAR(100), PRIMARY KEY (id) ); `) @@ -186,8 +188,8 @@ async function seedTables(conn) { const insertedHolder = await Promise.all( holders.map(holder => conn.query(` - INSERT IGNORE INTO holder (id, name, email, org_id, did) - VALUES ('${holder.id}','${holder.name}', '${holder.email}', '${holder.org_id}', ${holder.did ? "'" + holder.did + "'" : 'NULL'}) + INSERT IGNORE INTO holder (id, name, email, org_id, did, added_by) + VALUES ('${holder.id}','${holder.name}', '${holder.email}', '${holder.org_id}', ${holder.did ? "'" + holder.did + "'" : 'NULL'}, '${holder.added_by}') `) ) ) From a5e3e2799093481e7666b9493a0fc300125044f5 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 10 Mar 2026 09:46:40 -0400 Subject: [PATCH 57/72] fix success objects for adds and updates --- src/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.js b/src/app.js index 116d8db..3cc510d 100644 --- a/src/app.js +++ b/src/app.js @@ -134,7 +134,7 @@ export async function build() { let submittedHolder = req.body; try { const result = await addHolder(submittedHolder) - res.json(result); + res.json({success:true}); } catch (err) { throw err; } @@ -144,7 +144,7 @@ export async function build() { let holders = req.body; try { const result = await addHolders(holders) - res.json(result); + res.json({success:true}); } catch (err) { throw err; } @@ -165,7 +165,7 @@ export async function build() { let updatedValues = req.body; try { const result = await updateHolder(id, updatedValues); - res.send(result); + res.json({success:true}); } catch (err) { throw err; } From cdf8059257bf564c53588bc131c07bbdd17a57d3 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 10 Mar 2026 09:48:33 -0400 Subject: [PATCH 58/72] fix holder queries --- src/queries.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/queries.js b/src/queries.js index cb6c2df..1df1c68 100644 --- a/src/queries.js +++ b/src/queries.js @@ -157,7 +157,7 @@ export const checkForHolderDuplicates = async emailList => { export const addHolders = async data => { const added_by = data.added_by - const queryValues = data.holders.map(holder=>`(${holder.name},${holder.did},${holder.email},${holder.org_id}, ${added_by})`).join(',') + const queryValues = data.holders.map(holder=>`('${holder.name}','${holder.did}','${holder.email}','${holder.org_id}', '${added_by}')`).join(',') const result = await pool.query(`insert into holder (name, did, email, org_id, added_by) values ${queryValues}`); return result; } @@ -245,18 +245,19 @@ export const getHolder = async id => { return result[0] } -export const addHolder = async holder => { - const result = await pool.query(`insert into holder (name, did, email, org_id) values (?,?,?,?)`, [holder.name, holder.did, holder.email, holder.org_id]); +export const addHolder = async data => { + const result = await pool.query(`insert into holder (name, did, email, org_id, added_by) values (?,?,?,?,?)`, [data.holder.name, data.holder.did, data.holder.email, data.holder.org_id, data.added_by]); return result; } -export const updateHolder = async (id, holder) => { +export const updateHolder = async (id, data) => { const result = await pool.query(`UPDATE holder SET name = ?, did = ?, email = ?, - org_id = ? - WHERE id = ?`, [holder.name, holder.did, holder.email, holder.org_id, id]); + org_id = ?, + updated_by = ? + WHERE id = ?`, [data.holder.name, data.holder.did, data.holder.email, data.holder.org_id, data.updated_by, id]); return result; } @@ -269,7 +270,6 @@ export const lookupPickupToken = async pickupToken => { //we do the pickup lookup separately so that //we can show a different message if the token is good, but there are no creds for the holder const tokenLookupResult = await pool.query(`SELECT * FROM notification WHERE pickup_token = ?`, [pickupToken]); - console.log("token lookup result: ", tokenLookupResult) const holderId = tokenLookupResult[0].holder_id; return fetchCredentialsForHolder(holderId) } From 0fa7531a2bb5d66d38268e10c15c566fdef149e9 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 10 Mar 2026 09:48:57 -0400 Subject: [PATCH 59/72] add added_by values to holder seed data --- src/seedData.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/seedData.js b/src/seedData.js index b9cc949..21714c7 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -20,34 +20,39 @@ const holders = [ name: 'James Chartrand', email: 'jc.chartrand@gmail.com', did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:me', - org_id: '1' + org_id: '1', + added_by: 'jc.chartrand@gmail.com' }, { id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', name: 'Taylor Tuna', email: 'taylor@pacific.sea', did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:tuna', - org_id: '2' + org_id: '2', + added_by: 'jc.chartrand@gmail.com' }, { id: 'C74643D6-6771-4510-B3BC-9442DAED936D', name: 'Sam Salmon', email: 'sam@pacific.sea', did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:salmon', - org_id: '3' + org_id: '3', + added_by: 'jc.chartrand@gmail.com' }, { id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', name: 'Charlie Crayfish', email: 'charlie@pacific.sea', did: 'did:web:digitalcredentials.github.io:vc-test-fixtures:dids:crayfish', - org_id: '4' + org_id: '4', + added_by: 'jc.chartrand@gmail.com' }, { id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', name: 'Harper Haddock', email: 'harper@pacific.sea', - org_id: '5' + org_id: '5', + added_by: 'jc.chartrand@gmail.com' } ]; From 4f138105a395008f6c44a8bc083cc0624cbced65 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 16 Mar 2026 08:04:58 -0400 Subject: [PATCH 60/72] add tag and credentials endpoints --- src/app.js | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 3cc510d..255197a 100644 --- a/src/app.js +++ b/src/app.js @@ -2,7 +2,8 @@ import express from 'express' import cors from 'cors' import {createDatabase, seedDatabase} from './seed.js' import { - fetchCredentials, + fetchCredentials, + fetchAllCredentials, fetchCredentialCount, addCredential, updateCredential, @@ -25,7 +26,11 @@ import { addNotification, lookupPickupToken, fetchAllTenants, - addBatch + addBatch, + getAllTags, + getTag, + updateTag, + addTag } from './queries.js' export async function build() { @@ -160,6 +165,17 @@ export async function build() { } }) + app.get('/credentials', async function (req, res) { + const id = req.params.id + try { + const result = await fetchAllCredentials(); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.put('/holder/:id', async function (req, res) { const id = req.params.id let updatedValues = req.body; @@ -251,6 +267,47 @@ export async function build() { } }) + app.get('/tags', async function (req, res) { + try { + const result = await getAllTags(); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.get('/tag/:id', async function (req, res) { + const id = req.params.id + try { + const result = await getTag(id); + res.send(result); + } catch (err) { + throw err; + } + }) + + app.put('/tag/:id', async function (req, res) { + const id = req.params.id + let updatedValues = req.body; + try { + const result = updateTag(id, updatedValues); + res.json({success:true}); + } catch (err) { + throw err; + } + }) + + app.post('/tag', async function (req, res) { + let data = req.body; + try { + const result = await addTag(data) + res.json({success:true}); + } catch (err) { + throw err; + } + }) + + app.get('/tenants', async function (req, res) { try { const result = await fetchAllTenants(); From ec9adaf0eea7af75b017d41b84a6def0322af9d3 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 16 Mar 2026 08:05:15 -0400 Subject: [PATCH 61/72] add tag and credentials queries --- src/queries.js | 56 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/src/queries.js b/src/queries.js index 1df1c68..e2eaff1 100644 --- a/src/queries.js +++ b/src/queries.js @@ -1,7 +1,7 @@ import pool from './pool.js' export const fetchAllCredentials = async () => { - return await pool.query("select * from credential"); + return await pool.query(commonCredQuery); } export const fetchBatches = async (limit) => { @@ -48,11 +48,15 @@ const commonCredQuery = `SELECT template.template_json as template_json, template.name as template_name, template.description as template_description, - template.image_url as template_image_url + template.image_url as template_image_url, + tag.id as tag_id, + tag.name as tag_name, + tag.description as tag_description FROM credential INNER JOIN holder ON credential.holder_id = holder.id INNER JOIN tenant ON credential.tenant_id = tenant.id INNER JOIN template ON credential.cred_template_id = template.id + INNER JOIN tag ON credential.tag_id = tag.id ` export const fetchCredentials = async (queryTerm, currentPage) => { @@ -75,6 +79,31 @@ export const getTemplate = async id => { return template } +export const getAllTags = async () => { + const result = await pool.query(`SELECT * FROM tag`); + const tag = result + return tag +} + +export const getTag = async id => { + const result = await pool.query(`SELECT * FROM tag WHERE id = ?`, [id]); + const tag = result[0] + return tag +} + +export const addTag = async tag => { + const result = await pool.query(`INSERT INTO tag (name, description) VALUES (?,?)`, [tag.name, tag.description]); + return result; +} + +export const updateTag = async (id, tag) => { + const result = await pool.query(`UPDATE tag + SET name = ?, + description = ? + WHERE id = ?`, [tag.name, tag.description, id]); + return result; +} + export const getCredential = async id => { const result = await pool.query(`${commonCredQuery} WHERE credential.id = ?`, [id]); @@ -103,6 +132,12 @@ export const getCredential = async id => { image_url: credential.template_image_url } + const tag = { + id: credential.tag_id, + name: credential.tag_name, + description: credential.tag_description + } + delete credential.holder_id delete credential.holder_name delete credential.holder_did @@ -122,8 +157,11 @@ export const getCredential = async id => { delete credential.template_json delete credential.cred_template_id + delete credential.tag_id + delete credential.tag_name + delete credential.tag_description - return {credential, holder, tenant, template} + return {credential, holder, tenant, template, tag} } @@ -164,13 +202,13 @@ export const addHolders = async data => { export const addCredentials = async credentials => { // TODO, this is a batch so will need to add the batch info, ie., batch description (category???), templateId, csv file. - const queryValues = credentials.map(credential=>`(${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.added_by})`).join(',') - const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, added_by) values ${queryValues}`); + const queryValues = credentials.map(credential=>`(${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.tag_id},${credential.added_by})`).join(',') + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, tag_id, added_by) values ${queryValues}`); return result; } export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, added_by) values (?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.added_by]); + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, tag_id, added_by) values (?,?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.tag_id, credential.added_by]); return result; } @@ -179,8 +217,9 @@ export const updateCredential = async (id, credential) => { SET cred_name = ?, holder_id = ?, cred_template_id = ?, - tenant_id = ? - WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, id]); + tenant_id = ?, + tag_id = ? + WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.tag_id, id]); return result; } @@ -198,7 +237,6 @@ export const fetchHolders = async (queryTerm, currentPage) => { return {holders,count} } - export const fetchHolderCount = async (queryTerm) => { const result = await pool.query(`SELECT COUNT(*) as count FROM holder WHERE From c02afa933f1e83ea1587f01dc88c3884b54d1510 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 16 Mar 2026 08:05:38 -0400 Subject: [PATCH 62/72] update seed data --- src/seedData.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/seedData.js b/src/seedData.js index 21714c7..893dc23 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -1,7 +1,6 @@ - import testVC from './vc-templates/test-vc.js' -const categories = [ +const tags = [ { id: 'd6e15727-9fe1-4961-8c5b-ea44a9bd81aa', name: 'Spring2026', @@ -142,7 +141,7 @@ const templates = [ const credentials = [ { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[1].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', @@ -152,7 +151,7 @@ const credentials = [ tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[1].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', @@ -163,7 +162,7 @@ const credentials = [ tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[2].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', @@ -173,7 +172,7 @@ const credentials = [ tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', @@ -184,7 +183,7 @@ const credentials = [ }, { id: 'cdedcb59-39a0-43f7-a7a9-be6bd30b1a46', - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Scientific", cred_template_id: templates[2].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', @@ -194,7 +193,7 @@ const credentials = [ tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[3].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', @@ -203,7 +202,7 @@ const credentials = [ tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[0].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', @@ -212,7 +211,7 @@ const credentials = [ tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', @@ -221,7 +220,7 @@ const credentials = [ tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[1].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', @@ -230,7 +229,7 @@ const credentials = [ tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[3].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', @@ -239,7 +238,7 @@ const credentials = [ tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[3].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', @@ -248,7 +247,7 @@ const credentials = [ tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[1].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', @@ -257,7 +256,7 @@ const credentials = [ tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[0].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', @@ -266,7 +265,7 @@ const credentials = [ tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[0].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', @@ -275,7 +274,7 @@ const credentials = [ tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[2].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', @@ -284,7 +283,7 @@ const credentials = [ tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' }, { - category_id: categories[0].id, + tag_id: tags[0].id, cred_name: "Bachelor of Arts", cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', @@ -293,7 +292,7 @@ const credentials = [ tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8' }, { - category_id: categories[1].id, + tag_id: tags[1].id, cred_name: "Master of Science", cred_template_id: templates[0].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', @@ -309,4 +308,4 @@ const batches = [ { name: 'Fall2025', description: '1st batch for fall convocation', uploaded_csv: 'csv data', added_by: 'chartraj@mit.edu' } ]; -export { credentials, batches, categories, templates, holders, tenants }; +export { credentials, batches, tags, templates, holders, tenants }; From b8a8a97a7f0ce6622db93f4894f976419b09945d Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Mon, 16 Mar 2026 08:05:54 -0400 Subject: [PATCH 63/72] update seeding statements --- src/seed.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/seed.js b/src/seed.js index 49ac098..0b373e6 100644 --- a/src/seed.js +++ b/src/seed.js @@ -1,6 +1,6 @@ import mariadb from 'mariadb'; import pool from './pool.js'; -import { credentials, templates, batches, categories, holders, tenants } from './seedData.js'; +import { credentials, templates, batches, tags, holders, tenants } from './seedData.js'; // Define connection parameters without // specifying a 'database' because we haven't got one yet @@ -40,7 +40,7 @@ async function dropTables(conn) { try { console.log('Dropping all tables...'); - await conn.query(`DROP TABLE IF EXISTS credential, category, batch, template, holder, notification, pickup, tenant;`); + await conn.query(`DROP TABLE IF EXISTS credential, tag, batch, template, holder, notification, pickup, tenant;`); console.log('All tables successfully dropped.'); } catch (err) { console.error('Error trying to drop tables:', err); @@ -60,11 +60,11 @@ async function addTables(conn) { verifiable_credential JSON, batch_id UUID, tenant_id UUID NOT NULL, - category_id UUID, + tag_id UUID, cred_template_id UUID, email_template_id UUID, holder_id UUID NOT NULL, - status ENUM('pending', 'notified', 'collected', 'revoked', 'deactivated') NOT NULL DEFAULT 'pending', + status ENUM('hidden','collectable','revoked') NOT NULL DEFAULT 'hidden', date_added DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, date_notified DATETIME, date_collected DATETIME, @@ -150,7 +150,7 @@ async function addTables(conn) { `) await conn.query(` - CREATE TABLE IF NOT EXISTS category ( + CREATE TABLE IF NOT EXISTS tag ( id UUID NOT NULL DEFAULT UUID(), name VARCHAR(100) NOT NULL, description VARCHAR(255), @@ -172,8 +172,8 @@ async function seedTables(conn) { // --- Insert Seed Data --- const insertedCredentials = await Promise.all( credentials.map(credential => conn.query(` - INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, category_id, status, date_added, tenant_id) - VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.category_id}', '${credential.status ?? "pending"}', '${credential.date_added}', '${credential.tenant_id}') + INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, tag_id, status, date_added, tenant_id) + VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.tag_id}', '${credential.status ?? "pending"}', '${credential.date_added}', '${credential.tenant_id}') `) ) ) @@ -210,10 +210,10 @@ async function seedTables(conn) { ) ) - const insertedCategories = await Promise.all( - categories.map(category => conn.query(` - INSERT IGNORE INTO category (id, name, description) - VALUES ('${category.id}', '${category.name}', '${category.description}') + const insertedTags = await Promise.all( + tags.map(tag => conn.query(` + INSERT IGNORE INTO tag (id, name, description) + VALUES ('${tag.id}', '${tag.name}', '${tag.description}') `) ) ) From c7f7f9ca1fa388c4b7268bac9711f250dfab996f Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 17 Mar 2026 15:27:46 -0400 Subject: [PATCH 64/72] remove revoked from status enum --- src/seed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seed.js b/src/seed.js index 0b373e6..e36884c 100644 --- a/src/seed.js +++ b/src/seed.js @@ -64,7 +64,7 @@ async function addTables(conn) { cred_template_id UUID, email_template_id UUID, holder_id UUID NOT NULL, - status ENUM('hidden','collectable','revoked') NOT NULL DEFAULT 'hidden', + status ENUM('hidden','collectable') NOT NULL DEFAULT 'collectable', date_added DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, date_notified DATETIME, date_collected DATETIME, From e84ab045f5a0d7cf44d3424652b30e3359598f92 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 17 Mar 2026 18:01:41 -0400 Subject: [PATCH 65/72] add updateCredentials endpoint --- src/app.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 255197a..3817497 100644 --- a/src/app.js +++ b/src/app.js @@ -6,7 +6,8 @@ import { fetchAllCredentials, fetchCredentialCount, addCredential, - updateCredential, + updateCredential, + updateCredentials, getCredential, getReportData, fetchBatches, @@ -239,6 +240,16 @@ export async function build() { } }) + app.put('/credentials', async function (req, res) { + let updatedValues = req.body; + try { + const result = updateCredentials(updatedValues); + res.send(result); + } catch (err) { + throw err; + } + }) + app.get('/report', async function (req, res) { try { From f0c2caf845e637bc389bcf1ac6e99a23a01103c3 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 17 Mar 2026 18:02:17 -0400 Subject: [PATCH 66/72] add updateCredentials query --- src/queries.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/queries.js b/src/queries.js index e2eaff1..3d0a1c3 100644 --- a/src/queries.js +++ b/src/queries.js @@ -222,6 +222,19 @@ export const updateCredential = async (id, credential) => { WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.tag_id, id]); return result; } + +export const updateCredentials = async (values) => { + const credentialIdList = values.cred_ids.split(',').map(credId=>`'${credId}'`).join() + const result = await pool.query(`UPDATE credential + SET status = ?, + cred_template_id = ?, + tenant_id = ?, + tag_id = ?, + updated_by = ? + WHERE id IN (${credentialIdList})`, [values.status, values.cred_template_id, values.tenant_id, values.tag_id, values.updated_by]); + return result; +} + export const fetchHolders = async (queryTerm, currentPage) => { const offset = (currentPage - 1) * ITEMS_PER_PAGE; From 76e703290f939c25c97ee481f5c72453d4f48900 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Tue, 17 Mar 2026 18:02:45 -0400 Subject: [PATCH 67/72] add updated_by field to credential --- src/seed.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/seed.js b/src/seed.js index e36884c..6ba36c3 100644 --- a/src/seed.js +++ b/src/seed.js @@ -71,6 +71,7 @@ async function addTables(conn) { date_revoked DATETIME, revoked_by VARCHAR(100), added_by VARCHAR(100) NOT NULL, + updated_by VARCHAR(100), PRIMARY KEY (id) ); `); From 680397e1ae298aa9569d85fd51cdca06ebae4f22 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 20 Mar 2026 12:59:28 -0400 Subject: [PATCH 68/72] fix incoming tag edit/update --- src/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 3817497..fe1370e 100644 --- a/src/app.js +++ b/src/app.js @@ -299,7 +299,7 @@ export async function build() { app.put('/tag/:id', async function (req, res) { const id = req.params.id - let updatedValues = req.body; + let updatedValues = req.body.tag; try { const result = updateTag(id, updatedValues); res.json({success:true}); @@ -309,7 +309,7 @@ export async function build() { }) app.post('/tag', async function (req, res) { - let data = req.body; + let data = req.body.tag; try { const result = await addTag(data) res.json({success:true}); From cacd2c45a1b2ed5c6da903d00a5f47ac32897ffe Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 27 Mar 2026 14:21:56 -0400 Subject: [PATCH 69/72] add tenant api calls --- src/app.js | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index fe1370e..249e269 100644 --- a/src/app.js +++ b/src/app.js @@ -27,6 +27,9 @@ import { addNotification, lookupPickupToken, fetchAllTenants, + getTenant, + addTenant, + updateTenant, addBatch, getAllTags, getTag, @@ -146,6 +149,16 @@ export async function build() { } }) + app.post('/tenant', async function (req, res) { + let data = req.body; + try { + const result = await addTenant(data) + res.json({success:true}); + } catch (err) { + throw err; + } + }) + app.post('/holders', async function (req, res) { let holders = req.body; try { @@ -166,6 +179,16 @@ export async function build() { } }) + app.get('/tenant/:id', async function (req, res) { + const id = req.params.id + try { + const result = await getTenant(id); + res.send(result); + } catch (err) { + throw err; + } + }) + app.get('/credentials', async function (req, res) { const id = req.params.id try { @@ -177,7 +200,7 @@ export async function build() { }) - app.put('/holder/:id', async function (req, res) { + app.put('/holder/:id', async function (req, res) { const id = req.params.id let updatedValues = req.body; try { @@ -188,6 +211,18 @@ export async function build() { } }) + app.put('/tenant/:id', async function (req, res) { + const id = req.params.id + let updatedValues = req.body; + try { + const result = await updateTenant(id, updatedValues); + res.json({success:true}); + } catch (err) { + throw err; + } + }) + + app.post('/holders/duplicates', async function (req, res) { const emailList = req.body; try { From 3b99df6eb037169cdd41d32f93c2a356b3af1505 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 27 Mar 2026 14:23:35 -0400 Subject: [PATCH 70/72] add validFrom/Until columns to cred table; added_by, updated_by, is_active to tenant table --- src/seed.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/seed.js b/src/seed.js index 6ba36c3..26459bd 100644 --- a/src/seed.js +++ b/src/seed.js @@ -64,12 +64,10 @@ async function addTables(conn) { cred_template_id UUID, email_template_id UUID, holder_id UUID NOT NULL, + valid_from DATE DEFAULT NULL, + valid_until DATE DEFAULT NULL, status ENUM('hidden','collectable') NOT NULL DEFAULT 'collectable', date_added DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, - date_notified DATETIME, - date_collected DATETIME, - date_revoked DATETIME, - revoked_by VARCHAR(100), added_by VARCHAR(100) NOT NULL, updated_by VARCHAR(100), PRIMARY KEY (id) @@ -127,12 +125,15 @@ async function addTables(conn) { CREATE TABLE IF NOT EXISTS tenant ( id UUID NOT NULL DEFAULT UUID(), name VARCHAR(100) NOT NULL, - description VARCHAR(255), + description VARCHAR(255) NOT NULL, email VARCHAR(100) NOT NULL, issuer_name VARCHAR(100) NOT NULL, issuer_image_url VARCHAR(300) NOT NULL, issuer_url VARCHAR(300) NOT NULL, env_name VARCHAR(100) NOT NULL, + is_active BOOLEAN NOT NULL DEFAULT TRUE, + added_by VARCHAR(100) NOT NULL, + updated_by VARCHAR(100), PRIMARY KEY (id) ); `) @@ -173,8 +174,18 @@ async function seedTables(conn) { // --- Insert Seed Data --- const insertedCredentials = await Promise.all( credentials.map(credential => conn.query(` - INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, tag_id, status, date_added, tenant_id) - VALUES ('${credential.cred_name}', '${credential.cred_template_id}', '${credential.holder_id}', '${credential.added_by}', '${credential.tag_id}', '${credential.status ?? "pending"}', '${credential.date_added}', '${credential.tenant_id}') + INSERT IGNORE INTO credential (cred_name, cred_template_id, holder_id, added_by, tag_id, status, valid_from, valid_until, date_added, tenant_id) + VALUES ( + '${credential.cred_name}', + '${credential.cred_template_id}', + '${credential.holder_id}', + '${credential.added_by}', + '${credential.tag_id}', + '${credential.status}', + ${credential.valid_from ? "'" + credential.valid_from + "'" : 'NULL'}, + ${credential.valid_until ? "'" + credential.valid_until + "'" : 'NULL'}, + '${credential.date_added}', + '${credential.tenant_id}') `) ) ) From 17f077b991c3987861cc3bb0382a2f9c681e9a20 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 27 Mar 2026 14:24:27 -0400 Subject: [PATCH 71/72] update tenant and credential queries --- src/queries.js | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/src/queries.js b/src/queries.js index 3d0a1c3..847ac3b 100644 --- a/src/queries.js +++ b/src/queries.js @@ -39,6 +39,8 @@ const commonCredQuery = `SELECT credential.status as status, credential.date_added as date_added, credential.cred_template_id, + credential.valid_from, + credential.valid_until, tenant.id as tenant_id, tenant.env_name as tenant_env_name, tenant.issuer_name as tenant_issuer_name, @@ -202,13 +204,13 @@ export const addHolders = async data => { export const addCredentials = async credentials => { // TODO, this is a batch so will need to add the batch info, ie., batch description (category???), templateId, csv file. - const queryValues = credentials.map(credential=>`(${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.tag_id},${credential.added_by})`).join(',') - const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, tag_id, added_by) values ${queryValues}`); + const queryValues = credentials.map(credential=>`(${credential.cred_name},${credential.holder_id},${credential.cred_template_id},${credential.tenant_id},${credential.status},${credential.tag_id},${credential.valid_from},${credential.valid_until},${credential.added_by})`).join(',') + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, status, tag_id, valid_from, valid_until, added_by) values ${queryValues}`); return result; } export const addCredential = async credential => { - const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, tag_id, added_by) values (?,?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.tag_id, credential.added_by]); + const result = await pool.query(`insert into credential (cred_name, holder_id, cred_template_id, tenant_id, status, tag_id, valid_from, valid_until, added_by) values (?,?,?,?,?,?,?,?,?)`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.status, credential.tag_id, credential.valid_from, credential.valid_until, credential.added_by]); return result; } @@ -218,8 +220,11 @@ export const updateCredential = async (id, credential) => { holder_id = ?, cred_template_id = ?, tenant_id = ?, - tag_id = ? - WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.tag_id, id]); + status = ?, + tag_id = ?, + valid_from = ?, + valid_until = ? + WHERE id = ?`, [credential.cred_name, credential.holder_id, credential.cred_template_id, credential.tenant_id, credential.status, credential.tag_id, credential.valid_from, credential.valid_until ,id]); return result; } @@ -229,9 +234,10 @@ export const updateCredentials = async (values) => { SET status = ?, cred_template_id = ?, tenant_id = ?, + status = ?, tag_id = ?, updated_by = ? - WHERE id IN (${credentialIdList})`, [values.status, values.cred_template_id, values.tenant_id, values.tag_id, values.updated_by]); + WHERE id IN (${credentialIdList})`, [values.status, values.cred_template_id, values.tenant_id, values.status, values.tag_id, values.updated_by]); return result; } @@ -312,6 +318,32 @@ export const updateHolder = async (id, data) => { return result; } +export const getTenant = async id => { + const result = await pool.query(`SELECT * FROM tenant WHERE id = ?`, [id]); + return result[0] +} + +export const addTenant = async data => { + const result = await pool.query(`insert into tenant (name, description, email, issuer_name, issuer_url, issuer_image_url, env_name, is_active, added_by) values (?,?,?,?,?,?,?,?,?)`, + [data.tenant.name, data.tenant.description, data.tenant.email, data.tenant.issuer_name, data.tenant.issuer_url, data.tenant.issuer_image_url, data.tenant.env_name, data.tenant.is_active, data.added_by]); + return result; +} + +export const updateTenant = async (id, data) => { + const result = await pool.query(`UPDATE tenant + SET name = ?, + description = ?, + email = ?, + issuer_name = ?, + issuer_url = ?, + issuer_image_url = ?, + env_name = ?, + is_active = ?, + updated_by = ? + WHERE id = ?`, [data.tenant.name, data.tenant.description, data.tenant.email, data.tenant.issuer_name, data.tenant.issuer_url, data.tenant.issuer_image_url, data.tenant.env_name, data.tenant.is_active, data.updated_by, id]); + return result; +} + export const addPickup = async pickup => { const result = await pool.query(`INSERT INTO pickup (credential_id, template_id, pickup_token) VALUES (?,?,?) RETURNING id`, [pickup.credential_id, pickup.template_id, pickup.pickup_token]); return result[0]; From 441b93359e2291323b9600cb9979ac8eab59b749 Mon Sep 17 00:00:00 2001 From: James Chartrand Date: Fri, 27 Mar 2026 14:24:58 -0400 Subject: [PATCH 72/72] update seed data --- src/seedData.js | 106 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 80 insertions(+), 26 deletions(-) diff --git a/src/seedData.js b/src/seedData.js index 893dc23..bd1bbc1 100644 --- a/src/seedData.js +++ b/src/seedData.js @@ -11,6 +11,16 @@ const tags = [ name: 'Fall2026', description: 'Fall Convocation' }, + { + id: '3958dc9e-712f-4377-85e9-fec226a6442a', + name: 'BostonMeeting2024', + description: 'Conference attendance' + }, + { + id: '3958dc9e-712f-4377-85e9-fec4b6a9842a', + name: 'DefltMeeting2025', + description: 'Conference attendance' + } ]; const holders = [ @@ -60,7 +70,7 @@ const tenants = [ id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8', name: 'Economics Department', email: 'jc.chartrand@gmail.com', - desciption: 'Economics Department Signer', + description: 'Economics Department Signer', env_name: 'UN_PROTECTED_TEST', issuer_name: 'Wonderful U - Department of Economics', issuer_url: 'https://econ.wonderfulu.edu', @@ -70,7 +80,7 @@ const tenants = [ id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF', name: 'Chemistry Department', email: 'jc.chartrand@gmail.com', - desciption: 'Chemistry Department Signer', + description: 'Chemistry Department Signer', env_name: 'PROTECTED_TEST', issuer_name: 'Wonderful U - Department of Che istry', issuer_url: 'https://chem.wonderfulu.edu', @@ -80,7 +90,7 @@ const tenants = [ id: '262F661C-4A25-4279-8474-0EB302D714BD', name: 'Continuing Education', email: 'jc.chartrand@gmail.com', - desciption: 'Continuing Education Signer', + description: 'Continuing Education Signer', env_name: 'RANDOMING_TESTING', issuer_name: 'Wonderful U - Continuing Education', issuer_url: 'https://con-ed.wonderfulu.edu', @@ -90,7 +100,7 @@ const tenants = [ id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1', name: 'Registrar', email: 'jc.chartrand@gmail.com', - desciption: 'For signing miscellaneous registrarial documents,', + description: 'For signing miscellaneous registrarial documents,', env_name: 'TEST', issuer_name: 'Wonderful U - Registrar', issuer_url: 'https://registrar.wonderfulu.edu', @@ -115,6 +125,7 @@ const templates = [ name: 'Bachelor of Engineering', description: 'Standard Bachelor of Engineering', image_url: '/customers/evil-rabbit.png', + added_by: 'jc.chartrand@gmail.com' }, { id: '76d65c26-f784-44a2-ac19-586678f7c2f2', @@ -122,6 +133,7 @@ const templates = [ name: 'Bachelor of Science', description: 'Standard Bachelor of Science', image_url: '/customers/evil-rabbit.png', + added_by: 'jc.chartrand@gmail.com' }, { id: 'CC27C14A-0ACF-4F4A-A6C9-D45682C144B9', @@ -129,6 +141,7 @@ const templates = [ name: 'Bachelor of Arts', description: 'Standard Bachelor of Arts', image_url: '/customers/evil-rabbit.png', + added_by: 'jc.chartrand@gmail.com' }, { id: '13D07535-C59E-4157-A011-F8D2EF4E0CBB', @@ -136,6 +149,7 @@ const templates = [ name: 'Master of Science', description: 'Standard Master of Science', image_url: '/customers/evil-rabbit.png', + added_by: 'jc.chartrand@gmail.com' } ]; @@ -146,9 +160,11 @@ const credentials = [ cred_template_id: templates[1].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'chartraj@mit.edu', - status: 'collected', + status: 'collectable', date_added: '2026-01-24 14:30:00', - tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8', + valid_from: '2020-03-08', + valid_until: '2024-03-09' }, { tag_id: tags[0].id, @@ -157,9 +173,10 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', holder_email: 'chartraj@mit.edu', added_by: 'chartraj@mit.edu', - status: 'collected', + status: 'collectable', date_added: '2026-01-24 14:30:00', - tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8', + valid_until: '2024-03-09' }, { tag_id: tags[1].id, @@ -167,9 +184,10 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', - status: 'notified', + status: 'collectable', date_added: '2026-01-24 14:30:00', - tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8', + valid_from: '2020-03-08' }, { tag_id: tags[1].id, @@ -177,9 +195,10 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'someone@mit.edu', - status: 'notified', + status: 'collectable', date_added: '2026-01-24 14:30:00', - tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8' + tenant_id: '2366E51E-10D1-4EFD-9200-FCCD2A0452E8', + valid_from: '2020-03-08' }, { id: 'cdedcb59-39a0-43f7-a7a9-be6bd30b1a46', @@ -188,9 +207,11 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', - status: 'notified', + status: 'collectable', date_added: '2025-12-24 14:30:00', - tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF', + valid_from: '2020-03-08', + valid_until: '2024-03-09' }, { tag_id: tags[0].id, @@ -198,8 +219,11 @@ const credentials = [ cred_template_id: templates[3].id, holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', + status: 'collectable', date_added: '2025-12-24 14:30:00', - tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF', + valid_from: '2020-03-08', + valid_until: '2024-03-09' }, { tag_id: tags[1].id, @@ -207,8 +231,11 @@ const credentials = [ cred_template_id: templates[0].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', + status: 'hidden', date_added: '2025-12-24 14:30:00', - tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[0].id, @@ -216,8 +243,11 @@ const credentials = [ cred_template_id: templates[2].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', + status: 'hidden', date_added: '2025-08-24 14:30:00', - tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF' + tenant_id: '4A46FCEA-9634-43CB-ABD5-B293997FBFFF', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[1].id, @@ -225,8 +255,11 @@ const credentials = [ cred_template_id: templates[1].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', + status: 'hidden', date_added: '2025-08-24 14:30:00', - tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[0].id, @@ -235,7 +268,10 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' + status: 'hidden', + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[1].id, @@ -243,8 +279,11 @@ const credentials = [ cred_template_id: templates[3].id, holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', + status: 'hidden', date_added: '2025-08-24 14:30:00', - tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[0].id, @@ -252,8 +291,10 @@ const credentials = [ cred_template_id: templates[1].id, holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', + status: 'hidden', date_added: '2025-08-24 14:30:00', - tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD' + tenant_id: '262F661C-4A25-4279-8474-0EB302D714BD', + }, { tag_id: tags[1].id, @@ -262,7 +303,9 @@ const credentials = [ holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', date_added: '2025-08-24 14:30:00', - tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' + status: 'collectable', + tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1', + valid_until: '2028-03-09' }, { tag_id: tags[0].id, @@ -271,7 +314,10 @@ const credentials = [ holder_id: '73BEFADD-0BA4-418E-9141-0DCDBDE98776', added_by: 'chartraj@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' + status: 'collectable', + tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[1].id, @@ -280,7 +326,10 @@ const credentials = [ holder_id: 'C74643D6-6771-4510-B3BC-9442DAED936D', added_by: 'someone@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1' + status: 'collectable', + tenant_id: 'DAF9A925-B98D-4FA1-9008-0800FECB4FF1', + valid_from: '2020-03-08', + valid_until: '2028-03-09' }, { tag_id: tags[0].id, @@ -289,7 +338,9 @@ const credentials = [ holder_id: 'F9D0AAF4-E535-4B8C-84A2-7B627DF21031', added_by: 'chartraj@mit.edu', date_added: '2025-11-24 14:30:00', - tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8' + status: 'collectable', + tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8', + valid_until: '2028-03-09' }, { tag_id: tags[1].id, @@ -297,8 +348,11 @@ const credentials = [ cred_template_id: templates[0].id, holder_id: 'B21A0736-5F70-4251-B648-1551595DB051', added_by: 'someone@mit.edu', + status: 'collectable', date_added: '2025-11-24 14:30:00', - tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8' + tenant_id: '90A5CC2F-660F-47B6-918F-FA7064961CC8', + valid_from: '2020-03-08', + valid_until: '2028-03-09' } ];