diff --git a/amplify/README.md b/amplify/README.md new file mode 100644 index 00000000..7c0a9e28 --- /dev/null +++ b/amplify/README.md @@ -0,0 +1,8 @@ +# Getting Started with Amplify CLI +This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli). + +Helpful resources: +- Amplify documentation: https://docs.amplify.aws +- Amplify CLI documentation: https://docs.amplify.aws/cli +- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files +- Join Amplify's community: https://amplify.aws/community/ diff --git a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml index c2fbcc94..29c071d2 100644 --- a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml +++ b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml @@ -178,9 +178,6 @@ Resources: ] Schema: - - Name: birthdate - Required: true - Mutable: true - Name: email Required: true @@ -190,10 +187,6 @@ Resources: Required: true Mutable: true - - Name: gender - Required: true - Mutable: true - - Name: given_name Required: true Mutable: true diff --git a/amplify/backend/function/fsCoreApiResolver/src/index.js b/amplify/backend/function/fsCoreApiResolver/src/index.js index 6c1d5c6c..e5c5d95b 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/index.js +++ b/amplify/backend/function/fsCoreApiResolver/src/index.js @@ -1063,14 +1063,6 @@ exports.handler = async function (ctx) { ...((updateData.lastName && [{ Name: 'family_name', Value: updateData.lastName - }]) || []), - ...((updateData.birthdate && [{ - Name: 'birthdate', - Value: updateData.birthdate - }]) || []), - ...((updateData.gender && [{ - Name: 'gender', - Value: updateData.gender }]) || []) ], UserPoolId: USERPOOL, @@ -2315,8 +2307,6 @@ exports.handler = async function (ctx) { username firstName lastName - gender - birthdate email plan avatar diff --git a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json index 1afaf400..bf1ec9ed 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json +++ b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json @@ -1,8 +1,106 @@ { "name": "fs-core-api-resolver", "version": "2.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "fs-core-api-resolver", + "version": "2.0.0", + "license": "Apache-2.0", + "dependencies": { + "@sendgrid/mail": "^7.6.0", + "dotenv": "^10.0.0", + "uuid": "^8.3.2" + } + }, + "node_modules/@sendgrid/client": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.6.0.tgz", + "integrity": "sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==", + "dependencies": { + "@sendgrid/helpers": "^7.6.0", + "axios": "^0.21.4" + }, + "engines": { + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/@sendgrid/helpers": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.6.0.tgz", + "integrity": "sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA==", + "dependencies": { + "deepmerge": "^4.2.2" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/@sendgrid/mail": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.6.0.tgz", + "integrity": "sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==", + "dependencies": { + "@sendgrid/client": "^7.6.0", + "@sendgrid/helpers": "^7.6.0" + }, + "engines": { + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, + "node_modules/follow-redirects": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + } + }, "dependencies": { "@sendgrid/client": { "version": "7.6.0", diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 5cd64c4f..b21555c0 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -1,4 +1,70 @@ { +<<<<<<< HEAD + "dev": { + "awscloudformation": { + "AuthRoleName": "amplify-fstestttt-dev-115806-authRole", + "UnauthRoleArn": "arn:aws:iam::026152918307:role/amplify-fstestttt-dev-115806-unauthRole", + "AuthRoleArn": "arn:aws:iam::026152918307:role/amplify-fstestttt-dev-115806-authRole", + "Region": "us-east-1", + "DeploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "UnauthRoleName": "amplify-fstestttt-dev-115806-unauthRole", + "StackName": "amplify-fstestttt-dev-115806", + "StackId": "arn:aws:cloudformation:us-east-1:026152918307:stack/amplify-fstestttt-dev-115806/72d63fb0-5042-11ec-8a38-1293b79fe18b", + "AmplifyAppId": "de6e5rijl3m8h" + }, + "categories": { + "function": { + "fsCognitoPostConfirmation": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsCognitoPostConfirmation-563936524c325968536e-build.zip" + }, + "fsCoreApiResolver": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsCoreApiResolver-496b796b6f33494f656f-build.zip" + }, + "fsCognitoPostConfirmationInvoker": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsCognitoPostConfirmationInvoker-2b6e7742464651426843-build.zip" + }, + "fsDailyReport": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsDailyReport-45476977466f41396b59-build.zip" + }, + "fsUserConnection": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsUserConnection-44412f7a763879394765-build.zip" + }, + "fsUserDisconnection": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsUserDisconnection-415176574d4b446c4e35-build.zip" + }, + "fsJoinProject": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsJoinProject-647266325278636f724d-build.zip" + }, + "fsLeaveProject": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsLeaveProject-6932724c69364d67446a-build.zip" + }, + "fsSendRealtimeData": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsSendRealtimeData-446b4d2b53376d6a3775-build.zip" + } + }, + "hosting": { + "amplifyhosting": { + "appId": "de6e5rijl3m8h", + "type": "manual" + } + }, + "auth": { + "userPoolGroups": {}, + "fsCognito": {} + } + } + }, +======= +>>>>>>> parent of 5d784d6 (changed birthdate and gender) "mainn": { "awscloudformation": { "AuthRoleName": "amplify-forwardslashtesting-mainn-131231-authRole", diff --git a/src/index.js b/src/index.js index 26263b97..34d55e95 100644 --- a/src/index.js +++ b/src/index.js @@ -22,7 +22,7 @@ const root = ReactDOM.createRoot(container); root.render( - + ); diff --git a/src/store.js b/src/store.js index 8b62247a..08b369dd 100644 --- a/src/store.js +++ b/src/store.js @@ -11,4 +11,6 @@ import reducers from "./reducers" export default createStore( combineReducers(reducers), applyMiddleware(thunk, caching) -) \ No newline at end of file +) + +