diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index bd882695704604341c336e6b7c9acdea51d13bc9..6322955c6e84afc62d48234553c9e44e429f0326 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -413,7 +413,6 @@ function createCertificate(certData, issuerData = null)
//region Signing final certificate
sequence = sequence.then(() => {
let signerKey = (issuerData && issuerData.privateKey) ? issuerData.privateKey : privateKey;
- //console.log(signerKey)
return certificate.sign(signerKey, (certData.algorithms && certData.algorithms.hashAlg) ? certData.algorithms.hashAlg : defaultAlgorithms.hashAlg)
},
error => Promise.reject(`Error during exporting public key: ${error}`));
@@ -422,7 +421,6 @@ function createCertificate(certData, issuerData = null)
//region Encode and store certificate
sequence = sequence.then(() =>
{
- //console.log(certificate)
certificateBuffer = certificate.toSchema(true).toBER(false);
}, error => Promise.reject(`Error during signing: ${error}`));
//endregion
@@ -724,7 +722,6 @@ function createOneTimePassportCertificate(commonNameArg, emailArg, privateKeyIss
privateKey: privateKeyDecoded
};
return createCertificate(certData, issuerData);
- //console.log(vereignIntermediateKey)
});
}
@@ -1206,7 +1203,6 @@ function getColorForIdentity(key) {
if(storedColor == null || storedColor === "") {
storedColor = getNextColor();
- console.log("Setting new color: " + storedColor);
localStorage.setItem("colors/" + key, storedColor)
}
@@ -1223,7 +1219,6 @@ function setIdentityInLocalStorage(identityToStore, extendKey = true) {
}
if(pinCode == null || pinCode === "") {
- console.log("Can not set identity");
return null;
}
@@ -1240,7 +1235,7 @@ function setIdentityInLocalStorage(identityToStore, extendKey = true) {
localStorage.setItem("identities", JSON.stringify(identities))
} else {
- console.log("Can not extend pincode ttl")
+ console.log("Can not extend pincode ttl");
}
});
}
@@ -1250,19 +1245,14 @@ function getProfileData(identity) {
executeRestfulFunction("private", viamApi,
viamApi.identityGetIdentityProfileData).then(executeResult => {
if(executeResult.code === "200") {
- console.log("In promise");
- console.log(executeResult);
var listItem = {};
- console.log(identity);
listItem.identityColor = getColorForIdentity(identity.authentication.publicKey);
listItem.initials = executeResult.data.initials;
if(listItem.initials === null || listItem.initials === "") {
listItem.initials = "JD";
}
- console.log("Item");
- console.log(listItem);
localStorage.setItem("profiles/" + identity.authentication.publicKey, JSON.stringify(listItem));
executeResultUpper(listItem)
} else {
@@ -1281,7 +1271,7 @@ function getIdentityFromLocalStorage(key, pinCode, extendTtl = true) {
return decryptMessage(encryptedIdentity, pinCode).then((serializedIdentity) => {
var parsedIdentity = JSON.parse(serializedIdentity);
parsedIdentity["pinCode"] = "";
- //console.log(parsedIdentity)
+
if(extendTtl === true) {
var success = extendPinCodeTtl(key, pinCode);
if (success === true) {
@@ -1304,30 +1294,17 @@ function listIdentitiesFromLocalStorage() {
for(var key in identities) {
var profile = JSON.parse(JSON.stringify(localStorage.getItem("profiles/" + key)));
- console.log("Getting profile");
- console.log(profile);
if(profile != null && profile !== "") {
- console.log("Setting profile for key: " + key);
- //console.log(profile)
identitiesResult[key] = JSON.parse(profile)
- //console.log(identitiesResult)
} else {
- console.log("Setting empty key for profile: " + key);
identitiesResult[key] = {}
- //console.log(identitiesResult)
}
}
- console.log("In list identities from local storage");
- console.log(identitiesResult);
return identitiesResult
}
function extendPinCodeTtl(key, pinCode) {
- //console.log("Extending pincode ttl")
- //console.log(getStack())
- //console.log("Extending pincode ttl for key: " + key)
- //console.log(pinCode)
if(pinCode == null || pinCode === "") {
var now = new Date();
var nowMillis = now.getTime();
@@ -1352,7 +1329,6 @@ function extendPinCodeTtl(key, pinCode) {
window.extendPinCodeTtl = extendPinCodeTtl;
function clearPinCodeTtl(key) {
- //console.log("Clearing ttl for key: " + key)
window.sessionStorage.removeItem("pincodettls/" + key);
window.sessionStorage.removeItem("pincodes/" + key)
}
@@ -1458,7 +1434,6 @@ window.executeRestfulFunction = executeRestfulFunction;
function loadIdentityInternal(identityKey, pinCode) {
return new Penpal.Promise(result => {
- console.log("Loading identity with pincode: " + pinCode);
getIdentityFromLocalStorage(identityKey, pinCode).then(async (loadedIdentity) => {
if (loadedIdentity == null) {
result({
@@ -1480,7 +1455,6 @@ function loadIdentityInternal(identityKey, pinCode) {
window.viamApi.setSessionData(uuid, token, deviceHash);
}
- //console.log("Set loaded identity in load identity")
window.currentlyLoadedIdentity = copiedIdentity;
window.viamAnonymousApi.setIdentity(window.currentlyLoadedIdentity.authentication.publicKey);
@@ -1509,7 +1483,6 @@ function changeIdentityPinCodeInternal(key, oldPinCode, newPinCode) {
identity.pinCode = newPinCode;
- console.log("Storing identity with pincode: " + identity.pinCode);
setIdentityInLocalStorage(identity).then(() => {
result({
"data": "",
@@ -1545,18 +1518,14 @@ function getCertificateForPassport(passportUUID, internal) {
var passportIdentity = new Identity();
passportIdentity.set(window.currentlyAuthenticatedIdentity);
- //console.log("Getting: " + passportUUID)
- //console.log(identity)
var passport = passportIdentity.getPassport(passportUUID);
if(passport === undefined || passport === null) {
createPassportCertificate(passportUUID).then(function(keys){
var cryptoData = new CryptoData();
- //console.log(keys)
cryptoData.setPublicKey(keys["publicKeyPEM"]);
cryptoData.setPrivateKey(keys["privateKeyPEM"]);
var certificate = keys["certificatePEM"];
//download("passportCertificateBeforeSigning.crt", "text/plain", certificate)
- //console.log(certificate)
//cryptoData.setx509Certificate(keys["certificate"])
executeRestfulFunction("private", viamApi, viamApi.signSignCertificate, btoa(certificate), passportUUID).then(executeResult => {
if(executeResult.code === "200") {
@@ -1572,11 +1541,6 @@ function getCertificateForPassport(passportUUID, internal) {
chain.push(atob(encodedChain[i]))
}
- //console.log("Chain from server")
- //console.log(chain)
- //console.log(signedCertificate)
- //console.log(certificate)
- //console.log(keyUUID)
cryptoData.setx509Certificate(signedCertificate);
cryptoData.setKeyUUID(keyUUID);
cryptoData.setChain(chain);
@@ -1584,7 +1548,6 @@ function getCertificateForPassport(passportUUID, internal) {
passportIdentity.setPassport(passportUUID, cryptoData);
getProfileData(passportIdentity).then(executeResult1 => {
- console.log("Profile updated in set identity");
setIdentityInLocalStorage(passportIdentity).then(() => {
window.currentlyAuthenticatedIdentity = passportIdentity;
window.lastTimeGetProfile = 0;
@@ -1614,7 +1577,6 @@ function getCertificateForPassport(passportUUID, internal) {
});
});
} else {
- //console.log(passport)
var copyOfCryptoData = JSON.parse(JSON.stringify(passport));
if(internal === false) {
@@ -1647,7 +1609,6 @@ const connection = Penpal.connectToParent({
newIdentity.setAuthentication(cryptoData);
newIdentity.setPinCode(pinCode);
- //console.log("Set loaded identity in createIdentity")
window.currentlyLoadedIdentity = newIdentity;
window.loadedIdentities[newIdentity.authentication.publicKey] = newIdentity;
extendPinCodeTtl(newIdentity.authentication.publicKey, pinCode);
@@ -1664,8 +1625,6 @@ const connection = Penpal.connectToParent({
listIdentities() {
return new Penpal.Promise(result => {
var identities = listIdentitiesFromLocalStorage();
- console.log("Before return of identities");
- console.log(identities);
result({"data" : identities,
"code" : "200",
"status" : "Identities listed"
@@ -1697,7 +1656,7 @@ const connection = Penpal.connectToParent({
clearIdentities() {
return new Penpal.Promise(result => {
var identitiesTemp = listIdentitiesFromLocalStorage();
- //console.log(identitiesTemp.length)
+
for(var i in identitiesTemp) {
destroyIdentityFromLocalStorage(i)
}
@@ -1748,8 +1707,6 @@ const connection = Penpal.connectToParent({
viamApi.setIdentity(registerIdentity.authentication.publicKey);
executeRestfulFunction("public", viamApi, viamApi.identityAgreeOnRegistration).then(executeResult => {
- console.log("Profile updated in set identity");
-
let sequence = Promise.resolve();
if (executeResult.code === "200") {
sequence = sequence.then(() => {
@@ -1792,8 +1749,6 @@ const connection = Penpal.connectToParent({
window.viamApi.setIdentity(loginIdentity.authentication.publicKey);
executeRestfulFunction("public", viamApi, viamApi.identityLogin, mode, code, actionID).then(async executeResult => {
- // console.log(executeResult)
- //console.log(mode)
switch (mode) {
case "sms" : {
if (executeResult.code === "200") {
@@ -1832,17 +1787,13 @@ const connection = Penpal.connectToParent({
case "newdevice" : {
if (executeResult.code === "200") {
- //console.log(executeResult)
var actionID = executeResult.data["ActionID"];
var QrCode = executeResult.data["QrCode"];
- //console.log(uuid + " " + token)
QRCode.toDataURL(actionID + "," + QrCode, function (err, url) {
executeResult.data["image"] = url;
- //console.log(executeResult)
setIdentityResult(executeResult);
})
} else {
- //console.log(executeResult)
setIdentityResult(executeResult);
}
break;
@@ -1885,10 +1836,8 @@ const connection = Penpal.connectToParent({
executeRestfulFunction("private", viamApi, viamApi.identityAddNewDevice).then(executeResult => {
if (executeResult.code === "200") {
- //console.log(response.data.data)
var actionID = executeResult.data["ActionID"];
var QrCode = executeResult.data["QrCode"];
- //console.log(uuid + " " + token)
QRCode.toDataURL(actionID + "," + QrCode, function (err, url) {
executeResult.data["image"] = url;
result(executeResult);
@@ -1955,7 +1904,6 @@ const connection = Penpal.connectToParent({
localStorage.removeItem("token");
localStorage.removeItem("authenticatedIdentity");
delete window.loadedIdentities[authenticationPublicKey];
- //console.log("Set loaded identity in logout")
window.currentlyLoadedIdentity = null;
window.currentlyAuthenticatedIdentity = null;
window.lastTimeGetProfile = 0;
@@ -2036,7 +1984,6 @@ const connection = Penpal.connectToParent({
}
getCertificateForPassport(passportUUID, false).then(certificateResult => {
- //console.log(certificateResult)
result(certificateResult)
})
});
@@ -2067,7 +2014,6 @@ const connection = Penpal.connectToParent({
}
getCertificateForPassport(passportUUID, true).then(certificateResult => {
- //console.log(certificateResult)
if(certificateResult.code === "200") {
var passportCertificate = certificateResult.data["x509Certificate"];
var passportPrivateKey = certificateResult.data["privateKey"];
@@ -2128,8 +2074,6 @@ const connection = Penpal.connectToParent({
}
getCertificateForPassport(passportUUID, true).then(certificateResult => {
- console.log("Certificate for passport");
- console.log(certificateResult);
if(certificateResult.code === "200") {
var passportCertificate = certificateResult.data["x509Certificate"];
var passportPrivateKey = certificateResult.data["privateKey"];
@@ -2143,15 +2087,9 @@ const connection = Penpal.connectToParent({
passportChain.push(passportCertificate);
- //console.log("Before sign email")
- //console.log(certificateOneTime)
- //console.log(passportChain)
- //console.log(privateKeyOneTime)
-
executeRestfulFunction("private", viamApi, viamApi.passportGetEmailWithHeaderByPassport,
passportUUID, emailMessage).then(executeResult2 => {
var emailWithHeader = executeResult2.data;
- //console.log(emailWithHeader)
//download("withheader.eml", "message/rfc822", emailWithHeader)
var signedEmailPromise = signEmail(emailWithHeader,
certificateOneTime,
@@ -2321,52 +2259,63 @@ const connection = Penpal.connectToParent({
});
connection.promise.then(parent => {
+ if (!navigator.cookieEnabled) {
+ console.warn("Cookie disabled. Can't start library.");
+ return;
+ }
window.addEventListener('storage', event => {
if (event.key === "authenticatedIdentity" && event.newValue === null) {
- var publicKey = window.currentlyAuthenticatedIdentity.authentication.publicKey;
+ const publicKey = window.currentlyAuthenticatedIdentity.authentication.publicKey;
window.currentlyLoadedIdentity = null;
window.currentlyAuthenticatedIdentity = null;
- var event = createEvent("LogoutFromAnotherTab", "Logout", [publicKey]);
- parent.onEvent(event)
+ const event = createEvent("LogoutFromAnotherTab", "Logout", [publicKey]);
+ parent.onEvent(event);
}
});
- var identities = localStorage.getItem("identities");
+ const identities = localStorage.getItem("identities");
console.log("Library loaded at: " + new Date().toISOString());
if (identities === "" || identities === null) {
- //console.log("Setting up empty version")
- localStorage.setItem("identities", JSON.stringify({}))
+ localStorage.setItem("identities", JSON.stringify({}));
}
- if (localStorage.getItem("uuid") === null || localStorage.getItem("token") === null
- || localStorage.getItem("authenticatedIdentity") === null) {
+ if (
+ localStorage.getItem("uuid") === null ||
+ localStorage.getItem("token") === null ||
+ localStorage.getItem("authenticatedIdentity") === null
+ ) {
localStorage.removeItem("uuid");
localStorage.removeItem("token");
- localStorage.removeItem("authenticatedIdentity")
+ localStorage.removeItem("authenticatedIdentity");
} else {
window.authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
- var pinCode = getPincode(authenticationPublicKey);
+ const pinCode = getPincode(window.authenticationPublicKey);
- if(pinCode === "" || pinCode == null) {
- loadIdentityInternal(authenticationPublicKey, "00000000").then(result => {
- if(result.code !== "200") {
- console.log(result);
+ if (pinCode === "" || pinCode === null) {
+ loadIdentityInternal(window.authenticationPublicKey, "00000000").then(result => {
+ if (result.code !== "200") {
//var event = createEvent("CanNotLoadIdentity", "ErrorDuringLoadingIdentity", [authenticationPublicKey])
//parent.onEvent(event)
- var event = createEvent("CanNotGetPincodeForAuthenticatedIdentity", "IdentityNotLoaded", [authenticationPublicKey]);
- parent.onEvent(event)
+ const event = createEvent(
+ "CanNotGetPincodeForAuthenticatedIdentity",
+ "IdentityNotLoaded",
+ [window.authenticationPublicKey]
+ );
+ parent.onEvent(event);
}
});
- //var event = createEvent("CanNotGetPincodeForAuthenticatedIdentity", "IdentityNotLoaded", [authenticationPublicKey])
- //parent.onEvent(event)
} else {
- loadIdentityInternal(authenticationPublicKey, pinCode).then(result => {
- if(result.code !== "200") {
- var event = createEvent("CanNotLoadIdentity", "ErrorDuringLoadingIdentity", [authenticationPublicKey]);
- parent.onEvent(event)
+ loadIdentityInternal(window.authenticationPublicKey, pinCode).then(result => {
+ if (result.code !== "200") {
+ const event = createEvent(
+ "CanNotLoadIdentity",
+ "ErrorDuringLoadingIdentity",
+ [window.authenticationPublicKey]
+ );
+ parent.onEvent(event);
}
});
}
@@ -2391,7 +2340,6 @@ connection.promise.then(parent => {
getIdentityFromLocalStorage(window.currentlyAuthenticatedIdentity.authentication.publicKey,
pinCode, false).then((gotIdentity) => {
window.currentlyAuthenticatedIdentity = gotIdentity;
- //console.log("Set loaded identity in pincode check interval")
window.currentlyLoadedIdentity = gotIdentity;
if(identityAuthenticatedEvent === false && gotIdentity != null) {
var event = createEvent("IdentityAuthenticated", "Authenticated", [gotIdentity.authentication.publicKey]);
@@ -2409,18 +2357,16 @@ connection.promise.then(parent => {
window.currentlyAuthenticatedIdentity = null*/
loadIdentityInternal(authenticationPublicKey, "00000000").then(result => {
if(result.code !== "200") {
- console.log(result);
var event = createEvent("CanNotGetPincodeForAuthenticatedIdentity", "IdentityNotLoaded", [authenticationPublicKey]);
parent.onEvent(event);
clearPinCodeTtl(authenticationPublicKey);
- window.currentlyAuthenticatedIdentity = null
+ window.currentlyAuthenticatedIdentity = null;
}
});
}
identityAuthenticatedEvent = false;
- //console.log("Set loaded identity in cycle for not authenticated value")
- window.currentlyLoadedIdentity = null
+ window.currentlyLoadedIdentity = null;
}
}
@@ -2449,11 +2395,8 @@ connection.promise.then(parent => {
var now = new Date().getTime();
if(now - window.lastTimeGetProfile > 30000) {
var identityToStore = window.currentlyAuthenticatedIdentity;
- getProfileData(identityToStore).then(executeResult => {
- console.log("Profile updated in cycle");
- console.log(executeResult)
- });
- window.lastTimeGetProfile = now
+ getProfileData(identityToStore);
+ window.lastTimeGetProfile = now;
}
}
}, 50);
@@ -2468,22 +2411,16 @@ connection.promise.then(parent => {
let changedMaxDeviceKeyAnonymousEventTime = false;
for (var i = 0; i < eventsLen; i++) {
var event = executeResult.data[i];
- //console.log("Received event anynomous: " + event)
switch (event.type) {
case "Authenticated" : {
- console.log("Sending authenticated event");
const uuid = event.payloads[0];
const token = event.payloads[1];
await handleIdentityLogin(window.currentlyLoadedIdentity, uuid, token);
const identityToStore = window.currentlyAuthenticatedIdentity;
event.payloads = [{fromQRCode: true}];
- console.log(identityToStore);
setIdentityInLocalStorage(identityToStore).then(() => {
- console.log(identityToStore);
- getProfileData(identityToStore).then(executeResult2 => {
- console.log("Profile updated in setInterval function");
- console.log(executeResult2);
- parent.onEvent(event)
+ getProfileData(identityToStore).then(() => {
+ parent.onEvent(event);
});
});
break;
@@ -2509,7 +2446,6 @@ connection.promise.then(parent => {
localStorage.removeItem("token");
localStorage.removeItem("authenticatedIdentity");
delete window.loadedIdentities[authenticationPublicKey];
- //console.log("Set loaded identity in key deleted")
window.currentlyLoadedIdentity = null;
window.currentlyAuthenticatedIdentity = null;
window.lastTimeGetProfile = 0;
@@ -2527,25 +2463,19 @@ connection.promise.then(parent => {
}
if(changedMaxDeviceKeyAnonymousEventTime) {
- //console.log("Updating max time anonymous device with " + maxDeviceKeyAnonymousEventTime )
executeRestfulFunction("public", viamAnonymousApi, viamAnonymousApi.eventUpdateLastViewedWithoutSession,
- "devicekey", maxDeviceKeyAnonymousEventTime.toString()).then(executeResult1 => {
- anynomousDeviceKeyEventsProcessing = false
- })
+ "devicekey", maxDeviceKeyAnonymousEventTime.toString()).then(() => {
+ anynomousDeviceKeyEventsProcessing = false;
+ });
} else {
- anynomousDeviceKeyEventsProcessing = false
+ anynomousDeviceKeyEventsProcessing = false;
}
} else {
- anynomousDeviceKeyEventsProcessing = false
- //console.log("Error during query anynomous device")
+ anynomousDeviceKeyEventsProcessing = false;
}
});
}
- /*if(window.currentlyAuthenticatedIdentity === null) {
- console.log("Currently authenticated identity is null")
- }*/
-
if (window.currentlyAuthenticatedIdentity != null && eventsDeviceEventsProcessing === false) {
eventsDeviceEventsProcessing = true;
executeRestfulFunction("private", viamApi, viamApi.eventGetNewEvents, "devicekey").then(executeResult => {
@@ -2554,7 +2484,6 @@ connection.promise.then(parent => {
const changedMaxDeviceKeyEventTime = false;
for(var i = 0; i < eventsLen; i++) {
var event = executeResult.data[i];
- //console.log("Received event device key: " + event)
if(event.type === "QRCodeUpdated") {
var actionID = event["actionID"];
var QrCode = event["payloads"][1];
@@ -2571,7 +2500,6 @@ connection.promise.then(parent => {
maxDeviceKeyEventTime = Math.max(maxDeviceKeyEventTime, event.stamp)
}
if(changedMaxDeviceKeyEventTime) {
- //console.log("Updating max time authenticated device")
executeRestfulFunction("private", viamApi, viamApi.eventUpdateLastViewed, "devicekey",
maxDeviceKeyEventTime.toString()).then(executeResult1 => {
eventsDeviceEventsProcessing = false
@@ -2580,7 +2508,6 @@ connection.promise.then(parent => {
eventsDeviceEventsProcessing = false
}
} else {
- //console.log("Error during query device")
eventsDeviceEventsProcessing = false
}
});
@@ -2608,14 +2535,11 @@ connection.promise.then(parent => {
continue
}
- //console.log("Received event entity: " + event)
parent.onEvent(event);
changedMaxEntityEventTime = true;
- //console.log(maxEntityEventTime + " " + event.stamp)
maxEntityEventTime = Math.max(maxEntityEventTime, event.stamp)
}
if(changedMaxEntityEventTime) {
- //console.log("Updating max time entity" + maxEntityEventTime)
executeRestfulFunction("private", viamApi, viamApi.eventUpdateLastViewed, "entity",
maxEntityEventTime.toString()).then(executeResult1 => {
eventsEntityEventsProcessing = false
@@ -2624,7 +2548,6 @@ connection.promise.then(parent => {
eventsEntityEventsProcessing = false
}
} else {
- //console.log("Error during query entity")
eventsEntityEventsProcessing = false
}
});
diff --git a/javascript/webpack.config.dev.js b/javascript/webpack.config.dev.js
index e8aa70a5ab042075d510b98c86c8dd71c5b52fde..6883e83cea072ba26ed0a403accb9db2f5c23a37 100644
--- a/javascript/webpack.config.dev.js
+++ b/javascript/webpack.config.dev.js
@@ -7,7 +7,6 @@ module.exports = merge(common, {
mode: 'development',
devServer: {
contentBase: './dist',
- // hot: true,
port: 9000,
headers: {
'Access-Control-Allow-Origin': '*'