[FDP-1901] Move cache policy to vpc level and use same cache policy f…

…or each stack (#106)
firespring · Aug 2, 2022 · 2746e35 · 2746e35
1 parent 1335f75
commit 2746e35
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 54 deletions.
diff --git a/cloudformation/vpc.yml b/cloudformation/vpc.yml
@@ -16,6 +16,44 @@ Mappings:
       '948629139753': '172.135'
 
 Resources:
+  ApiCachePolicy:
+    Type: AWS::CloudFront::CachePolicy
+    Properties:
+      CachePolicyConfig:
+        Comment: Policy for long lived caching with Givesource settings, contents, and files
+        DefaultTTL: 86400
+        MaxTTL: 31536000
+        MinTTL: 1
+        Name: Givesource-CachePolicy
+        ParametersInCacheKeyAndForwardedToOrigin:
+          CookiesConfig:
+            CookieBehavior: none
+          EnableAcceptEncodingGzip: true
+          HeadersConfig:
+            HeaderBehavior: whitelist
+            Headers: [ "Authorization" ]
+          QueryStringsConfig:
+            QueryStringBehavior: all
+
+  NoCachePolicy:
+    Type: AWS::CloudFront::CachePolicy
+    Properties:
+      CachePolicyConfig:
+        Comment: Policy for no caching with authorized headers for the admin area
+        DefaultTTL: 0
+        MaxTTL: 30
+        MinTTL: 0
+        Name: Givesource-NoCachePolicy
+        ParametersInCacheKeyAndForwardedToOrigin:
+          CookiesConfig:
+            CookieBehavior: none
+          EnableAcceptEncodingGzip: true
+          HeadersConfig:
+            HeaderBehavior: whitelist
+            Headers: [ "Authorization" ]
+          QueryStringsConfig:
+            QueryStringBehavior: all
+
   RecaptchaParameterStore:
     Type: AWS::SSM::Parameter
     Properties:
@@ -446,3 +484,15 @@ Outputs:
     Export:
       Name: global-recaptcha-key
 
+  globalCachePolicy:
+    Description: Cache policy for Givesource
+    Value: !GetAtt ApiCachePolicy.Id
+    Export:
+      Name: global-cache-policy
+
+  globalNoCachePolicy:
+    Description: No cache policy for Givesource
+    Value: !GetAtt NoCachePolicy.Id
+    Export:
+      Name: global-no-cache-policy
+
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "givesource",
-	"version": "2.2.1",
+	"version": "2.2.5",
 	"description": "Pay-as-you-go highly scalable software application that helps community foundations set up and manage a platform where they can raise funds for non-profits through event pages.",
 	"license": "Apache-2.0",
 	"repository": {

diff --git a/packages/cloudformation/templates/givesource.yml b/packages/cloudformation/templates/givesource.yml
@@ -138,46 +138,6 @@ Resources:
       Name: !Sub |-
         ${AWS::StackName}
 
-  ApiCachePolicy:
-    Type: AWS::CloudFront::CachePolicy
-    Properties:
-      CachePolicyConfig:
-        Comment: Policy for long lived caching with Givesource settings, contents, and files
-        DefaultTTL: 86400
-        MaxTTL: 31536000
-        MinTTL: 1
-        Name: !Sub ${AWS::StackName}-Givesource-CachePolicy-${AWS::Region}
-        ParametersInCacheKeyAndForwardedToOrigin:
-          CookiesConfig:
-            CookieBehavior: none
-          EnableAcceptEncodingGzip: true
-          HeadersConfig:
-            HeaderBehavior: whitelist
-            Headers: ["Authorization"]
-          QueryStringsConfig:
-            QueryStringBehavior: all
-    DependsOn: RestApi
-
-  NoCachePolicy:
-    Type: AWS::CloudFront::CachePolicy
-    Properties:
-      CachePolicyConfig:
-        Comment: Policy for no caching with authorized headers for the admin area
-        DefaultTTL: 0
-        MaxTTL: 30
-        MinTTL: 0
-        Name: !Sub ${AWS::StackName}-Givesource-NoCachePolicy-${AWS::Region}
-        ParametersInCacheKeyAndForwardedToOrigin:
-          CookiesConfig:
-            CookieBehavior: none
-          EnableAcceptEncodingGzip: true
-          HeadersConfig:
-            HeaderBehavior: whitelist
-            Headers: ["Authorization"]
-          QueryStringsConfig:
-            QueryStringBehavior: all
-    DependsOn: RestApi
-
   ApiDistribution:
     Type: AWS::CloudFront::Distribution
     Properties:
@@ -194,24 +154,24 @@ Resources:
         DefaultRootObject: index.html
         DefaultCacheBehavior:
           AllowedMethods: ["GET", "HEAD", "OPTIONS", "PUT", "PATCH", "POST", "DELETE"]
-          CachePolicyId: !GetAtt NoCachePolicy.Id
+          CachePolicyId: !ImportValue global-no-cache-policy
           TargetOriginId: !Ref RestApi
           ViewerProtocolPolicy: redirect-to-https
         PriceClass: PriceClass_200
         CacheBehaviors:
         - PathPattern: "/settings"
           AllowedMethods: ["GET", "HEAD", "OPTIONS", "PUT", "PATCH", "POST", "DELETE"]
-          CachePolicyId: !GetAtt ApiCachePolicy.Id
+          CachePolicyId: !ImportValue global-cache-policy
           TargetOriginId: !Ref RestApi
           ViewerProtocolPolicy: redirect-to-https
         - PathPattern: "/contents"
           AllowedMethods: ["GET", "HEAD", "OPTIONS", "PUT", "PATCH", "POST", "DELETE"]
-          CachePolicyId: !GetAtt ApiCachePolicy.Id
+          CachePolicyId: !ImportValue global-cache-policy
           TargetOriginId: !Ref RestApi
           ViewerProtocolPolicy: redirect-to-https
         - PathPattern: "/files"
           AllowedMethods: ["GET", "HEAD", "OPTIONS", "PUT", "PATCH", "POST", "DELETE"]
-          CachePolicyId: !GetAtt ApiCachePolicy.Id
+          CachePolicyId: !ImportValue global-cache-policy
           TargetOriginId: !Ref RestApi
           ViewerProtocolPolicy: redirect-to-https
 

diff --git a/packages/frontend/src/admin-pages/components/auth/login/PasswordResetForm.vue b/packages/frontend/src/admin-pages/components/auth/login/PasswordResetForm.vue
@@ -136,6 +136,7 @@
 
 				if (vue.cognitoUser) {
 					delete vue.userAttributes['email_verified'];
+					delete vue.userAttributes['email']
 					vue.cognitoUser.completeNewPasswordChallenge(vue.formData.password, vue.userAttributes, {
 						onSuccess: function () {
 							vue.$request.patch('users/' + vue.cognitoUser.username, {isVerified: true}).then(function () {

diff --git a/packages/lambda/src/custom/createLambdaEdgeFunction/index.js b/packages/lambda/src/custom/createLambdaEdgeFunction/index.js
@@ -101,15 +101,17 @@ exports.handle = (event, context, callback) => {
 			});
 		}
 
-		promise.then(() => {
-			return lambda.publishVersion(region, functionName);
-		}).then(data => {
-			response.send(event, context, response.SUCCESS, {LambdaFunctionARN: data.FunctionArn}, data.FunctionArn);
-		}).catch(err => {
-			logger.log(err);
-			response.send(event, context, response.FAILED);
-		});
-
+		// this is necessary because of nodejs14 update... sorry to whoever sees this in the future
+		setTimeout(() => {
+      promise.then(() => {
+        return lambda.publishVersion(region, functionName);
+      }).then(data => {
+        response.send(event, context, response.SUCCESS, {LambdaFunctionARN: data.FunctionArn}, data.FunctionArn);
+      }).catch(err => {
+        logger.log(err);
+        response.send(event, context, response.FAILED);
+      });
+    }, 5000)
 	} else {
 		response.send(event, context, response.SUCCESS);
 	}

diff --git a/packages/lambda/src/database/bootstrapDatabase/index.js b/packages/lambda/src/database/bootstrapDatabase/index.js
@@ -49,6 +49,7 @@ exports.handle = function (event, context, callback) {
 
 	if (event.RequestType === 'Delete') {
 		response.send(event, context, response.SUCCESS);
+		callback()
 		return;
 	}