From 3c6229477d8ceda48667ee20709d75487cfae91c Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <slococo@itba.edu.ar>
Date: Mon, 5 Dec 2022 17:51:57 -0300
Subject: [PATCH] Fix bugs and update lambda

Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
---
 terraform/organization/datasources.tf         |   4 +-
 terraform/organization/dynamodb.tf            |   7 +-
 terraform/organization/html/index.html        |  98 +++++++++++++++++-
 terraform/resources/lambda/lambdaDB.zip       | Bin 521 -> 653 bytes
 .../lambda/lambdaDB/lambda_handler.py         |  12 ++-
 terraform/resources/lambda/lambdaError.zip    | Bin 559 -> 559 bytes
 terraform/resources/lambda/lambdaGET.zip      | Bin 321 -> 321 bytes
 terraform/resources/lambda/lambdaRemove.zip   | Bin 496 -> 509 bytes
 .../lambda/lambdaRemove/lambda_handler.py     |   3 +-
 terraform/resources/lambda/lambdaSNS.zip      | Bin 393 -> 393 bytes
 terraform/resources/lambda/lambdaSQS.zip      | Bin 519 -> 519 bytes
 terraform/resources/lambda/lambdaUpdate.zip   | Bin 414 -> 414 bytes
 .../resources/lambda/lambdaUpdateAPI.zip      | Bin 483 -> 483 bytes
 13 files changed, 116 insertions(+), 8 deletions(-)
diff --git a/terraform/organization/datasources.tf b/terraform/organization/datasources.tf
index 3379531..12683c1 100644
--- a/terraform/organization/datasources.tf
+++ b/terraform/organization/datasources.tf
@@ -14,6 +14,7 @@ data "template_file" "userdata" {
   template = file("${path.module}/html/index.html")
   vars = {
     ENDPOINT = "${module.apigw.endpoint}"
+    token = ""
   }
 }
 
