Merge pull request #26 from cis3296s24/addFetchToken

added parameters to /getUsers and processFile for multiple column access

receiptifyv1/app.js

@@ -27,8 +27,8 @@ const cors = require('cors');
 require('dotenv').config();
 
 
-const client_id = '82641df2811b48b493da744446b6b90f';
-const client_secret = 'e48944809f164d768c38ca1e9d850021';
+const client_id = '792207d6524f4255a1730e478d8b66f6';
+const client_secret = 'fd5c90696d984ca7a65a54853f340c70';
 //const privateKey = fs.readFileSync('AuthKey_A8FKGGUQP3.p8').toString();
 const teamId = process.env.teamId;
 const keyId = process.env.keyId;
@@ -197,12 +197,27 @@ async function fetchProfile(token) {
 }
 
 app.get('/getUsers', async (req, res) =>{
+  console.log('/getUsers');
   const sessionID = req.query.sessionID;
-  users = await processFile('users.csv', sessionID);
+  const type = req.query.type;
+  let col;
+  //console.log(`Type: ${type}`);
+  if (type === 'display_name')
+  {
+    console.log('Column: display_name');
+    col = 0; 
+  }
+  else if (type === 'access_token')
+  {
+    console.log('Column: access_token');
+    col = 1;
+  }
+  users = await processFile('users.csv', sessionID, col);
+  console.log(users[0]);
   res.json(users);
 });
 
