diff --git a/py/api.py b/py/api.py index 7b09e1d..aa226eb 100644 --- a/py/api.py +++ b/py/api.py @@ -49,9 +49,7 @@ class API: if action == "change_password": self.db.update_password(data) if action == "get_data": - self.db.get_data(data) - if action == "change_data": - self.db.change_data(data) + self.db.get_additional_info(data) if action == "check_credentials": self.db.check_credentials(data) diff --git a/py/db.py b/py/db.py index ef82111..37c9ca0 100644 --- a/py/db.py +++ b/py/db.py @@ -19,17 +19,9 @@ class DB: user_data = {"hashed_password": hashed_password} self.database[username] = user_data - def change_data(self, data): - username = data.get['username'] - data = data.get['data'] - if not self.check_credentials(data): - return False - - self.database[username]['data'] = data - return True - def update_password(self, data): username = data.get['username'] + old_password = data.get['old_password'] new_password = data.get['new_password'] if not self.check_credentials(data): return False @@ -48,10 +40,12 @@ class DB: entered_hashed_password = self.hash_password(password) return stored_hashed_password == entered_hashed_password - def get_data(self, data): + def get_additional_info(self, data): username = data.get['username'] + password = data.get['password'] if not self.check_credentials(data): return None - send_back = self.database[username].get['data'] + send_back = self.database[username] + del send_back['hashed_password'] return send_back