Merge pull request #711 from kikeelectronico/refactor_rest_api

Refactor rest api

back/data.py

@@ -138,13 +138,7 @@ def __init__(self):
 
 # BACKUP
 
-	def createBackupFile(self):
-		data = self.getBackupData()
-		file = open('../' + self.homewareFile, 'w')
-		file.write(json.dumps(data))
-		file.close()
-
-	def getBackupData(self):
+	def getBackup(self):
 		user = self.mongo_db["users"].find()[0]
 		oauth = self.mongo_db["oauth"].find()[0]
 		data = {
@@ -174,10 +168,7 @@ def getBackupData(self):
 		}
 		return data
 
-	def loadBackupFile(self):
-		file = open('../' + self.homewareFile, 'r')
-		data = json.load(file)
-		file.close()
+	def restoreBackup(self, data):
 		# Load the devices
 		for device in data['devices']:
 			device["_id"] = device["id"]
@@ -403,15 +394,15 @@ def validateUserToken(self, token):
 		ddbb_token = user_data["token"]
 		return token == ddbb_token
 
-	def googleSync(self, username, password, responseURL):
+	def googleSync(self, username, password):
 		username = headers['user']
 		password = headers['pass']
 		user_data = self.mongo_db["users"].find()[0]
 		ddbb_password_hash = user_data["password"]
 		ddbb_username = user_data["username"]
 		auth = False
 		if username == ddbb_username and bcrypt.checkpw(password.encode('utf-8'),ddbb_password_hash[2:-1].encode('utf-8')):
-			return responseURL
+			return self.redis.get("responseURL")
 		else:
 			return "fail"
 
@@ -469,6 +460,9 @@ def validateOauthCredentials(self, type, value):
 		if not type in ["client_id", "client_secret"]: return False
 		return self.mongo_db["settings"].find()[0][type] == value
 
+	def setResponseURL(self, url):
+		self.redis.set("responseURL", url)
+
 # SETTINGS
 
 	def getSettings(self):
@@ -504,6 +498,11 @@ def updateSyncGoogle(self, status):
 	def getSyncDevices(self):
 		return self.mongo_db["settings"].find()[0]["sync_devices"]
 
+	def createServiceAccountKeyFile(self, serviceaccountkey):
+		with open("../files/google.json", "w") as file:
+			file.write(json.dumps(serviceaccountkey))
+		self.log('Info', 'A google auth file has been uploaded')
+
 # SYSTEM
 
 	def getRedisStatus(self):

back/errorResponses.py

@@ -0,0 +1,29 @@
+from fastapi.responses import JSONResponse
+
+FOUR_O_ONE = JSONResponse(status_code=401,
+                            content = {
+                                "error": "Authentication is needed",
+                                "code": 401,
+                                "note": "See the documentation https://homeware.enriquegomez.me/api-docs.html"
+                            })
+
+FOUR_O_THREE = JSONResponse(status_code=403,
+                            content = {
+                                "error": "Authentication fail",
+                                "code": 403,
+                                "note": "See the documentation https://homeware.enriquegomez.me/api-docs.html"
+                            })
+
+FOUR_O_FOUR = JSONResponse(status_code=404,
+                            content = {
+                                "error": "Not found",
+                                "code": 404,
+                                "note": "See the documentation https://homeware.enriquegomez.me/"
+                            })
+
+FOUR_O_O = JSONResponse(status_code=400,
+                            content = {
+                                "error": "Operation not supported",
+                                "code": 400,
+                                "note": "See the documentation https://homeware.enriquegomez.me/"
+                            })