Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Olm account to IndexedDB #579

Merged
merged 16 commits into from
Nov 27, 2017
Merged

Move Olm account to IndexedDB #579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fb99150
Move OLM account to IndexedDBd
dbkr Nov 21, 2017
313cfac
Add comment
dbkr Nov 21, 2017
7ecf313
Use a callback function at the store layer
dbkr Nov 22, 2017
a5c5da5
Lint
dbkr Nov 22, 2017
bae3f5c
It's a heap, not a stack
dbkr Nov 22, 2017
59f228d
Migrate account from session store
dbkr Nov 22, 2017
a90f592
Add comment on deprecation
dbkr Nov 22, 2017
4b7157b
Remove unnecessary 'if'
dbkr Nov 22, 2017
9218e51
Add LocalStorageCryptoStore
dbkr Nov 22, 2017
44b35cd
Lint
dbkr Nov 22, 2017
6024163
s/accountData/pickledAccount/
dbkr Nov 22, 2017
57d425f
Make the save function not return a promise
dbkr Nov 22, 2017
c4e70be
Better comment wording
dbkr Nov 22, 2017
defaa91
Remove unused function
dbkr Nov 22, 2017
6ebfd17
jsdoc clarifications
dbkr Nov 22, 2017
7e2c236
Missed a s/account data/picked account/
dbkr Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/crypto/store/indexeddb-crypto-store-backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,15 @@ export class Backend {

/**
* Load the end to end account for the logged-in user. Once the account
* is retrieved, the given function is executed and passed the base64
* encoded account string and a method for saving the account string
* is retrieved, the given function is executed and passed the pickled
* account string and a method for saving the pickle
* back to the database. This allows the account to be read and writen
* atomically.
* @param {func} func Function called with the account data and a save function
* @return {Promise} Resolves with the return value of the function once
* @param {function(string, function())} func Function called with the
* account data and a save function
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pickled account

* @return {Promise} Resolves with the return value of `func` once
* the transaction is complete (ie. once data is written back if the
* save function is called.
* save function is called.)
*/
endToEndAccountTransaction(func) {
const txn = this._db.transaction("account", "readwrite");
Expand Down
11 changes: 6 additions & 5 deletions src/crypto/store/indexeddb-crypto-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,15 @@ export default class IndexedDBCryptoStore {

/**
* Load the end to end account for the logged-in user. Once the account
* is retrieved, the given function is executed and passed the base64
* encoded account string and a method for saving the account string
* is retrieved, the given function is executed and passed the pickled
* account string and a method for saving the pickle
* back to the database. This allows the account to be read and writen
* atomically.
* @param {func} func Function called with the account data and a save function
* @return {Promise} Resolves with the return value of the function once
* @param {function(string, function())} func Function called with the
* account data and a save function
* @return {Promise} Resolves with the return value of `func` once
* the transaction is complete (ie. once data is written back if the
* save function is called.
* save function is called.)
*/
endToEndAccountTransaction(func) {
return this._connect().then((backend) => {
Expand Down