-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separated business logic into classes (#204)
All backend functions now send responses in json updated bootstrap to 3.3.7, jquery to 3.3.1 Separated client side javascript business logic into separate classes: * backend communication * accounts * crypto
- Loading branch information
1 parent
6fe95cb
commit 2b3e13c
Showing
52 changed files
with
2,249 additions
and
1,610 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| class Account { | ||
| constructor(index, name, enpassword) { | ||
| this.index = index; | ||
| this.name = name; | ||
| this.enpassword = enpassword; | ||
| this.other = {}; | ||
| this.mFile = null; | ||
| this.mEncryptionWrapper = null; | ||
| } | ||
| // reads the account from a encrypted dict | ||
| static fromEncrypted(encryptionWrapper, encryptedAccount) { | ||
| return encryptionWrapper.decryptChar(encryptedAccount["name"]) | ||
| .then(function(accountName) { | ||
| let account = new Account(encryptedAccount["index"], accountName, encryptedAccount["kss"]); | ||
| return account.setEncryptionWrapper(encryptionWrapper); | ||
| }) | ||
| .then(function(account){ | ||
| let resultPromise; | ||
| if (encryptedAccount["additional"] != "") { | ||
| //decrypt and extract json | ||
| resultPromise = encryptionWrapper.decryptChar(encryptedAccount["additional"]) | ||
| .then(function(additional) { | ||
| let data = $.parseJSON(additional); | ||
| for (var x in data) | ||
| account.setOther(x, data[x]); | ||
| return account; | ||
| }); | ||
| } | ||
| else { | ||
| resultPromise = Promise.resolve(account); | ||
| } | ||
| return resultPromise; | ||
| }); | ||
| } | ||
|
|
||
| setEncryptionWrapper(wrapper) { | ||
| var self = this; | ||
| if (self.encryptionWrapper != null) { | ||
| var decryptedPassword; | ||
| var decryptedFileKey; | ||
| return self.getPassword() | ||
| .then(function(password) { | ||
| decryptedPassword = password; | ||
| if (self.hasFile()) { | ||
| return self.getFileKey(); | ||
| } | ||
| else { | ||
| return ""; | ||
| } | ||
| }) | ||
| .then(function(fileKey) { | ||
| decryptedFileKey = fileKey; | ||
| return; | ||
| }) | ||
| .then(function(){ | ||
| self.mEncryptionWrapper = wrapper; | ||
| return self.setPassword(decryptedPassword); | ||
| }) | ||
| .then(function() { | ||
| if (decryptedFileKey != '') { | ||
| return self.setFileKey(decryptedFileKey); | ||
| } | ||
| else { | ||
| return; | ||
| } | ||
| }) | ||
| .then(function(){ | ||
| return self; | ||
| }); | ||
| } | ||
| else { | ||
| self.mEncryptionWrapper = wrapper; | ||
| return Promise.resolve(self); | ||
| } | ||
| } | ||
| get encryptionWrapper() { | ||
| return this.mEncryptionWrapper; | ||
| } | ||
|
|
||
| getEncrypted(withFile){ | ||
| withFile = withFile || false; | ||
| var self = this; | ||
| let encryptedResult = { "kss":self.enpassword }; | ||
| if (self.index != null) | ||
| encryptedResult["index"] = self.index; | ||
| return self.encryptionWrapper.encryptChar(self.name) | ||
| .then(function(enName) { | ||
| encryptedResult["name"] = enName; | ||
| let other = JSON.stringify(self.other); | ||
| return self.encryptionWrapper.encryptChar(other); | ||
| }) | ||
| .then(function(enOther) { | ||
| encryptedResult["other"] = enOther; | ||
| if (withFile && self.hasFile()) { | ||
| encryptedResult["fk"] = self.file.key; | ||
| return self.encryptionWrapper.encryptChar(self.file.name) | ||
| .then(function(fname) { | ||
| encryptedResult["fname"] = fname; | ||
| }); | ||
| } | ||
| }) | ||
| .then(function(){ | ||
| return encryptedResult; | ||
| }); | ||
| } | ||
|
|
||
| get accountName() { | ||
| return this.name; | ||
| } | ||
| setAccountName(name) { | ||
| var self = this; | ||
| //reencrypt password | ||
| return self.getPassword() | ||
| .then(function(password){; | ||
| self.name = name; | ||
| return self.setPassword(password); | ||
| }); | ||
| } | ||
| getPassword(){ | ||
| return this.encryptionWrapper.decryptPassword(this.name, this.enpassword); | ||
| } | ||
| setPassword(password){ | ||
| var self = this; | ||
| return this.encryptionWrapper.encryptPassword(this.name, password) | ||
| .then(function(enPass){ | ||
| self.enpassword = enPass; | ||
| return enPass; | ||
| }); | ||
| } | ||
| clearOther() { | ||
| this.other = {}; | ||
| } | ||
| clearVisibleOther() { | ||
| for (let item in this.other) { | ||
| if (item.substring(0,1) != "_") { | ||
| delete this.other[item]; | ||
| } | ||
| } | ||
| } | ||
| get availableOthers() { | ||
| let availableOthers = []; | ||
| for (let otherName in this.other) { | ||
| availableOthers.push(otherName); | ||
| } | ||
| return availableOthers; | ||
| } | ||
| setOther(name, value) { | ||
| this.other[name] = value; | ||
| } | ||
| getOther(name) { | ||
| return this.other[name]; | ||
| } | ||
| getOtherJSON() { | ||
| return JSON.stringify(this.other); | ||
| } | ||
| addEncryptedFile(name, fkey) { | ||
| var self = this; | ||
| self.file = { "name":"", "key": fkey }; | ||
| return self.encryptionWrapper.decryptChar(name) | ||
| .then(function(decryptedName) { | ||
| self.file.name = decryptedName; | ||
| return self.file; | ||
| }); | ||
| } | ||
| hasFile() { | ||
| return 'file' in this; | ||
| } | ||
| getFileKey(){ | ||
| return this.encryptionWrapper.decryptPassword(this.file.name, this.file.key); | ||
| } | ||
| setFileKey(key){ | ||
| var self = this; | ||
| return this.encryptionWrapper.encryptPassword(this.file.name, key) | ||
| .then(function(enKey){ | ||
| self.file.key = enKey; | ||
| return enKey; | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.