@@ -25,7 +26,8 @@ data "aws_iam_policy_document" "dynamodb" {
       "dynamodb:Scan",
       "dynamodb:GetItem",
       "dynamodb:UpdateItem",
-      "dynamodb:DeleteItem"
+      "dynamodb:DeleteItem",
+      "dynamodb:Query",
     ]
     principals {
       type        = "AWS"
diff --git a/terraform/organization/dynamodb.tf b/terraform/organization/dynamodb.tf
index ef75666..661e4e8 100644
--- a/terraform/organization/dynamodb.tf
+++ b/terraform/organization/dynamodb.tf
@@ -9,9 +9,14 @@ module "dynamodb" {
   billing_mode   = "PROVISIONED"
   read_capacity  = 20
   write_capacity = 20
-  hash_key       = "id"
+  hash_key       = "username"
+  range_key      = "id"
 
   attributes = [
+    {
+      name = "username"
+      type = "S"
+    },
     {
       name = "id"
       type = "N"
diff --git a/terraform/organization/html/index.html b/terraform/organization/html/index.html
index 5634c1e..a0a8410 100644
--- a/terraform/organization/html/index.html
+++ b/terraform/organization/html/index.html
@@ -5,7 +5,9 @@
 <head>
     <title>BSMSapp</title>
     <div align="center">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
 </head>
+
 <div class="d-flex flex-column justify-content-center w-100 h-100">
     <br><br>
     <body bgcolor="#FFFFFF" text="Black">
@@ -13,7 +15,9 @@
             <h1><span id="replace">BSMSapp</span></h1>
         </header>
 
-        <form id="myForm" class="form-style">
+        <button class="style" id="login">Login</button>
+
+        <form id="myForm" class="form-style" style="display:none">
             <ul>
                 <li>
                     <input value="0" name="id" type="number" min="0"/>
@@ -30,7 +34,7 @@
             </ul>
         </form>
 
-        <button class="style" onclick="get_table()">Get table</button>
+        <button class="style" onclick="get_table()" style="display:none" id="tableBtn">Get table</button>
         <br><br>
         <table id="table" align="center" border="1px"></table>
     </body>
@@ -39,6 +43,44 @@
 </html>
 
 <script>
+    document.getElementById("login").onclick = function () {
+        location.href = "https://santilococo.auth.us-east-1.amazoncognito.com/login?client_id=2a9hfokn5a1flh1j3hmp0c035u&response_type=code&scope=email+openid+phone&redirect_uri=https%3A%2F%2Fsantilococo.com.ar";
+    };
+
+    var token = localStorage.getItem('token') || undefined;
+    console.log(token)
+
+    if (typeof token === 'undefined' || token === null) {
+        console.log('no hay token guardado')
+        aux = get_token()
+        var promiseB = aux.then(function(result) {
+            if (result) {
+                token = result["access_token"]
+                localStorage.setItem('token', token);
+                console.log(token)
+                username = get_user(token)
+
+                var prom = username.then(function(result) {
+                    username = result["username"]
+                    localStorage.setItem('username', token);
+                    console.log(username)
+                });
+            }
+        });
+    } else {
+        $("#myForm").show();
+        $("#tableBtn").show();
+        $("#login").hide();
+
+        username = get_user(token)
+
+        var prom = username.then(function(result) {
+            username = result["username"]
+            localStorage.setItem('username', token);
+            console.log(username)
+        });
+    }
+
     const thisForm = document.getElementById('myForm');
     thisForm.addEventListener('submit', async function (e) {
         e.preventDefault();
@@ -48,7 +90,9 @@
         } else {
             api_method = "DELETE"
         }
-        const formData = new FormData(thisForm).entries()
+        formData = new FormData(thisForm)
+        formData.append("username", username)
+        formData = formData.entries()
         const str = JSON.stringify(Object.fromEntries(formData))
         const response = await fetch("${ENDPOINT}/products", {
             method: api_method,
@@ -68,7 +112,11 @@
     }
 
     async function get_table() {
-        const request = await fetch("${ENDPOINT}/products", {
+        aux = username
+        queryParam = new URLSearchParams({
+            username: aux
+        })
+        const request = await fetch("${ENDPOINT}/products?" + queryParam, {
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json'
@@ -111,6 +159,48 @@
         el.appendChild(table);
     }
 
+    async function get_token() {
+        const urlParams = new URLSearchParams(window.location.search);
+        const code = urlParams.get('code');
+
+        if (!code) {
+            return undefined
+        }
+
+        $("#myForm").show();
+        $("#tableBtn").show();
+        $("#login").hide();
+
+        const response = await fetch('https://santilococo.auth.us-east-1.amazoncognito.com/oauth2/token', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded'
+            },    
+            body: new URLSearchParams({
+                'grant_type': 'authorization_code',
+                'code': code,
+                'client_id': '2a9hfokn5a1flh1j3hmp0c035u',
+                'redirect_uri': 'https://santilococo.com.ar'
+            })
+        });
+
+        return await response.json()
+    }
+
+    async function get_user(token) {
+        str = 'Bearer ' + token
+        const response = await fetch('https://santilococo.auth.us-east-1.amazoncognito.com/oauth2/userInfo', {
+            method: 'GET',
+            headers: {
+                "Authorization" : str
+            }
+        });
+
+        return await response.json()
+    }
+
+
+
 </script>
 
 <style type="text/css">
diff --git a/terraform/resources/lambda/lambdaDB.zip b/terraform/resources/lambda/lambdaDB.zip
index c25b0279c39ea00605b2323707e2376b8ba7a08f..72a772643fbde74a1d590eec6657c65043587cf2 100644
GIT binary patch
delta 601
zcmeBV>1CA&@MdNaVPIh3V3^w58v4iEQT{3;14B9UL<yOCtBAg25H79YW?*D_!OXw_
zCQ^f9vu_)S)LvgNP}Lcnb9rrkqfLsh{I-KpCldG<in#7NH|5kM?US)*Uew>8nqr=*
zW)SgRW^VPn_AKkyOtux-9jE?VOTXdGoRj-GUzh!Gw08N{4Q{Iztoc~-q^@1jSe4^y
zk?qm-9E$Z$#qVEQF_*hVaIWj<e3d`@w|sKKJ_V8f7PY!P*B5?RFniLiyNO301@eZ*
zNy_gK3{VL3JCwepLZ;=O<g4cHHI_R&;+L)e@85N9@$6~Z!3VTw1O%<IK493hvL#Gn
z>FJHue0$!??waLWJ8SBUy#Cy(L)JQx@3kM;h0KrmCj7&Xxqjbyr?2NLbZ@-6o;H`|
zTKuZNyg|a-A2)A{QL?V|+&FhCGn-q+>A0$b!)g|(-}vt&o?<w+`S=mvh)-JWYku&2
z>|1ugwOWTYe&@TzOI_~IJK#P^-qdTchFV2aa=Xo(>PDx}QgK~h%)-?wA9O5Zdc7o6
z;d5Ek?A^)jcR&5u{zoCA{t|mSzk;5Hv8wl+C8Fmy|D0CKd*RqB54q+2X8-n`pZ+kb
z<=*{A0XLiK_U+U2zmWgHs4S)MnEwGU4xiA4`yZ@X7Z!Ef{_5V~>eLBm*4^-Y^43TH
zo6yHC-kb8R<B#kr^xYC)7xVqj)a@sWqYh@w{lgsK&B!Fjj7SVzh}1B78>5ycmZT8i
T&B_K$JPeFL7!ITrm_R%L$lVB5

delta 441
zcmeBW?PQS%@MdNaVPIh3U?_Ae4_y%U=4c=z149JUL<yOCH_p0bjnb~<(h6<{MwS=M
z3=Ci*HPF}pumR8B@8K>x*UY|^wL$t4U-DxH_A&_}_LhKIyOe`x`4n>bT>fY6cX=bf
zj;q(7d2heVT+LbgIj8xWiq<{v*Kbu;&drTr4Kj7wEGMbzskGH0rJKV>B2&8{Q$v4V
z*y-nXhI_mv>Rnk&Ef!t1bG=Y{ENAD-jRLFExTZSl_q0se@aD#k9+5+h`EwIr#3t}g
zUj66mk4OIlg5<84IL#E<ci=~lXSU6sA9Yi%bZyF!dMnO%VOw7a@2a_iy=zZ7x;?&j
zY8HRh;VIi^G&{_{|6#@P?jYu?$K8&4S1hafwkxWHSM2-GDyJ(u>Lnhs2JW83wAA3`
zhhF=tj0yYQ+0Nb<O8%cd_42fu?&43!-`{v!F=y@qe}N}bn)~-hNYD4=?D#onj@9bV
zGp~KKj<?zx)^?)ih`%pi`d_c;w;b=UMQuGRc3EMD*|Nf_pPw)Odbnce?_LGlpR57i
gj7)OOXz{=bj)=)tOj^vqn3$Z-q`)=@D8#@30C3{NAOHXW

diff --git a/terraform/resources/lambda/lambdaDB/lambda_handler.py b/terraform/resources/lambda/lambdaDB/lambda_handler.py
index cf37542..c427187 100644
--- a/terraform/resources/lambda/lambdaDB/lambda_handler.py
+++ b/terraform/resources/lambda/lambdaDB/lambda_handler.py
@@ -1,5 +1,6 @@
 import json
 import boto3
+from boto3.dynamodb.conditions import Key
 from decimal import *
 
 
@@ -14,7 +15,16 @@ def main(event, context):
     client = boto3.resource('dynamodb', region_name="us-east-1")
     table = client.Table("AWSDynamoDB-g3")
 
-    data = table.scan()["Items"]
+    payload = event
+    body = payload["queryStringParameters"]
+    query = body
+
+    key = "username"
+    value = query["username"]
+
+
+    filtering_exp = Key(key).eq(value)
+    data = table.query(KeyConditionExpression=filtering_exp, ProjectionExpression='id, stock')["Items"]
 
     resp = {
         "statusCode": 200,
diff --git a/terraform/resources/lambda/lambdaError.zip b/terraform/resources/lambda/lambdaError.zip
index 9f9aa39cf3ab5750234e195d80227202a140821d..013b42499ac50d005e1596121eb8010c68cff4f9 100644
GIT binary patch
delta 14
VcmZ3_vYusv1@jd9zKzyj7y&1a1#|!a

delta 14
VcmZ3_vYusv1+zwJ*GB6vi~uFd1v&r#

diff --git a/terraform/resources/lambda/lambdaGET.zip b/terraform/resources/lambda/lambdaGET.zip
index 6fd201bbce4ea1063d7d52c0241907ac30120c2c..3d17de371b0a5ee9e2f67b0b2edba98daa3e6415 100644
GIT binary patch
delta 14
VcmX@ebdYI+1@k+FzKzywi~uPT1mOSx

delta 14
VcmX@ebdYI+1#?7G*G6kLMgS);1gQW3

diff --git a/terraform/resources/lambda/lambdaRemove.zip b/terraform/resources/lambda/lambdaRemove.zip
index 55598a12c169f817a96572303e000691660aa656..77b0caa15af46bc8201356e3a5f1c08045bbb06e 100644
GIT binary patch
delta 441
zcmeys{Fhlaz?+#xgn@y9gW+^nYv|N}#@w!q3=Bq03=Dz{GLttjiqvy5F#ikcO9tW6
z3T_5QmKV$n3}C`{qP_oN1A(L8Yq(B(2VHS#&6{d9Wm;z=qe@#)s9%k)Tc7?9egVaO
z*6He@uT*zdpWk1-E%f%nuWt@7JbC3q{Nm%O(^7@})`*@G`M`SYd}Q;n!~OHu8o8|&
z-s`4#bC#;**Q_bFruA-_=abL!Uk~~dB4(v4rSZvp^7+Vl=O;ZjZs?sRv9#-Vtl-_v
zIxBm_OjHFmWEExDq$M|*FLI3(K6xl|p=A(nwp<M7p`V|o@mJ_)@ouSS2-V-H^W)jq
z%IOTde}CHZ<ne|lYgIBn6okm#dL;PkYyPE2r>33>cYa_SK1u%BWD%Jg^)nKTVyqtf
z{^@mo!6Ex}=88L&51Vf<V%e8e-hI^N>3ap02=~7y=ePJ?ZYX{_?cT9Pdgf7&%YUX^
zjg&O{EN$obZ(YU9RFC=#J$^SY^(t7iE^yj<ilb9h{!rYeUkSclbN(_1cr!A|G2@Da
W$qO0PKoKzc6r%#$1Yq1SFaQ7?Q@n}*

delta 434
zcmey%{DE0Kz?+#xgn@y9gW>qPrqJi7j0-Fn85p=Hip$oU&g)7B;nE6j21b?_%nS@*
z!gqqb|6v1xqviEnr@e!&xU}X?wfe#@%*^b;!y4*WqwChEe}hk8VO{w-zkpY&JFDN<
zeb2eO<ptCK4;eG%{%P~<Na@kE_~@23`>^;8gXgBV80-_bCC%~Eu5J$cXzE||Ds)9v
zR?j8JBlS^xV!b~GTV?dFQ9K`)YxX?S%)9SAU(A*x8mV)>SC*WQ2+CfZ>8%uC<y7$|
zCS}FFQ*5EGD(vaK-#kp$xIX8eU?;LY=>U7A<bt1!A$G@&#Ai=mUd!}m`_W3xW2q;j
zwG0FvtY9|z$^7N@{Ut{yXHH$)c7T21)rzC1EqrfAMVZ{JZ{;^CscYvt(sf@~?6YST
z`^p2Aul)b1<h+vFqhI#r1)uLmL$>|h?#s{LniP4bgR^MoqowNVfA1A^-M<hzalX|8
zC-YlgtxF{i{Y&SayIIrdH*<hDBa<96me6KmU=U=G0LB6X12FIzmNbG`llL)-F$2SY
N@^wZ9wq}qx0|0i+ups~d

diff --git a/terraform/resources/lambda/lambdaRemove/lambda_handler.py b/terraform/resources/lambda/lambdaRemove/lambda_handler.py
index e240072..dd02618 100644
--- a/terraform/resources/lambda/lambdaRemove/lambda_handler.py
+++ b/terraform/resources/lambda/lambdaRemove/lambda_handler.py
@@ -12,7 +12,8 @@ def main(event, context):
     table = client.Table("AWSDynamoDB-g3")
 
     table.delete_item(Key={
-        'id': query["id"]
+        'id': query["id"],
+        'username': query["username"]
     })
 
     resp = {
diff --git a/terraform/resources/lambda/lambdaSNS.zip b/terraform/resources/lambda/lambdaSNS.zip
index d4132c1fb8a04f0f63ece89d6897d6b40fa1ebb3..8f6b26da864090b88b8f32e4ceb967ea6cfb8349 100644
GIT binary patch
delta 14
VcmeBV?qr@|!F)TQZ=<yzBLF0&1lRxo

delta 14
VcmeBV?qr@|!K_i*wb9y-5da{H1V#V=

diff --git a/terraform/resources/lambda/lambdaSQS.zip b/terraform/resources/lambda/lambdaSQS.zip
index 6e3c2cb80e04539d0bc5c51dccd8124feffeca0b..96a72ae7f5ec94a37da65084968bae7e9e7f9964 100644
GIT binary patch
delta 14
VcmZo?X=j;W!Q5)!x6%3xBLE`B1nmF-

delta 14
VcmZo?X=j;W!JO65wbA+vBLE|M1rGoK

diff --git a/terraform/resources/lambda/lambdaUpdate.zip b/terraform/resources/lambda/lambdaUpdate.zip
index 6cc5c8b754b611e7380b2555450921fd60b34feb..3ae8dc820a984f3e29d118c028187f6cdae661db 100644
GIT binary patch
delta 14
VcmbQoJdb&T1#_Ey-$v_XMgSx@1hD`B

delta 14
VcmbQoJdb&T1@qg|u8r2oi~uM(1xf$_

diff --git a/terraform/resources/lambda/lambdaUpdateAPI.zip b/terraform/resources/lambda/lambdaUpdateAPI.zip
index d14c095bb7a2e3717589834762092c64f77ef41b..9f1d4e45a22ae8069645994bb27e7bc7ad94021d 100644
GIT binary patch
delta 14
VcmaFN{Fr%y1#_=`-$v^di~uY31&06t

delta 14
VcmaFN{Fr%y1+#NQ*GB6Vi~uWP1$qDg

