From 06064e6264beab0842cb45d806bacf4031c113f0 Mon Sep 17 00:00:00 2001 From: GQMai Date: Wed, 6 Oct 2021 16:33:18 +0800 Subject: [PATCH 1/4] Frontend config update --- www/src/config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/src/config.js b/www/src/config.js index 8bbfd6e9..bb741b94 100644 --- a/www/src/config.js +++ b/www/src/config.js @@ -2,10 +2,10 @@ // aws cloudformation describe-stacks --stack-name --query "Stacks[0].Outputs[]" const config = { - "aws_user_pools_web_client_id": "None", // CognitoClientID - "api_base_url": "None", // TodoFunctionApi - "cognito_hosted_domain": "None", // CognitoDomainName - "redirect_url": "None" // AmplifyURL + "aws_user_pools_web_client_id": "2jpqog2ak1t3qt6fmsrmrnrdbo", // CognitoClientID + "api_base_url": "https://1d4ldfwec0.execute-api.ap-southeast-1.amazonaws.com/dev", // TodoFunctionApi + "cognito_hosted_domain": "mytodoappdemo-todo-demo.auth.ap-southeast-1.amazoncognito.com", // CognitoDomainName + "redirect_url": "https://master.d1ooex4fqfbp8g.amplifyapp.com" // AmplifyURL }; export default config; From 2390f35092b8333ace2fe602d5db8f6d8f00dab1 Mon Sep 17 00:00:00 2001 From: GQMai Date: Wed, 6 Oct 2021 22:06:29 +0800 Subject: [PATCH 2/4] Frontend config update --- www/src/config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/src/config.js b/www/src/config.js index bb741b94..ca57f099 100644 --- a/www/src/config.js +++ b/www/src/config.js @@ -2,10 +2,10 @@ // aws cloudformation describe-stacks --stack-name --query "Stacks[0].Outputs[]" const config = { - "aws_user_pools_web_client_id": "2jpqog2ak1t3qt6fmsrmrnrdbo", // CognitoClientID - "api_base_url": "https://1d4ldfwec0.execute-api.ap-southeast-1.amazonaws.com/dev", // TodoFunctionApi - "cognito_hosted_domain": "mytodoappdemo-todo-demo.auth.ap-southeast-1.amazoncognito.com", // CognitoDomainName - "redirect_url": "https://master.d1ooex4fqfbp8g.amplifyapp.com" // AmplifyURL + "aws_user_pools_web_client_id": "31i4f4k9uqujnsl6o4aumcvlgu", // CognitoClientID + "api_base_url": "https://l1unaseofh.execute-api.us-west-2.amazonaws.com/prod", // TodoFunctionApi + "cognito_hosted_domain": "mytodoappdemo-todo-demo.auth.us-west-2.amazoncognito.com", // CognitoDomainName + "redirect_url": "https://master.d1gbbx9nzhqa8j.amplifyapp.com" // AmplifyURL }; export default config; From 21046e8f5f13a0c6fcf84ded1ff2233fbfe3549d Mon Sep 17 00:00:00 2001 From: GQMai Date: Tue, 12 Oct 2021 11:21:23 +0800 Subject: [PATCH 3/4] fix request validation error --- todo-src/addTodo/app.js | 2 +- todo-src/completeTodo/app.js | 2 +- todo-src/deleteTodo/app.js | 2 +- todo-src/getTodo/app.js | 2 +- todo-src/updateTodo/app.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/todo-src/addTodo/app.js b/todo-src/addTodo/app.js index 4248dd03..c100fa75 100644 --- a/todo-src/addTodo/app.js +++ b/todo-src/addTodo/app.js @@ -78,7 +78,7 @@ exports.addToDoItem = metricScope((metrics) => async (event, context) => { metrics.putDimensions({ Service: "addTodo" }); metrics.setProperty("RequestId", context.requestId); - if (!isValidRequest(context, event)) { + if (!isValidRequest(event)) { metrics.putMetric("Error", 1, Unit.Count); return response(400, { message: "Error: Invalid request" }); } diff --git a/todo-src/completeTodo/app.js b/todo-src/completeTodo/app.js index 3e3ec30c..3af8cedd 100644 --- a/todo-src/completeTodo/app.js +++ b/todo-src/completeTodo/app.js @@ -65,7 +65,7 @@ exports.completeToDoItem = metricScope((metrics) => async (event, context) => { metrics.putDimensions({ Service: "completeTodo" }); metrics.setProperty("RequestId", context.requestId); - if (!isValidRequest(context, event)) { + if (!isValidRequest(event)) { metrics.putMetric("Error", 1, Unit.Count); return response(400, { message: "Error: Invalid request" }); } diff --git a/todo-src/deleteTodo/app.js b/todo-src/deleteTodo/app.js index 09dce06d..315d5b95 100644 --- a/todo-src/deleteTodo/app.js +++ b/todo-src/deleteTodo/app.js @@ -63,7 +63,7 @@ exports.deleteToDoItem = metricScope((metrics) => async (event, context) => { metrics.putDimensions({ Service: "deleteTodo" }); metrics.setProperty("RequestId", context.requestId); - if (!isValidRequest(context, event)) { + if (!isValidRequest(event)) { metrics.putMetric("Error", 1, Unit.Count); return response(400, { message: "Error: Invalid request" }); } diff --git a/todo-src/getTodo/app.js b/todo-src/getTodo/app.js index 883fcebd..f1176734 100644 --- a/todo-src/getTodo/app.js +++ b/todo-src/getTodo/app.js @@ -62,7 +62,7 @@ exports.getToDoItem = metricScope((metrics) => async (event, context) => { metrics.setNamespace("TodoApp"); metrics.putDimensions({ Service: "getTodo" }); metrics.setProperty("RequestId", context.requestId); - if (!isValidRequest(context, event)) { + if (!isValidRequest(event)) { metrics.putMetric("Error", 1, Unit.Count); return response(400, { message: "Error: Invalid request" }); } diff --git a/todo-src/updateTodo/app.js b/todo-src/updateTodo/app.js index 7e92fb17..2921a8c6 100644 --- a/todo-src/updateTodo/app.js +++ b/todo-src/updateTodo/app.js @@ -81,7 +81,7 @@ exports.updateToDoItem = metricScope((metrics) => async (event, context) => { metrics.putDimensions({ Service: "updateTodo" }); metrics.setProperty("RequestId", context.requestId); - if (!isValidRequest(context, event)) { + if (!isValidRequest(event)) { metrics.putMetric("Error", 1, Unit.Count); return response(400, { message: "Error: Invalid request" }); } From 3a0210f1bc396958d81471843958d872c94e8ce0 Mon Sep 17 00:00:00 2001 From: GQMai Date: Tue, 12 Oct 2021 11:21:39 +0800 Subject: [PATCH 4/4] fix test path error --- todo-src/package.json | 2 +- todo-src/test/unit/test-handler.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/todo-src/package.json b/todo-src/package.json index 2baf0ac4..9b014070 100644 --- a/todo-src/package.json +++ b/todo-src/package.json @@ -10,7 +10,7 @@ "axios": "^0.21.1" }, "scripts": { - "test": "mocha tests/unit/" + "test": "mocha test/unit/" }, "devDependencies": { "chai": "^4.2.0", diff --git a/todo-src/test/unit/test-handler.js b/todo-src/test/unit/test-handler.js index bd75a0ba..8080974d 100644 --- a/todo-src/test/unit/test-handler.js +++ b/todo-src/test/unit/test-handler.js @@ -1,6 +1,6 @@ 'use strict'; -const app = require('../../app.js'); +const app = require('../../getTodo/app.js'); const chai = require('chai'); const expect = chai.expect; var event, context;