feat: unsubscribe

Author: satello

--output

@@ -22,3 +22,5 @@
 
 # Misc
 /.DS_Store
+--output
+--region

--region

@@ -1,7 +1,6 @@
 secrets:
   STAGING_INFURA_URL: AQICAHhGgAvqeSMcTOp7YDYdu8nxhCZ9sP3Pe3A4o55JsQLjZQH9ef886xSGwCkOVOqZXEflAAAAizCBiAYJKoZIhvcNAQcGoHsweQIBADB0BgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDLmDi148/wofuMLZfgIBEIBH/avGPWRsCg8+SOHctvUs1oG/vDRbtqg0eXOO4JSfQpIL17MGm2TvA3A916WGI1jZLyumxLxAZSAqRpcm5MHYhZkYZbRH9HI=
   PRODUCTION_INFURA_URL: AQICAHhGgAvqeSMcTOp7YDYdu8nxhCZ9sP3Pe3A4o55JsQLjZQGtRxJO1I4ll5do7xSgQRlXAAAAjTCBigYJKoZIhvcNAQcGoH0wewIBADB2BgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDGEx9BRbqOVUdlAHJAIBEIBJXSXRCLwOTP86qdELUyZy2j+B8njcZV+IdBUjZxuduULh2dLzXSyL1fsQmtzxjpjRgwOZ28wI4Z0asmFLAttbBu5XRcJc4lDRGA==
-  ENTROPY: AQICAHhGgAvqeSMcTOp7YDYdu8nxhCZ9sP3Pe3A4o55JsQLjZQGQSkjVNLZC528fa4nZnED+AAAAdjB0BgkqhkiG9w0BBwagZzBlAgEAMGAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMJxF+4vAVYDOoNKc8AgEQgDPnGbrenflh1UUs/SwyQPD7Jxbf+MEQjEdppwY0nt8ROUazArparZ+p5Re9kgxrXZVNSOY=
   STAGING_ARBITRABLE_PERMISSION_LIST_ADDRESS: '0xbefd40cd43072694555b5ec77120ce4a3a65a5d6'
   PRODUCTION_ARBITRABLE_PERMISSION_LIST_ADDRESS: '0xb7faddf3ecd2402a7e48cea6d2637d90eeb5a7e6'
   STAGING_ARBITRABLE_PERMISSION_LIST_BLOCK_BLOCK_NUMBER: '8784036'
@@ -10,4 +9,5 @@ secrets:
   PRODUCTION_KLEROS_LIQUID_ADDRESS: '0x988b3a538b618c7a603e1c11ab82cd16dbe28069'
   STAGING_TOKEN_SALE_CONTRACT_ADDRESS: '0xC74348B7c4D9f25C26591a40AA2b712bC38F4f14'
   PRODUCTION_TOKEN_SALE_CONTRACT_ADDRESS: '0x5EdF42Ce9DA28d0B1790C6093103526e3bb88eF3'
+  PRIVATE_KEY: AQICAHhGgAvqeSMcTOp7YDYdu8nxhCZ9sP3Pe3A4o55JsQLjZQE1/+LCDywrChGXhk3QqdBdAAAApTCBogYJKoZIhvcNAQcGoIGUMIGRAgEAMIGLBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDEpFNpPOKpNS3SnIXQIBEIBe7EzCwOw9G2PvTbDaO5nlBvCCt9ztmXiGKwLvwoJ9KmWBqbsnXd7DIrqQJZRurzOuKcShNlrq/T692TENRrAFKuC1zWxFeuiUwiLYab5cpWpVuCNnAYSnIETZTRRGWA==
 keyArn: 'arn:aws:kms:us-east-2:547511976516:key/bca002a4-c1d9-40e3-a251-6ccea1ce02f0'

.gitignore

@@ -15,6 +15,7 @@
     "invoke": "env-cmd ./.env serverless invoke -l -f",
     "build": "docker run --rm -v $PWD:/data -w /data node:10 npm rebuild scrypt",
     "deploy:function": "env-cmd ./.env serverless deploy function -f",
+    "deploy:prod": "env-cmd ./.env serverless -s production deploy function -f",
     "deploy:staging": "env-cmd ./.env serverless deploy",
     "deploy": "env-cmd ./.env serverless deploy -s production"
   },

kms-secrets.us-east-2.yml

@@ -356,13 +356,13 @@ functions:
           Action: ['dynamodb:PutItem'],
           Resource: 'arn:aws:dynamodb:us-east-2:547511976516:table/token-sale-locales',
         }
-  postUnsubscribe:
-    handler: src/global/unsubscribe
+  getUnsubscribe:
+    handler: src/global/unsubscribe.get
     events:
-      - { http: { path: unsubscribe, method: post, cors: true } }
+      - { http: { path: unsubscribe, method: get, cors: true } }
     environment:
