Merge branch 'dev' into configurable-scheme

This commit is contained in:
Preston Maness 2023-08-31 20:32:20 -05:00
commit b9b7b33c83
5 changed files with 27 additions and 4 deletions

View file

@ -1,4 +1,4 @@
pipeline: steps:
test: test:
image: node image: node
commands: commands:

View file

@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [4.0.1] - 2023-08-28
### Fixed
- CI docker builds
## [4.0.0] - 2023-08-28
### Added
- ASPE support
- Rome linting and formatting
- API v3
### Changed
- Updated doipjs to 1.0.0
### Fixed
- Missing primaryUserIndex
### Removed
- API v0, v1, v2
## [3.6.4] - 2023-03-27 ## [3.6.4] - 2023-03-27
### Fixed ### Fixed
- Missing /graphql proxy API endpoint - Missing /graphql proxy API endpoint

View file

@ -4,7 +4,8 @@ WORKDIR /app
COPY . . COPY . .
RUN yarn --pure-lockfile RUN yarn --pure-lockfile
RUN yarn run build RUN yarn run build:server
RUN yarn run build:static
### ###

View file

@ -1,6 +1,6 @@
{ {
"name": "keyoxide-web", "name": "keyoxide-web",
"version": "3.6.4", "version": "4.0.1",
"description": "Verifying online identity with cryptography", "description": "Verifying online identity with cryptography",
"main": "./src/index.js", "main": "./src/index.js",
"type": "module", "type": "module",

View file

@ -102,7 +102,13 @@ const fetchWKD = (id) => {
reject(new Error('No public keys could be read from the data fetched using WKD')) reject(new Error('No public keys could be read from the data fetched using WKD'))
} }
try {
profile = await doipjs.openpgp.parsePublicKey(publicKey) profile = await doipjs.openpgp.parsePublicKey(publicKey)
} catch (error) {
reject(new Error('No public keys could be fetched using WKD'))
return
}
profile.publicKey.fetch.method = 'wkd' profile.publicKey.fetch.method = 'wkd'
profile.publicKey.fetch.query = id profile.publicKey.fetch.query = id
profile.publicKey.fetch.resolvedUrl = fetchURL profile.publicKey.fetch.resolvedUrl = fetchURL