@plusscommunities/pluss-newsletter-aws 1.4.2 → 1.4.3

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -8,9 +8,9 @@
     "betapatch": "npm version prepatch --preid=beta",
     "patch": "npm version patch",
     "deploy": "npm run gc && npm run gs && serverless deploy",
-    "betaupload": "rm -rf .serverless && npm publish --access public --tag beta",
+    "betaupload": "rm -rf .serverless && npm i && npm publish --access public --tag beta",
     "betaupload:p": "npm run betapatch && npm run betaupload",
-    "upload": "rm -rf .serverless && npm publish --access public",
+    "upload": "rm -rf .serverless && npm i && npm publish --access public",
     "upload:p": "npm run patch && npm run upload",
     "copy:add": "run(){ ext=${1:-default}; test -f values.config.$ext.js || cp values.config.default.js values.config.$ext.js; }; run",
     "copy:get": "echo $npm_package_name",
@@ -44,6 +44,10 @@
     "serverless-prune-plugin": "^1.4.1"
   },
   "files": [
-    "*"
+    "common/*",
+    "config/*",
+    "helper/*",
+    "*.js",
+    "package*.json"
   ]
 }

package/config.json

@@ -1 +0,0 @@
-{"keys_url":"https://cognito-idp.ap-southeast-2.amazonaws.com/ap-southeast-2_qC95qHeQz/.well-known/jwks.json","maintenanceInstantComplete":false,"communityConfig":{"name":"Pluss Communities Development","company":"Pluss Communities","subdomain":"dev","onelinkUrl":"http://onelink.to/pluss60","iosAppUrl":"https://itunes.apple.com/au/app/aveo/id1358888537?mt=8","androidAppUrl":"https://play.google.com/store/apps/details?id=pluss.android.aveo","emailBrandingAbovePoweredBy":{"image":"https://pluss60-dev-media.s3-ap-southeast-2.amazonaws.com/pluss/website/plusscommunites.png","height":29,"width":100},"adminSiteUrl":"https://dev.plusscommunities.com"},"anySignUpSite":"newstead","strings":{"FACILITY":"facility"},"hasIntroTerms":false,"serverlessConfig":{"profile":"dev-serverless-admin","key":"AKIA4LLDS4NHWYEE4MAI","secret":"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"}}

package/serverless.yml