-async function processFile(filePath, sessionID) {
+async function processFile(filePath, sessionID, col) {
   try {
     const fileStream = fs.createReadStream(filePath);
     const rl = readline.createInterface({
@@ -213,7 +228,7 @@ async function processFile(filePath, sessionID) {
     for await (const line of rl) {
       const row = line.split(',');
       if (row[2] == sessionID) {
-        users.push(row[0]);
+        users.push(row[col]);
       }
     }
     await rl.close();

receiptifyv1/public/server.js

@@ -612,9 +612,9 @@ const removeTrack = (i) => {
   }
 };
 
-async function fetchUsers(sessionID) {
+async function fetchUsers(sessionID, type) {
   try {
-    const response = await fetch (`/getUsers?sessionID=${sessionID}`);
+    const response = await fetch (`/getUsers?sessionID=${sessionID}&type=${type}`);
     if (!response.ok) {
       throw new Error(`Error fetching data: ${response.statusText}`);
     }
@@ -626,6 +626,7 @@ async function fetchUsers(sessionID) {
   }
 ;}
 
+
 const displayReceipt = (response, stats) => {
   const type = getType();
   const font = getFont();
@@ -680,7 +681,12 @@ const displayReceipt = (response, stats) => {
   let users;
   (async () => {
     try {
-      users = await fetchUsers(sessionID);
+      users = await fetchUsers(sessionID, 'display_name');
+      console.log('Fetched Users');
+      tokens = await fetchUsers(sessionID, 'access_token');
+      console.log(`Fetched Tokens: ${tokens}`);
+
+      console.log(tokens);
       let total = 0;
       const date = TODAY.toLocaleDateString('en-US', DATE_OPTIONS).toUpperCase();
       const tracksFormatted = responseItems.map((item, i) => {

receiptifyv1/users.csv

@@ -1 +1,17 @@
 display_name, access_token, sessionID, access_time
+
+Ari,BQCP-pEB5lhDy5fNsXl5LoVLNipiN0WDz-inBZRu6ZYEOya5zykLidrXpy1gfhFdfq9H_K5rJeHiRgfGCZWI0i2NPm7lqCCuvkx_mRFwiED_EmFCnisn15nKfwKKd9Rf8TlrKG7Ggfp9v6Rlu2uG0H0dG0VnkukkqAO95CeR-YNUJBeuES-VFAZHhb0ZsxMr53c0wfy3ywVPI9cWmN-Q1YjPrxJqSYMZnMwL1InaOKDw6Xhb7WEYn57-,291061,2024-4-15 14:34:47,
+Ari,BQDxR2Qq9zQ320bpRgN1Wyx7XpmEHTdEAJSdRN2ARQO5Js3-m4fQnOkd80j6iF42fdPGjttX1rbpgu0qjlak5aeUuw_wN0L8UkSqEJZGWvn7aW8bDiwdhACdhExY7C6HVXeNAR8pMoZ_T6ug1kCFfasVtj1OF0j3baFCLeBrSmJnxO5DrhSBpt2LToBxTYJJk1mADVbDi9EkIl8qUW9o_eXjiqkEUy9Oq6Seg1mHgLCIMGjxer3fvTHu,673079,2024-4-15 14:36:50,
+Ari,BQC_6CBiI09pRgGIiNEsu8uYg1Ok-5CWLA8OjaAvCV_cg-RedtPbB9hSizFjywBrcCqqVs-QhJ7VrhnkKz89yduHpc9oMixyzNYIHAHtMJAs_U4VM83cNCVilmh0uxmFz5lDYYeySJH2Oe79P82kypyy-ZgxPyN6LoxkEKupYPAUTRfgIMuWIpdM-UQ0MT2MO0cd7U10Zn7_T_lfeNlt6PiytXVqE_palrUDDnX7w8EmwTzKGNGTAqFt,155495,2024-4-15 14:37:42,
+Ari,BQBwL8Ws7yHCjdd9QV1G3pt-5W3yi0aM7dGujwAGU7HasXUTUVCuc9VLy6kSSw1uOnTv6zy5JWdgsjwj_zJD0vLRIfV20W8kKQLEQDyBDIU2nT5YTdjCpaCpardJsum4yA5utNifSte6jSPD-OSE_kFkRyySQJEVjMGvlwHW9itJHT0gJ0vnYSYQrUHaZFzef1c7lHA_DchqPPnEYN01myNUUlsMS_EjzsWG8iTJUZelzZAyalCFesrI,390038,2024-4-15 14:39:2,
+Ari,BQDL5xAhbDHRKyAFTJpk-a1RKr1_lBbk3PiwA76051ku84IdIHZS3fd52G7gVZzmYT24f6p98dmCWzHcXC5UBl3UPv5Hl0-NbVWHYA6qjT1BAgT2sjEWPGoaSI_wK5T7qq6LpG-3zNzZ6P8y0J-fblgqP-82Pz2u5PTcAcpfkXVPmv5DxED6qkb1hqJppgJ44tRZqA9PwoEC_EyecWa0KHcjeHAep72odnmHz_3C_1h2ibrU_l_x75CT,396375,2024-4-15 14:40:18,
+Ari,BQB0bMB_3wwtSv0QXfthdzm4hyREALV7sCNo6YH3ukzQTPMSH-FtYWiScH-IT3mTivtMR5Uqb7SdJXqf9q4gXsLCFLG1ZP5xOyZo4ohUvzuwVIRTDv5dDN7dWxZBInJ_wxzWnvC5ZYu5sXDs8529Of9Mw2FZB5MWu5wyzi_fRGMhI61I38Qe3zCc3c_lXK8ZvYxCmHVOYsWUiMwDjmOVrT2w-KEKJ8VstbEGACGgMCZAWlw9G6Yzy7zv,714200,2024-4-15 14:44:55,
+Ari,BQDPj3P66_P4pdfXY06WBuphOLGAS2u2XGrUnGPgy8DXDSkXFRa6q1dNnKqLujXV8cidm1EYvTSAmKrzAqlLJWeIGxaectySGkUC-Q1XoQRtZ9FUMKaLZhuZDvF975bXhYzPlQUdYQ26lQhBXiL900awAYL7bKMgnga_wYsHJL5sB8awcnQ_eP0JGcMd2zn_c8YAgdPZbr_HaKiqE1ixGodiEmsjDgEmQRnHBgc4FoJUdmNZ_ZRFY0jQ,564607,2024-4-15 14:45:49,
+Ari,BQCUpHjjSj0Tm4v2nOBN6pxh7BdF08i1ZR-b2UYV0IYFcqwSEgzkGxjpByi7u-VyZ3oPcSz40BUVAX44U4rQWMb3MpF_oEMebbuPCMENMEhlmrZBt5XO1ht2KCgvE4h2_0RVG5QLbL_5xI-ri4R33-BCEx3MjRZTuGOPx7GK5ZN7IqtEJ87xBKVudpSqhVWTezIAGDTRKcdopvq3zY89Pq8JgExco-SdN0iFYxU6FVd2rHv6N-e5ARuF,528179,2024-4-15 14:46:33,
+Ari,BQD8la1RfCxvzudwnw99fsEBk9Jp_7L_p0P6oOMvfOd9Vk3DK-afRLrQDNo9_jY9IgE1lyYAbbl9E8d4d12kfI1uPxW6wdV70EKOlSTQcZDfgH5EDGI1JiSlPmYK-Zmv-4cU9U0gdoHyQmN9W-x6x7JFD-j7uF6dM7I6v9OQgLz47oerjmWaoCA4gM2gZujbCfkOfWEY07R_ooMySklr_j-Bb3b6CL-7jprW9ohd_xBtq52SbKhE33Ds,783469,2024-4-15 14:47:8,
+Ari,BQC-tetSYPxQAebmeB0ZzmMZ0OagVDByR9hv10a9go8UsfZ9V_9N38-fSPipo4V720VWCB71g3CDaYZlRBn-kl9wr5Un_9hiG5YGmAIZkwaryILCBC7VkVJBiVJ6SgsJf_rBX_yST_TmRfVSCnRdmTUNinVWoiYA2_dTEWXJViw7LJSoxDavTCVvM6xGN1Rf2s5oAgCS7xn0iJlB2B4tmpKv2nYC8MLg4H8N7gQZbT8xCEmoGJjsn_YS,300389,2024-4-15 14:47:25,
+Ari,BQCC5kiilFi72ZdfDH6HV2sAv9MDNpTUGSPJSuWRdmUkEL-qUZi9ZSUDEtf4sx79DxqV0dlG0GJi5pc2uQ1WaE5nJR1m4mGjb4dE7buF2Q1CMoAZdfNWCAvUyfTDzK_zxvSdRDsRPUFaIz3rmz0QH0Ju7VhRnahNGkco5WOTQ7V8t8lXUtXM96L7WThv_bzu7NhoW9CBnEdg4jUPWxPfdRSP0jl_2X5EiJ_LaL9grLoTJ7zZGHT6CVmB,322975,2024-4-15 14:47:54,
+Ari,BQBhPJqs8q65jmRm3sWQVfKx4hFMtH-bT4-gIvAer3g8VIzPIjcSCjpc-Ic33XrYYnMw97jgPhunQVVrRu_bgcwtwqjjf_hyP957-LXKCc_PCDJDsCmDHup2jzefro-crBzGnsx-qRpIYge-UWI0Gx9YAHl9vE4yYiQSzug2CdVoPmSTklxbIytYHbx9hl2UbLC_VKn4JcbUI2xXqoIpH1m64g-OkLakKEZbDY4-F7TDYXqi4OWMVXG9,235388,2024-4-15 14:49:2,
+Ari,BQBHzxbGmc0wHua739cG2Zv_lC1fepZMJJyejmvj-EXHsXsivQJSWV3nONwbXoXylpjTYI1VTunEVe4gWXlvVQ5Zb_s60lzFYjA2dmtTaoRALOjakaCJcC3a7OU6KaavSg_uW-1M3Fh7edAccZUAM5XtxOYNuSeqmrPj0k-kXxYbpEp98RH-DLYTXOPM16sesI68aSTEeGgpEQaRB0Sh-rW9YBI3HG2uaAR70ANul8QgK0FuzXTH3SB8,473057,2024-4-15 14:53:37,
+Ari,BQBFcW3jp-1bZ1RBCAr6TdNgbo8hpWk1pQ7JqmICm_7Pjz1FmZhkQwubN3E8C9JpQat6JuzzxvrZXe5WsFNPqfpAVdjli-GiiqYT3yLKSWggQDvo7R5GSv8ew5s-jTOUC5fOA9eAsPxZsXuDrGkz58YlL4IIz4_yPs8aiEYxGnahfgxepX8ITJlmtqIGGvkOzBDa_xVg4OOn0tRGWGGbMO8HgrrBP9D0koKL4H8GG1J4bs9J788ZkIIN,874240,2024-4-15 14:56:20,
+Ari,BQBZWoC_MjVJb-Wf79eRG4K0y5isbAis_iXgqCB-a4yB1Kn_Sfclp_rUGal5trve4IYfjm2kGKgvhXyr7hxCpVG9BgJtwwqxi_LXMWIjMKvrQRhaJTgGQ6274GGWA1ZW-sW_rvDUpHW4tzXjhXfLHnGVbIyRfkYkR3ZZh5NiYXr87C5tCVAuK483BMA7bHmAjl15PrA5KSd3p6Rc4cQbL-s91oVS364AAffsO12JSbRHZx3iWJ08inHM,528748,2024-4-15 14:57:11,