Skip to content

Use native URLSearchParams for query string parsing #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use native URLSearchParams for query string parsing #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 15 additions & 30 deletions public/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ function truncateTo(str, digits) {
return str.slice(-digits);
}

function parseURLSearch(search) {
const queryParams = search.substr(1).split('&').reduce(function (q, query) {
const chunks = query.split('=');
const key = chunks[0];
let value = decodeURIComponent(chunks[1]);
value = isNaN(Number(value)) ? value : Number(value);
return (q[key] = value, q);
}, {});

return queryParams;
}

const app = Vue.createApp({
data() {
return {
Expand All @@ -40,8 +28,7 @@ const app = Vue.createApp({
},

mounted: function () {
this.getKeyFromUrl();
this.getQueryParameters()
this.configure();
this.update();

this.intervalHandle = setInterval(this.update, 1000);
Expand Down Expand Up @@ -70,30 +57,28 @@ const app = Vue.createApp({
this.token = truncateTo(this.totp.generate(), this.digits);
},

getKeyFromUrl: function () {
const key = document.location.hash.replace(/[#\/]+/, '');
configure: function () {
const queryParams = new URLSearchParams(window.location.search);
// Get the key primarily from query parameters, then from the hash
const key = queryParams.get('key') || document.location.hash.replace(/[#\/]+/, '').trim();
const digits = parseInt(queryParams.get('digits'), 10); // could be NaN
const period = parseInt(queryParams.get('period'), 10); // could be NaN
const algorithm = queryParams.get('algorithm');

if (key.length > 0) {
if (key) {
this.secret_key = key;
}
},
getQueryParameters: function () {
const queryParams = parseURLSearch(window.location.search);

if (queryParams.key) {
this.secret_key = queryParams.key;
}

if (queryParams.digits) {
this.digits = queryParams.digits;
if (digits) {
this.digits = digits;
}

if (queryParams.period) {
this.period = queryParams.period;
if (period) {
this.period = period;
}

if (queryParams.algorithm) {
this.algorithm = queryParams.algorithm;
if (algorithm) {
this.algorithm = algorithm;
}
}
}
Expand Down