rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Regenerator

Browse Source
This commit is contained in:
Mo Bitar
2018-05-22 15:32:37 -05:00
parent f43186d3e1
commit 830826ee06
6 changed files with 11112 additions and 9006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@@ -82,6 +82,7 @@ module.exports = function(grunt) {
lib: {
src: [
'node_modules/standard-file-js/dist/regenerator.js',
'node_modules/standard-file-js/dist/sfjs.js',
'vendor/assets/bower_components/angular/angular.js',
'vendor/assets/javascripts/lodash/lodash.custom.min.js'
@@ -160,6 +161,9 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-babel');
grunt.loadNpmTasks('grunt-browserify');
// grunt.registerTask('default', ['haml', 'ngtemplates', 'sass', 'concat:app',
// 'concat:lib', 'concat:dist', 'concat:css', 'babel', 'browserify', 'uglify']);
grunt.registerTask('default', ['haml', 'ngtemplates', 'sass', 'concat:app', 'babel', 'browserify',
'concat:lib', 'concat:dist', 'ngAnnotate', 'concat:css', 'uglify']);
};

2
app/assets/javascripts/app/directives/views/passwordWizard.js
View File

@@ -202,7 +202,7 @@ class PasswordWizard {
let currentServerPw = this.currentServerPw;
SFJS.crypto.generateInitialEncryptionKeysForUser(authManager.user.email, newUserPassword).then((results) => {
SFJS.crypto.generateInitialKeysAndAuthParamsForUser(authManager.user.email, newUserPassword).then((results) => {
let newKeys = results.newKeys;
let newAuthParams = results.newAuthParams;

2
app/assets/javascripts/app/services/authManager.js
View File

@@ -210,7 +210,7 @@ angular.module('app')
}
this.register = function(url, email, password, ephemeral, callback) {
SFJS.crypto.generateInitialEncryptionKeysForUser(email, password).then((results) => {
SFJS.crypto.generateInitialKeysAndAuthParamsForUser(email, password).then((results) => {
let keys = results.keys;
let authParams = results.authParams;

2
app/assets/javascripts/app/services/passcodeManager.js
View File

@@ -50,7 +50,7 @@ angular.module('app')
this.setPasscode = (passcode, callback) => {
var uuid = SFJS.crypto.generateUUIDSync();
SFJS.crypto.generateInitialEncryptionKeysForUser(uuid, passcode).then((results) => {
SFJS.crypto.generateInitialKeysAndAuthParamsForUser(uuid, passcode).then((results) => {
let keys = results.keys;
let authParams = results.authParams;

20106
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -12,8 +12,10 @@
"angular": "^1.6.1",
"angular-mocks": "^1.6.1",
"babel-cli": "^6.18.0",
"babel-plugin-angularjs-annotate": "^0.9.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.1.1",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2016": "^6.16.0",
"bower": "^1.8.0",
"grunt": "^1.0.1",