-      ENTROPY: '${self:custom.kmsSecrets.secrets.ENTROPY}'
-    iamRoleStatementsName: 'postUnsubscribe-${self:provider.stage}-lambda-role'
+      PRIVATE_KEY: '${self:custom.kmsSecrets.secrets.PRIVATE_KEY}'
+    iamRoleStatementsName: 'getUnsubscribe-${self:provider.stage}-lambda-role'
     iamRoleStatements:
       - {
           Effect: Allow,
@@ -379,3 +379,8 @@ functions:
           Action: ['dynamodb:PutItem'],
           Resource: 'arn:aws:dynamodb:us-east-2:547511976516:table/user-settings',
         }
+      - {
+          Effect: Allow,
+          Action: ['dynamodb:UpdateItem'],
+          Resource: 'arn:aws:dynamodb:us-east-2:547511976516:table/user-settings',
+        }

package.json

@@ -1,23 +1,27 @@
-const _web3 = require('../utils/web3')
+const Web3 = require('web3')
 const dynamoDB = require('../utils/dynamo-db')
-const getEnvVars = require('../get-env-vars')
+const getEnvVars = require('../utils/get-env-vars')
 const whitelist = require('../utils/whitelist')
 
-module.exports.post = async (event, _context, callback) => {
+module.exports.get = async (event, _context, callback) => {
   // Initialize web3
-  const web3 = await _web3()
+  const web3 = new Web3()
+
+  account = event.queryStringParameters.account
+  console.log(account)
+  signature = event.queryStringParameters.signature
+  dapp = event.queryStringParameters.dapp
 
   // Validate signature
-  const payload = JSON.parse(event.body).payload
   try {
-    const account = await web3.eth.accounts.recover(
-      JSON.stringify(payload.email),
-      payload.signature
+    const recoveredAccount = await web3.eth.accounts.recover(
+      account,
+      signature
     )
-    const { ENTROPY } = await getEnvVars(['ENTROPY'])
-    const lambdaAccount = web3.eth.accounts.create(ENTROPY)
+    const { PRIVATE_KEY } = await getEnvVars(['PRIVATE_KEY'])
+    const lambdaAccount = web3.eth.accounts.privateKeyToAccount(PRIVATE_KEY.replace(/^\s+|\s+$/g, ''))
     if (
-      account !== lambdaAccount.address
+      recoveredAccount !== lambdaAccount.address
     )
       throw new Error('Signature does not match for this email address. Email contact.kleros.io.')
   } catch (err) {
@@ -33,18 +37,18 @@ module.exports.post = async (event, _context, callback) => {
 
   // Update settings for DApp
   const updateKeys = whitelist.filter(k => {
-    if (payload.dapp)
-      return k.includes(payload.dapp)
+    if (dapp)
+      return k.includes(dapp)
     return false
   })
   await dynamoDB.updateItem({
-    Key: { address: { S: payload.address } },
+    Key: { address: { S: account } },
     TableName: 'user-settings',
     UpdateExpression: `SET ${updateKeys
       .map(k => `${k} = :_${k}`)
       .join(', ')}`,
     ExpressionAttributeValues: updateKeys.reduce((acc, k) => {
-      acc[`:_${k}`] = false
+      acc[`:_${k}`] = {"BOOL": false}
       return acc
     }, {})
   })
@@ -53,7 +57,7 @@ module.exports.post = async (event, _context, callback) => {
     statusCode: 200,
     headers: { 'Access-Control-Allow-Origin': '*' },
     body: JSON.stringify({
-      payload: `Unsubscribed from Kleros ${payload.dapp} notifications.`
+      payload: `Unsubscribed from Kleros ${dapp} notifications.`
     })
   })
 }

serverless.yml

@@ -1,24 +1,6 @@
 const _web3 = require('../utils/web3')
 const dynamoDB = require('../utils/dynamo-db')
-
-const whitelist = [
-  'email',
-  'dogecoinAddress',
-  'fullName',
-  'phone',
-  'derivedAccountAddress',
-  'courtNotificationSettingAppeal',
-  'courtNotificationSettingDraw',
-  'courtNotificationSettingLose',
-  'courtNotificationSettingWin',
-  'centralizedArbitratorDashboardNotificationSettingDisputes',
-  'centralizedArbitratorDashboardNotificationSettingEvidence',
-  't2crNotificationSettingDispute',
-  't2crNotificationSettingRulingGiven',
-  'escrowNotificationSettingDispute',
-  'escrowNotificationSettingAppeal',
-  'escrowNotificationSettingRulingGiven'
-]
+const whitelist = require('../utils/whitelist')
 
 module.exports.get = async (event, _context, callback) => {
   // Initialize web3

src/global/unsubscribe.js

@@ -14,11 +14,9 @@ const whitelist = [
   't2crNotificationSettingRulingGiven',
   'escrowNotificationSettingDispute',
   'escrowNotificationSettingAppeal',
-  'escrowNotificationSettingRulingGiven'
+  'escrowNotificationSettingRulingGiven',
+  'pushNotifications',
+  'pushNotificationsURI'
 ]
 
-const emailWhitelist = [
-
-]
-
-export default whitelist
+module.exports = whitelist