diff --git a/18plus/index.en.html b/18plus/index.en.html
index 236a1a3..e111cd3 100644
--- a/18plus/index.en.html
+++ b/18plus/index.en.html
@@ -8,7 +8,7 @@
-
+
diff --git a/18plus/index.nl.html b/18plus/index.nl.html
index c56669d..5a29a2f 100644
--- a/18plus/index.nl.html
+++ b/18plus/index.nl.html
@@ -8,7 +8,7 @@
-
+
diff --git a/address/index.en.html b/address/index.en.html
index 6a9adbc..35ef19c 100644
--- a/address/index.en.html
+++ b/address/index.en.html
@@ -8,7 +8,7 @@
-
+
diff --git a/address/index.nl.html b/address/index.nl.html
index f9e9670..6bbd973 100644
--- a/address/index.nl.html
+++ b/address/index.nl.html
@@ -8,7 +8,7 @@
-
+
diff --git a/beingalive/index.en.html b/beingalive/index.en.html
index 15635ea..fbdc690 100644
--- a/beingalive/index.en.html
+++ b/beingalive/index.en.html
@@ -6,7 +6,7 @@
IRMA Attestatio de Vita demo
-
+
diff --git a/beingalive/index.nl.html b/beingalive/index.nl.html
index 3b337ce..5a399fc 100644
--- a/beingalive/index.nl.html
+++ b/beingalive/index.nl.html
@@ -6,7 +6,7 @@
IRMA Attestatie de Vita demo
-
+
diff --git a/build_artifacts.sh b/build_artifacts.sh
index 27fab06..f6b21ee 100755
--- a/build_artifacts.sh
+++ b/build_artifacts.sh
@@ -9,7 +9,7 @@ mkdir -p "$DIR/assets"
cp "$DIR/node_modules/jquery/dist/jquery.min.js" "$DIR/assets/jquery.min.js"
cp "$DIR/node_modules/bootstrap/dist/css/bootstrap.min.css" "$DIR/assets/bootstrap.min.css"
cp "$DIR/node_modules/bootstrap/dist/js/bootstrap.min.js" "$DIR/assets/bootstrap.min.js"
-cp "$DIR/node_modules/@privacybydesign/irma-frontend/dist/irma.js" "$DIR/assets/irma.js"
+cp "$DIR/node_modules/@privacybydesign/yivi-frontend/dist/yivi.js" "$DIR/assets/yivi.js"
rm -rf "$DIR/build"
@@ -44,10 +44,6 @@ for lang in 'nl' 'en'; do
cp "$DIR/start_session.js" "$DIR/build/$lang/start_session.js"
done
-cp -r "$DIR/data" "$DIR/build/data"
-rm "$DIR/build/data/README.md"
-rm "$DIR/build/data/.gitignore"
-
# Delete potential empty directories
find "$DIR/build" -type d -empty -delete
# Delete shell files
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 612424a..0000000
--- a/data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pem
\ No newline at end of file
diff --git a/data/README.md b/data/README.md
deleted file mode 100644
index f671486..0000000
--- a/data/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Data directory
---------------
-
-Add the following to this directory:
-
- * `pk.pem` - The public key of the IRMA server you are using
\ No newline at end of file
diff --git a/irmaTubePremium/index.en.html b/irmaTubePremium/index.en.html
index 10f1dcd..241ef70 100644
--- a/irmaTubePremium/index.en.html
+++ b/irmaTubePremium/index.en.html
@@ -8,7 +8,7 @@
-
+
diff --git a/irmaTubePremium/index.nl.html b/irmaTubePremium/index.nl.html
index c1866cd..909ee51 100644
--- a/irmaTubePremium/index.nl.html
+++ b/irmaTubePremium/index.nl.html
@@ -8,7 +8,7 @@
-
+
diff --git a/mail/index.en.html b/mail/index.en.html
index 856577c..d9a840b 100644
--- a/mail/index.en.html
+++ b/mail/index.en.html
@@ -8,7 +8,7 @@
-
+
diff --git a/mail/index.nl.html b/mail/index.nl.html
index 4477d02..7f7fcc5 100644
--- a/mail/index.nl.html
+++ b/mail/index.nl.html
@@ -8,7 +8,7 @@
-
+
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..7d708dc
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,51 @@
+{
+ "name": "irma-demo-pages",
+ "version": "0.1.0",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "irma-demo-pages",
+ "version": "0.1.0",
+ "license": "MIT",
+ "dependencies": {
+ "@privacybydesign/yivi-frontend": "^0.1.3",
+ "bootstrap": "^4.3.1",
+ "jquery": "^3.5.0",
+ "popper.js": "^1.14.7"
+ }
+ },
+ "node_modules/@privacybydesign/yivi-frontend": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/@privacybydesign/yivi-frontend/-/yivi-frontend-0.1.3.tgz",
+ "integrity": "sha512-cT6JRbli8HaTVB2z0Tmvrd0ln2ByHbcpTNHnOCbvl0SeLXfBGGIOUMpV+HwIg5xMuznMaonjA0572v7tL8Wc9w==",
+ "license": "SEE LICENSE IN REPOSITORY"
+ },
+ "node_modules/bootstrap": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+ "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "jquery": "1.9.1 - 3",
+ "popper.js": "^1.14.7"
+ }
+ },
+ "node_modules/jquery": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz",
+ "integrity": "sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==",
+ "license": "MIT"
+ },
+ "node_modules/popper.js": {
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz",
+ "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==",
+ "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+ "license": "MIT"
+ }
+ }
+}
diff --git a/package.json b/package.json
index 133c363..7325a8d 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,13 @@
"main": "index.js",
"repository": "https://gitlab.science.ru.nl/irma/irma-demo-pages",
"contributors": [
- "Ivar Derksen",
+ "Caesar Groep",
"Privacy by Design Foundation"
],
"license": "MIT",
"private": true,
"dependencies": {
- "@privacybydesign/irma-frontend": "^0.4.1",
+ "@privacybydesign/yivi-frontend": "^0.1.3",
"bootstrap": "^4.3.1",
"jquery": "^3.5.0",
"popper.js": "^1.14.7"
diff --git a/signature/index.en.html b/signature/index.en.html
index 9706f99..1044669 100644
--- a/signature/index.en.html
+++ b/signature/index.en.html
@@ -8,7 +8,7 @@
-
+
diff --git a/signature/index.nl.html b/signature/index.nl.html
index 4d3eee0..0881772 100644
--- a/signature/index.nl.html
+++ b/signature/index.nl.html
@@ -8,7 +8,7 @@
-
+
diff --git a/start_session.js b/start_session.js
index 7913922..4f0a057 100644
--- a/start_session.js
+++ b/start_session.js
@@ -1,6 +1,6 @@
function start_session(type, lang, success_fun, cancelled_fun, error_fun) {
console.log("Button clicked");
- irma.newPopup({
+ yivi.newPopup({
language: lang,
session: {
url: '..',
diff --git a/start_session.php b/start_session.php
index d5f071f..ac6e190 100644
--- a/start_session.php
+++ b/start_session.php
@@ -194,7 +194,6 @@ function start_session($type, $lang) {
. "Content-Length: " . strlen($jsonsr) . "\r\n"
. "Authorization: " . API_TOKEN . "\r\n",
'content' => $jsonsr,
- 'ignore_errors' => true // Include this option
)
);
diff --git a/student/index.en.html b/student/index.en.html
index 596c83f..c93961c 100644
--- a/student/index.en.html
+++ b/student/index.en.html
@@ -8,7 +8,7 @@
-
+
diff --git a/student/index.nl.html b/student/index.nl.html
index a592b5d..25196f0 100644
--- a/student/index.nl.html
+++ b/student/index.nl.html
@@ -8,7 +8,7 @@
-
+
diff --git a/yarn.lock b/yarn.lock
index 1d17372..95e9ef4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,22 +2,22 @@
# yarn lockfile v1
-"@privacybydesign/irma-frontend@^0.4.1":
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/@privacybydesign/irma-frontend/-/irma-frontend-0.4.1.tgz#b1afafa2efe00da464edb444c9ffbb460c05cbdf"
- integrity sha512-C0wJw6mr6L5ym7s3B+y+wfb1dqtym9rqHJq2ypQdOOdDRfCqKblyXnmzp1/LP8eIIpHKjJ4rE678CGHZFM3B1w==
+"@privacybydesign/yivi-frontend@^0.1.3":
+ version "0.1.3"
+ resolved "https://registry.npmjs.org/@privacybydesign/yivi-frontend/-/yivi-frontend-0.1.3.tgz"
+ integrity sha512-cT6JRbli8HaTVB2z0Tmvrd0ln2ByHbcpTNHnOCbvl0SeLXfBGGIOUMpV+HwIg5xMuznMaonjA0572v7tL8Wc9w==
bootstrap@^4.3.1:
version "4.3.1"
- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+ resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz"
integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
-jquery@^3.5.0:
+jquery@^3.5.0, "jquery@1.9.1 - 3":
version "3.5.0"
- resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+ resolved "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
popper.js@^1.14.7:
version "1.15.0"
- resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
+ resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz"
integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==