myriation/keyoxide-web
1
0
Fork 0
forked from Mirrors/keyoxide-web
Code Pull requests Activity

Merge branch 'dev' into js-and-css-impromement

Browse source 
Merged new DEV branch with version 2.3.3 on pending pull request.
Conflicts solved.
This commit is contained in:
KiddyTheKid 2020-12-26 23:42:56 -05:00
commit 07c9d84244
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [2.3.3] - 2020-12-26
### Fixed
- Variable used in URL returned undefined
## [2.3.2] - 2020-12-24 ## [2.3.2] - 2020-12-24
### Fixed ### Fixed
- Variable used in URL returned undefined - Variable used in URL returned undefined

4
package.json
View file

@ -1,11 +1,11 @@
{ {
"name": "keyoxide-web", "name": "keyoxide-web",
"version": "2.3.2", "version": "2.3.3",
"description": "A modern, secure and privacy-friendly platform to establish your decentralized online identity", "description": "A modern, secure and privacy-friendly platform to establish your decentralized online identity",
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"bent": "^7.3.12", "bent": "^7.3.12",
"doipjs": "^0.8.1", "doipjs": "^0.8.3",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-validator": "^6.8.0", "express-validator": "^6.8.0",

8
static/scripts.js
View file

@ -357,11 +357,17 @@ async function displayProfile(opts) {
return; return;
} }
let primaryClaims let primaryClaims;
feedback = ""; feedback = "";
if (userMail) { if (userMail) {
verifications.forEach((userId, i) => { verifications.forEach((userId, i) => {
if (!keyData.users[i].userId) {
keyData.users[i].userId = {
email: 'email not specified'
};
}
if (keyData.users[i].userId.email !== userMail) { if (keyData.users[i].userId.email !== userMail) {
return; return;
} }

8
yarn.lock
View file

@ -703,10 +703,10 @@ doctypes@^1.1.0:
resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
doipjs@^0.8.1: doipjs@^0.8.3:
version "0.8.1" version "0.8.3"
resolved "https://registry.yarnpkg.com/doipjs/-/doipjs-0.8.1.tgz#acd6ef91cb9709de9422580aac2498c91aa21bc5" resolved "https://registry.yarnpkg.com/doipjs/-/doipjs-0.8.3.tgz#94bcb132cbca031b3f9b5a9834648b26f131e493"
integrity sha512-9N/BucE3qr0NX2Z3ESsn4PDClZNfFTwMjGagI4xMOCT1Dx9ZkvoeO48SqVTAU02ENHquiXl7RdSR2HKWenN2Ww== integrity sha512-lhR437R3qctCDY86UVOD4UclHvxyQ1lFFpLHjeb22QxVSk+I2AaaNaaE8ap+CtKlzkLt2TEyStaI78s+7sc+bQ==
dependencies: dependencies:
bent "^7.3.12" bent "^7.3.12"
browserify "^17.0.0" browserify "^17.0.0"