From 230bc41082d333a361ce47d910ffed698632232e Mon Sep 17 00:00:00 2001 From: akrautela Date: Sat, 10 Jun 2017 15:47:44 +0530 Subject: [PATCH 1/2] Create common.js --- src/lib/common.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/common.js b/src/lib/common.js index dfbad14..fc07809 100644 --- a/src/lib/common.js +++ b/src/lib/common.js @@ -48,7 +48,12 @@ function parse (url, path) { query[decodeURIComponent(b[0])] = decodeURIComponent(b[1] || '').trim(); } query.name = decodeURIComponent(url.split('?')[0].substr(15)).replace(query.issuer + ':', '').trim(); - query.issuer = query.issuer || query.name.split('@')[1].split('.')[0] || query.name; + if(query.name.split('@')[1].split('.')[0] == undefined || query.name.split('@')[1].split('.')[0] == null){ + query.issuer = query.issuer || query.name.split('@')[1].split('.')[0] || query.name; + } + else{ + query.issuer = query.issuer || decodeURIComponent(url.split('?')[0].substr(15)).split('%3A')[0].split(':')[0]; + } query.path = path; return query; From 3ab9c3224948ddba35b3227a8c44e893cdab75ed Mon Sep 17 00:00:00 2001 From: akrautela Date: Sat, 10 Jun 2017 15:51:22 +0530 Subject: [PATCH 2/2] Bug Fix:Crash if no email in 2FA secret key Fixed Better exception handling with 2FA secret key if no email is present or a username is present instead of email. --- src/lib/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/common.js b/src/lib/common.js index fc07809..73635d6 100644 --- a/src/lib/common.js +++ b/src/lib/common.js @@ -48,10 +48,10 @@ function parse (url, path) { query[decodeURIComponent(b[0])] = decodeURIComponent(b[1] || '').trim(); } query.name = decodeURIComponent(url.split('?')[0].substr(15)).replace(query.issuer + ':', '').trim(); - if(query.name.split('@')[1].split('.')[0] == undefined || query.name.split('@')[1].split('.')[0] == null){ + try{ query.issuer = query.issuer || query.name.split('@')[1].split('.')[0] || query.name; } - else{ + catch(err){ query.issuer = query.issuer || decodeURIComponent(url.split('?')[0].substr(15)).split('%3A')[0].split(':')[0]; } query.path = path;