SNJS 1.0.2 and accompanying refactor to cryptoManager

This commit is contained in:
Mo Bitar
2019-12-17 17:09:34 -06:00
parent c4c38616b0
commit 228b1ab480
13 changed files with 45 additions and 46 deletions

View File

@@ -4,14 +4,14 @@ import '../vendor/chai-as-promised-built.js';
import '../../../vendor/assets/javascripts/lodash/lodash.custom.js';
import LocalStorageManager from './localStorageManager.js';
const sf_default = new StandardNotes();
const sf_default = new SNCryptoManager();
SFItem.AppDomain = "org.standardnotes.sn";
var _globalStorageManager = null;
var _globalHttpManager = null;
var _globalAuthManager = null;
var _globalModelManager = null;
var _globalStandardNotes = null;
var _globalCryptoManager = null;
export default class Factory {
@@ -47,9 +47,9 @@ export default class Factory {
return _globalModelManager;
}
static globalStandardNotes() {
if(_globalStandardNotes == null) { _globalStandardNotes = new StandardNotes(); }
return _globalStandardNotes;
static globalCryptoManager() {
if(_globalCryptoManager == null) { _globalCryptoManager = new SNCryptoManager(); }
return _globalCryptoManager;
}
static createModelManager() {
@@ -62,7 +62,7 @@ export default class Factory {
static createItemParams() {
var params = {
uuid: SNJS.crypto.generateUUIDSync(),
uuid: cryptoManager.crypto.generateUUIDSync(),
content_type: "Note",
content: {
title: "hello",

View File

@@ -9,7 +9,7 @@ var expect = chai.expect;
const getNoteParams = () => {
var params = {
uuid: SNJS.crypto.generateUUIDSync(),
uuid: cryptoManager.crypto.generateUUIDSync(),
content_type: "Note",
content: {
title: "hello",
@@ -22,7 +22,7 @@ const getNoteParams = () => {
const createRelatedNoteTagPair = () => {
let noteParams = getNoteParams();
let tagParams = {
uuid: SNJS.crypto.generateUUIDSync(),
uuid: cryptoManager.crypto.generateUUIDSync(),
content_type: "Tag",
content: {
title: "thoughts",
@@ -441,8 +441,8 @@ describe("syncing", () => {
var totalItemCount = 0;
beforeEach((done) => {
var email = Factory.globalStandardNotes().crypto.generateUUIDSync();
var password = Factory.globalStandardNotes().crypto.generateUUIDSync();
var email = Factory.globalCryptoManager().crypto.generateUUIDSync();
var password = Factory.globalCryptoManager().crypto.generateUUIDSync();
Factory.globalStorageManager().clearAllData().then(() => {
Factory.newRegisteredUser(email, password).then((user) => {
done();