Merge pull request #409 from standardnotes/crypto-refactor

refactor: import crypto from sncrypto (dep of snjs)
This commit is contained in:
Mo Bitar
2020-06-09 09:53:55 -05:00
committed by GitHub
5 changed files with 18 additions and 7 deletions

View File

@@ -26,6 +26,7 @@ import {
KeyboardManager
} from '@/services';
import { AppState } from '@/ui_models/app_state';
import { SNWebCrypto } from 'sncrypto/dist/sncrypto-web';
type WebServices = {
appState: AppState
@@ -62,6 +63,7 @@ export class WebApplication extends SNApplication {
Environment.Web,
platformFromString(getPlatformString()),
deviceInterface,
new SNWebCrypto(),
namespace,
undefined,
[

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

12
package-lock.json generated
View File

@@ -9788,9 +9788,8 @@
}
},
"sncrypto": {
"version": "github:standardnotes/sncrypto#6625bbcc141161eb866475d9786238001f3c514d",
"from": "github:standardnotes/sncrypto#6625bbcc141161eb866475d9786238001f3c514d",
"dev": true
"version": "github:standardnotes/sncrypto#7e76ab9977f85039d9399b935aecfe495a951edb",
"from": "github:standardnotes/sncrypto#7e76ab9977f85039d9399b935aecfe495a951edb"
},
"snjs": {
"version": "github:standardnotes/snjs#0c306de70c5afffe16096424c6c3326eaa1dd4fd",
@@ -9798,6 +9797,13 @@
"dev": true,
"requires": {
"sncrypto": "github:standardnotes/sncrypto#6625bbcc141161eb866475d9786238001f3c514d"
},
"dependencies": {
"sncrypto": {
"version": "github:standardnotes/sncrypto#6625bbcc141161eb866475d9786238001f3c514d",
"from": "github:standardnotes/sncrypto#6625bbcc141161eb866475d9786238001f3c514d",
"dev": true
}
}
},
"sockjs": {

View File

@@ -65,5 +65,8 @@
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3",
"webpack-merge": "^4.2.2"
},
"dependencies": {
"sncrypto": "github:standardnotes/sncrypto#7e76ab9977f85039d9399b935aecfe495a951edb"
}
}