Merge pull request #17 from privacybydesign/shoulder-surf

Migrated from irmajs to irma-frontend
privacybydesign · Jan 13, 2022 · b196d09 · b196d09
2 parents 70f065d + 52b6a04
commit b196d09
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 402 deletions.
diff --git a/webapp/build.sh b/webapp/build.sh
@@ -16,4 +16,4 @@ cp -r ./fonts ./build/assets/
 cp ./style.css ./build/assets/
 cp ./common.js ./build/assets/
 cp ./node_modules/jquery/dist/jquery.min.js ./build/assets/
-cp ./node_modules/@privacybydesign/irmajs/dist/irma.js ./build/assets/
+cp ./node_modules/@privacybydesign/irma-frontend/dist/irma.js ./build/assets/
diff --git a/webapp/common.js b/webapp/common.js
@@ -95,13 +95,21 @@ function issue(jwt, url) {
     setStatus('info', MESSAGES['email-add-verified']);
     console.log('success: ', jwt);
 
-    irma.startSession(config.IRMASERVER, jwt, 'publickey')
-        .then(function(pkg) {
-            console.log('session started');
-            return irma.handleSession(pkg.sessionPtr,
-                {method: 'popup', language: language}
-            );
-        })
+    irma.newPopup({
+        url: config.IRMASERVER,
+        language: language,
+        session: {
+            start: {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'text/plain',
+                },
+                body: jwt,
+            },
+            result: false,
+        },
+    })
+        .start()
         .then(function() {
             console.log('session done');
             if (url) {
@@ -112,7 +120,7 @@ function issue(jwt, url) {
         })
         .catch(function(err) {
             console.error('error:', err);
-            if (err === irma.SessionStatus.Cancelled)
+            if (err === 'Aborted')
                 setStatus('info', MESSAGES['email-add-cancel']);
             else
                 setStatus('danger', MESSAGES['email-add-error']);

diff --git a/webapp/package.json b/webapp/package.json
@@ -7,7 +7,7 @@
     "build": "./build.sh"
   },
   "dependencies": {
-    "@privacybydesign/irmajs": "^0.2.2",
+    "@privacybydesign/irma-frontend": "^0.4.3",
     "jquery": "^3.4.1"
   }
 }