@@ -1,453 +0,0 @@
-service: dev-newsletter
-
-frameworkVersion: ">=1.1.0 <2.0.0"
-
-provider:
-  name: aws
-  runtime: nodejs14.x
-  region: ap-southeast-2
-  profile: dev-serverless-admin
-  stage: dev
-  deploymentBucket: serverless.deploys.pluss60.${self:custom.client}.${self:provider.region}
-  environment:
-    tablePrefix: ${self:custom.tablePrefix}
-  iamRoleStatements:
-    - Effect: Allow
-      Action:
-        - dynamodb:Query
-        - dynamodb:Scan
-        - dynamodb:GetItem
-        - dynamodb:PutItem
-        - dynamodb:UpdateItem
-        - dynamodb:DeleteItem
-      Resource: "arn:aws:dynamodb:${opt:region, self:provider.region}:*:table/*"
-
-plugins:
-  - serverless-domain-manager
-  - serverless-prune-plugin
-
-custom:
-  client: dev
-  functionPrefix: ""
-  tablePrefix: ${self:custom.client}-${self:provider.stage}-
-  customDomain:
-    domainName: dev.pluss60-api.com
-    basePath: newsletter-${self:provider.stage}
-    stage: ${self:provider.stage}
-    createRoute53Record: true
-    securityPolicy: tls_1_2
-  prune:
-    automatic: true
-    number: 1
-
-functions:
-  addNewsletterEntry:
-    handler: addNewsletterEntry.addNewsletterEntry
-    tags: newsletter
-    memorySize: 1024
-    timeout: 30
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}add
-          method: post
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  editNewsletterEntry:
-    handler: editNewsletterEntry.editNewsletterEntry
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}edit
-          method: post
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  editNewsletterSubmission:
-    handler: editNewsletterSubmission.editNewsletterSubmission
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}editSubmission
-          method: post
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getNewsletterEntry:
-    handler: getNewsletterEntry.getNewsletterEntry
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}get/{id}
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getNews:
-    handler: getNews.getNews
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}get2/{action}
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getNewsletterEntries:
-    handler: getNewsletterEntries.getNewsletterEntries
-    tags: newsletter
-    memorySize: 1024
-    timeout: 30
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}get
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getFeaturedNewsletterEntries:
-    handler: getFeaturedNewsletterEntries.getFeaturedNewsletterEntries
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}getFeatured
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getRecentNewsletterEntries:
-    handler: getRecentNewsletterEntries.getRecentNewsletterEntries
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}recent
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  searchAvailableNews:
-    handler: searchAvailableNews.searchAvailableNews
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}content/search
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getAvailableNews:
-    handler: getAvailableNews.getAvailableNews
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}content/get
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getPublishedEntries:
-    handler: getPublishedEntries.getPublishedEntries
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}content/specific
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getPublishedAvailableNews:
-    handler: getPublishedAvailableNews.getPublishedAvailableNews
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}content/published
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  deleteNewsletterEntry:
-    handler: deleteNewsletterEntry.deleteNewsletterEntry
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}remove
-          method: post
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  hasNewsletterAccess:
-    handler: hasNewsletterAccess.hasNewsletterAccess
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}access
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getNewsletterSubmissions:
-    handler: getNewsletterSubmissions.getNewsletterSubmissions
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}submissions/get
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getNewsletterSubmission:
-    handler: getNewsletterSubmission.getNewsletterSubmission
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}submissions/get/{id}
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  handleNewsletterSubmission:
-    handler: handleNewsletterSubmission.handleNewsletterSubmission
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}submissions/handle
-          method: post
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getSubmissionCount:
-    handler: getSubmissionCount.getSubmissionCount
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}submissions/count
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  getTaggedNews:
-    handler: getTaggedNews.getTaggedNews
-    tags: newsletter
-    memorySize: 128
-    timeout: 10
-    events:
-      - http:
-          path: ${self:custom.functionPrefix}tagged/get
-          method: get
-          cors:
-            origin: '*'
-            headers:
-              - Content-Type
-              - authkey
-  newsletterChanged:
-    handler: newsletterChanged.newsletterChanged
-    memorySize: 2048
-    timeout: 30
-    events:
-      - stream:
-          type: dynamodb
-          batchSize: 1
-          startingPosition: LATEST
-          arn:
-            Fn::GetAtt:
-              - NewsletterEntries
-              - StreamArn
-  watchNewsletter:
-    handler: watchNewsletter.watchNewsletter
-    tags: newsletter
-    memorySize: 2048
-    timeout: 300
-    events:
-      - schedule:
-          rate: cron(1/5 * * * ? *)
-          enabled: true
-resources:
-  Resources:
-    NewsletterEntries:
-      Type: "AWS::DynamoDB::Table"
-      DeletionPolicy: Retain
-      Properties:
-        AttributeDefinitions:
-          - AttributeName: RowId
-            AttributeType: S
-          - AttributeName: Site
-            AttributeType: S
-          - AttributeName: UnixTimestampReverse
-            AttributeType: N
-          - AttributeName: FeaturedExpiry
-            AttributeType: N
-          - AttributeName: SourceId
-            AttributeType: S
-          - AttributeName: UnsentNotification
-            AttributeType: S
-          - AttributeName: UnixTimestamp
-            AttributeType: N
-        KeySchema:
-          - AttributeName: RowId
-            KeyType: HASH
-        TableName: ${self:custom.tablePrefix}newsletterentries
-        BillingMode: PAY_PER_REQUEST
-        PointInTimeRecoverySpecification:
-          PointInTimeRecoveryEnabled: true
-        StreamSpecification:
-          StreamViewType: NEW_AND_OLD_IMAGES
-        GlobalSecondaryIndexes:
-          - IndexName: NewsletterEntriesSiteTimestampIndex
-            KeySchema:
-              - AttributeName: Site
-                KeyType: HASH
-              - AttributeName: UnixTimestampReverse
-                KeyType: RANGE
-            Projection:
-              ProjectionType: ALL
-          - IndexName: NewsletterEntriesSiteFeaturedExpiryIndex
-            KeySchema:
-              - AttributeName: Site
-                KeyType: HASH
-              - AttributeName: FeaturedExpiry
-                KeyType: RANGE
-            Projection:
-              ProjectionType: ALL
-          - IndexName: NewsletterEntriesSiteSourceIdIndex
-            KeySchema:
-              - AttributeName: Site
-                KeyType: HASH
-              - AttributeName: SourceId
-                KeyType: RANGE
-            Projection:
-              ProjectionType: ALL
-          - IndexName: NewsletterEntriesUnsentNotiIndex
-            KeySchema:
-              - AttributeName: UnsentNotification
-                KeyType: HASH
-              - AttributeName: UnixTimestamp
-                KeyType: RANGE
-            Projection:
-              ProjectionType: ALL
-    NewsletterSubmissions:
-      Type: "AWS::DynamoDB::Table"
-      DeletionPolicy: Retain
-      Properties:
-        AttributeDefinitions:
-          - AttributeName: RowId
-            AttributeType: S
-          - AttributeName: Site
-            AttributeType: S
-          - AttributeName: UnixTimestampReverse
-            AttributeType: N
-        KeySchema:
-          - AttributeName: RowId
-            KeyType: HASH
-        TableName: ${self:custom.tablePrefix}newslettersubmissions
-        BillingMode: PAY_PER_REQUEST
-        PointInTimeRecoverySpecification:
-          PointInTimeRecoveryEnabled: true
-        StreamSpecification:
-          StreamViewType: NEW_AND_OLD_IMAGES
-        GlobalSecondaryIndexes:
-          - IndexName: NewsletterSubmissionsSiteTimestampIndex
-            KeySchema:
-              - AttributeName: Site
-                KeyType: HASH
-              - AttributeName: UnixTimestampReverse
-                KeyType: RANGE
-            Projection:
-              ProjectionType: ALL
-    NewsletterUserEntries:
-      Type: "AWS::DynamoDB::Table"
-      DeletionPolicy: Retain
-      Properties:
-        AttributeDefinitions:
-          - AttributeName: RowId
-            AttributeType: S
-          - AttributeName: UserId
-            AttributeType: S
-          - AttributeName: UnixTimestampReverse
-            AttributeType: N
-        KeySchema:
-          - AttributeName: RowId
-            KeyType: HASH
-        TableName: ${self:custom.tablePrefix}newsletteruserentries
-        BillingMode: PAY_PER_REQUEST
-        PointInTimeRecoverySpecification:
-          PointInTimeRecoveryEnabled: true
-        StreamSpecification:
-          StreamViewType: NEW_AND_OLD_IMAGES
-        GlobalSecondaryIndexes:
-          - IndexName: NewsletterUserEntriesUserIdTimestampIndex
-            KeySchema:
-              - AttributeName: UserId
-                KeyType: HASH
-              - AttributeName: UnixTimestampReverse
-                KeyType: RANGE
-            Projection:
-              ProjectionType: ALL
-