From cfe3492a80786e770b82391dee77610ad5d25ce8 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Mon, 28 Aug 2023 19:27:10 +0530 Subject: [PATCH] add cors --- cloud-functions/nodejs/functions/index.js | 11 ++++++++++- scripts/consolidated_data.py | 3 ++- scripts/multiple_users.sh | 4 ++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cloud-functions/nodejs/functions/index.js b/cloud-functions/nodejs/functions/index.js index f2cda47..f61d66c 100644 --- a/cloud-functions/nodejs/functions/index.js +++ b/cloud-functions/nodejs/functions/index.js @@ -6,8 +6,17 @@ const moment = require('moment'); admin.initializeApp(); - exports.registerUser = functions.region("asia-south1").https.onRequest(async (req, res) => { + res.set('Access-Control-Allow-Origin', "*") + res.set('Access-Control-Allow-Methods', 'GET, POST'); + + if (req.method === "OPTIONS") { + // stop preflight requests here + res.set("Access-Control-Allow-Headers", "Content-Type, x-client"); + res.status(204).send(''); + return; + } + try { const token = "e16a1bd15af2ee640f5a7a18c8d8333f5f01f7c66e003bbc21ee52870f1bce27"; logger.info(`User-Agent ${req.get("User-Agent")}`); diff --git a/scripts/consolidated_data.py b/scripts/consolidated_data.py index 10f9f81..4038256 100644 --- a/scripts/consolidated_data.py +++ b/scripts/consolidated_data.py @@ -72,9 +72,10 @@ if __name__ == "__main__": writer = pd.ExcelWriter(output_path, engine = 'openpyxl') df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)] df = df.sort_values(by=['testTime'], ascending=False) - # df = df.drop(['resultData', "reportUploadTime", "userImageURL", "testType", "birthYear", "testStatus"], axis=1) + df = df[["_id", "calculatedRatio", "deviceId", "deviceRatio", "deviceType", "kitSerial", "led1Average", "led1Buffer", "led1Sample", "led2Average", "led2Buffer", "led2Sample", "location", "deviceSerialNumber", "name", "testTime"]] df.rename(columns={'deviceSerialNumber': "login_id", "calculatedRatio": "calibrated_ratio", "led1Buffer": "427_buffer_intensity", "led2Buffer": "555_buffer_intensity", "led1Sample": "427_sample_intensity", "led2Sample": "555_sample_intensity", "led1Average": "427_absorbance", "led2Average": "555_absorbance"}, inplace = True) + df = df.reindex(sorted(df.columns), axis=1) df.to_excel(writer, sheet_name = 'data', index=False) writer.close() diff --git a/scripts/multiple_users.sh b/scripts/multiple_users.sh index e69de29..63072e3 100644 --- a/scripts/multiple_users.sh +++ b/scripts/multiple_users.sh @@ -0,0 +1,4 @@ +for i in {1..10} +do + echo $i +done