Skip to content
Snippets Groups Projects

Exchange 2016 support

Merged Alexey Lunin requested to merge exchange-2016-support into master
1 file
+ 30
24
Compare changes
  • Side-by-side
  • Inline
@@ -45,7 +45,7 @@ const CollaboraAPI = require("./collaboraapi-iframe");
const ViamAPI = require("../../temp/viamapi");
const asmCrypto = require('asmcrypto.js');
let identityColors = ["#994392", "#cb0767", "#e51d31", "#ec671b", "#fab610"];
const identityColors = ["#994392", "#cb0767", "#e51d31", "#ec671b", "#fab610"];
function getNextColor() {
let colorIndex = localStorage.getItem("colorIndex");
@@ -53,7 +53,7 @@ function getNextColor() {
colorIndex = 0;
}
let color = identityColors[colorIndex];
const color = identityColors[colorIndex];
colorIndex++;
@@ -65,7 +65,7 @@ function getNextColor() {
}
function setKeyForUUID(uuid, key) {
let storedIdentityForUuid = localStorage.getItem("keyperuuid/" + uuid);
const storedIdentityForUuid = localStorage.getItem("keyperuuid/" + uuid);
if (
storedIdentityForUuid !== key &&
storedIdentityForUuid != null &&
@@ -109,8 +109,8 @@ function setIdentityInLocalStorage(identityToStore, extendKey = true) {
}
if (success === true) {
localStorage.setItem(key, encryptedIdentity);
let serializedIdentitiesList = localStorage.getItem("identities");
let identities = JSON.parse(serializedIdentitiesList);
const serializedIdentitiesList = localStorage.getItem("identities");
const identities = JSON.parse(serializedIdentitiesList);
identities[key] = true;
localStorage.setItem("identities", JSON.stringify(identities));
@@ -130,7 +130,7 @@ function getProfileData(identity) {
null
).then(executeResult => {
if (executeResult.code === "200") {
let listItem = {};
const listItem = {};
listItem.identityColor = getColorForIdentity(
identity.authentication.publicKey
@@ -177,19 +177,19 @@ async function getIdentityFromLocalStorage(key, pinCode, extendTtl = true) {
function extendPinCodeTtl(key, pinCode) {
if (pinCode == null || pinCode === "") {
let now = new Date();
let nowMillis = now.getTime();
let ttl = window.sessionStorage.getItem("pincodettls/" + key);
const now = new Date();
const nowMillis = now.getTime();
const ttl = window.sessionStorage.getItem("pincodettls/" + key);
if (ttl == null || ttl === "" || nowMillis >= parseInt(ttl)) {
clearPinCodeTtl(key);
return false;
} else {
let ttl = now.getTime() + 4 * 60 * 60 * 1000;
const ttl = now.getTime() + 4 * 60 * 60 * 1000;
window.sessionStorage.setItem("pincodettls/" + key, ttl);
}
} else {
let now = new Date();
let ttl = now.getTime() + 4 * 60 * 60 * 1000;
const now = new Date();
const ttl = now.getTime() + 4 * 60 * 60 * 1000;
window.sessionStorage.setItem("pincodettls/" + key, ttl);
window.sessionStorage.setItem("pincodes/" + key, pinCode);
}
@@ -205,9 +205,9 @@ function clearPinCodeTtl(key) {
}
function getPincode(key) {
let now = new Date();
let nowMillis = now.getTime();
let ttl = window.sessionStorage.getItem("pincodettls/" + key);
const now = new Date();
const nowMillis = now.getTime();
const ttl = window.sessionStorage.getItem("pincodettls/" + key);
if (ttl == null || ttl === "") {
return null;
} else {
@@ -223,9 +223,9 @@ function getPincode(key) {
function createEvent(actionId, type, payloads) {
return {
actionID: actionId,
type: type,
type,
stamp: new Date().getTime(),
payloads: payloads
payloads
};
}
@@ -324,13 +324,13 @@ async function executeRestfulFunction(type, that, fn, config, ...args) {
identity &&
code === "400" &&
status === "Bad session";
if (!badSession) return response.data;
if (!badSession) { return response.data; }
const loginResponse = await viamApi.identityLogin(
null,
"previousaddeddevice"
);
if (loginResponse.data.code !== "200") return loginResponse.data;
if (loginResponse.data.code !== "200") { return loginResponse.data; }
const uuid = loginResponse.data.data["Uuid"];
const token = loginResponse.data.data["Session"];
@@ -402,14 +402,16 @@ function loadIdentityInternal(identityKey, pinCode) {
function getCertificateForPassport(passportUUID, internal) {
return new Penpal.Promise(certificateResult => {
if (window.currentlyAuthenticatedIdentity === null) {
return { data: "", code: "400", status: "Identity not authenticated" };
return { data: "",
code: "400",
status: "Identity not authenticated" };
}
const passportIdentity = window.currentlyAuthenticatedIdentity;
let passport = passportIdentity.getPassport(passportUUID);
const passport = passportIdentity.getPassport(passportUUID);
if (passport === undefined || passport === null) {
createPassportCertificate(passportUUID).then(function(keys) {
let cryptoData = new CryptoData();
createPassportCertificate(passportUUID).then(function (keys) {
const cryptoData = new CryptoData();
cryptoData.setPublicKey(keys["publicKeyPEM"]);
cryptoData.setPrivateKey(keys["privateKeyPEM"]);
const certificate = keys["certificatePEM"];
@@ -525,7 +527,11 @@ const connection = Penpal.connectToParent({
},
...penpalMethods,
createIdentity(pinCode) {
console.log(asmCrypto.Sha1());
console.log("Our awesome log from create identity");
console.log({asmCrypto});
const sha1 = new asmCrypto.Sha1();
console.log({sha1});
return new Penpal.Promise(result => {
createPassportCertificate(makeid()).then(function (keys) {
const newIdentity = new Identity();
Loading