0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set the key attributes on server post login

Browse source
This commit is contained in:
Vishnu Mohandas 2020-09-05 15:08:03 +05:30
parent 46d9c45914
commit 29ac224785
3 changed files with 20 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/core/configuration.dart
View file

@ -122,14 +122,22 @@ class Configuration {
}
Future<void> setKeyAttributes(KeyAttributes attributes) async {
await _preferences.setString(keyKekSalt, attributes.kekSalt);
await _preferences.setString(keyKekHash, attributes.kekHash);
await _preferences.setString(keyKekHashSalt, attributes.kekHashSalt);
await _preferences.setString(keyEncryptedKey, attributes.encryptedKey);
await _preferences.setString(keyEncryptedKeyIV, attributes.encryptedKeyIV);
await _preferences.setString(
keyKekSalt, attributes == null ? null : attributes.kekSalt);
await _preferences.setString(
keyKekHash, attributes == null ? null : attributes.kekHash);
await _preferences.setString(
keyKekHashSalt, attributes == null ? null : attributes.kekHashSalt);
await _preferences.setString(
keyEncryptedKey, attributes == null ? null : attributes.encryptedKey);
await _preferences.setString(keyEncryptedKeyIV,
attributes == null ? null : attributes.encryptedKeyIV);
}
KeyAttributes getKeyAttributes() {
if (_preferences.getString(keyEncryptedKey) == null) {
return null;
}
return KeyAttributes(
_preferences.getString(keyKekSalt),
_preferences.getString(keyKekHash),

2
lib/ui/passphrase_entry_page.dart
View file

@ -144,7 +144,7 @@ class _PassphraseEntryPageState extends State<PassphraseEntryPage> {
onPressed: () {
Navigator.of(context).pop();
UserAuthenticator.instance
.setPassphrase(context, _passphraseController1.text);
.setupKey(context, _passphraseController1.text);
},
),
],

69
lib/user_authenticator.dart
View file

@ -85,16 +85,15 @@ class UserAuthenticator {
});
}
Future<void> setPassphrase(BuildContext context, String passphrase) async {
Future<void> setupKey(BuildContext context, String passphrase) async {
final dialog = createProgressDialog(context, "Please wait...");
await dialog.show();
await Configuration.instance.generateAndSaveKey(passphrase);
final keyAttributes =
await Configuration.instance.generateAndSaveKey(passphrase);
await _dio
.put(
Configuration.instance.getHttpEndpoint() + "/users/encrypted-key",
data: {
"encryptedKey": Configuration.instance.getEncryptedKey(),
},
Configuration.instance.getHttpEndpoint() + "/users/key-attributes",
data: keyAttributes.toMap(),
options: Options(
headers: {
"X-Auth-Token": Configuration.instance.getToken(),
@ -120,66 +119,10 @@ class UserAuthenticator {
});
}
@deprecated
Future<bool> login(String username, String password) {
return _dio.post(
Configuration.instance.getHttpEndpoint() + "/users/authenticate",
data: {
"username": username,
"password": password,
}).then((response) {
if (response.statusCode == 200 && response.data != null) {
_saveConfiguration(response);
Bus.instance.fire(UserAuthenticatedEvent());
return true;
} else {
return false;
}
}).catchError((e) {
_logger.severe(e.toString());
return false;
});
}
@deprecated
Future<bool> create(String username, String password) {
return _dio
.post(Configuration.instance.getHttpEndpoint() + "/users", data: {
"username": username,
"password": password,
}).then((response) {
if (response.statusCode == 200 && response.data != null) {
_saveConfiguration(response);
return true;
} else {
if (response.data != null && response.data["message"] != null) {
throw Exception(response.data["message"]);
} else {
throw Exception("Something went wrong");
}
}
}).catchError((e) {
_logger.severe(e.toString());
throw e;
});
}
Future<void> setEncryptedKeyOnServer() {
return _dio.put(
Configuration.instance.getHttpEndpoint() + "/users/encrypted-key",
data: {
"encryptedKey": Configuration.instance.getEncryptedKey(),
},
options: Options(headers: {
"X-Auth-Token": Configuration.instance.getToken(),
}),
);
}
void _saveConfiguration(Response response) {
Configuration.instance.setUserID(response.data["id"]);
Configuration.instance.setToken(response.data["token"]);
final keyAttributes = response.data["encryptedKey"];
final keyAttributes = response.data["keyAttributes"];
if (keyAttributes != null) {
Configuration.instance
.setKeyAttributes(KeyAttributes.fromMap(keyAttributes));