Fix bugs and update lambda
Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
This commit is contained in:
parent
016497dbe6
commit
3c6229477d
|
|
@ -14,6 +14,7 @@ data "template_file" "userdata" {
|
||||||
template = file("${path.module}/html/index.html")
|
template = file("${path.module}/html/index.html")
|
||||||
vars = {
|
vars = {
|
||||||
ENDPOINT = "${module.apigw.endpoint}"
|
ENDPOINT = "${module.apigw.endpoint}"
|
||||||
|
token = ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -25,7 +26,8 @@ data "aws_iam_policy_document" "dynamodb" {
|
||||||
"dynamodb:Scan",
|
"dynamodb:Scan",
|
||||||
"dynamodb:GetItem",
|
"dynamodb:GetItem",
|
||||||
"dynamodb:UpdateItem",
|
"dynamodb:UpdateItem",
|
||||||
"dynamodb:DeleteItem"
|
"dynamodb:DeleteItem",
|
||||||
|
"dynamodb:Query",
|
||||||
]
|
]
|
||||||
principals {
|
principals {
|
||||||
type = "AWS"
|
type = "AWS"
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,14 @@ module "dynamodb" {
|
||||||
billing_mode = "PROVISIONED"
|
billing_mode = "PROVISIONED"
|
||||||
read_capacity = 20
|
read_capacity = 20
|
||||||
write_capacity = 20
|
write_capacity = 20
|
||||||
hash_key = "id"
|
hash_key = "username"
|
||||||
|
range_key = "id"
|
||||||
|
|
||||||
attributes = [
|
attributes = [
|
||||||
|
{
|
||||||
|
name = "username"
|
||||||
|
type = "S"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name = "id"
|
name = "id"
|
||||||
type = "N"
|
type = "N"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,9 @@
|
||||||
<head>
|
<head>
|
||||||
<title>BSMSapp</title>
|
<title>BSMSapp</title>
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<div class="d-flex flex-column justify-content-center w-100 h-100">
|
<div class="d-flex flex-column justify-content-center w-100 h-100">
|
||||||
<br><br>
|
<br><br>
|
||||||
<body bgcolor="#FFFFFF" text="Black">
|
<body bgcolor="#FFFFFF" text="Black">
|
||||||
|
|
@ -13,7 +15,9 @@
|
||||||
<h1><span id="replace">BSMSapp</span></h1>
|
<h1><span id="replace">BSMSapp</span></h1>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<form id="myForm" class="form-style">
|
<button class="style" id="login">Login</button>
|
||||||
|
|
||||||
|
<form id="myForm" class="form-style" style="display:none">
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<input value="0" name="id" type="number" min="0"/>
|
<input value="0" name="id" type="number" min="0"/>
|
||||||
|
|
@ -30,7 +34,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</form>
|
</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>
|
<br><br>
|
||||||
<table id="table" align="center" border="1px"></table>
|
<table id="table" align="center" border="1px"></table>
|
||||||
</body>
|
</body>
|
||||||
|
|
@ -39,6 +43,44 @@
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
<script>
|
<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');
|
const thisForm = document.getElementById('myForm');
|
||||||
thisForm.addEventListener('submit', async function (e) {
|
thisForm.addEventListener('submit', async function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
@ -48,7 +90,9 @@
|
||||||
} else {
|
} else {
|
||||||
api_method = "DELETE"
|
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 str = JSON.stringify(Object.fromEntries(formData))
|
||||||
const response = await fetch("${ENDPOINT}/products", {
|
const response = await fetch("${ENDPOINT}/products", {
|
||||||
method: api_method,
|
method: api_method,
|
||||||
|
|
@ -68,7 +112,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
async function get_table() {
|
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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json'
|
'Content-Type': 'application/json'
|
||||||
|
|
@ -111,6 +159,48 @@
|
||||||
el.appendChild(table);
|
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>
|
</script>
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,6 @@
|
||||||
import json
|
import json
|
||||||
import boto3
|
import boto3
|
||||||
|
from boto3.dynamodb.conditions import Key
|
||||||
from decimal import *
|
from decimal import *
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -14,7 +15,16 @@ def main(event, context):
|
||||||
client = boto3.resource('dynamodb', region_name="us-east-1")
|
client = boto3.resource('dynamodb', region_name="us-east-1")
|
||||||
table = client.Table("AWSDynamoDB-g3")
|
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 = {
|
resp = {
|
||||||
"statusCode": 200,
|
"statusCode": 200,
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -12,7 +12,8 @@ def main(event, context):
|
||||||
table = client.Table("AWSDynamoDB-g3")
|
table = client.Table("AWSDynamoDB-g3")
|
||||||
|
|
||||||
table.delete_item(Key={
|
table.delete_item(Key={
|
||||||
'id': query["id"]
|
'id': query["id"],
|
||||||
|
'username': query["username"]
|
||||||
})
|
})
|
||||||
|
|
||||||
resp = {
|
resp = {
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue