From f111fca8f13d61eb8cc6cdc9a6cdfbeec36d5ecf Mon Sep 17 00:00:00 2001
From: Mentor Palokaj <mentor@palokaj.co>
Date: Fri, 5 Nov 2021 13:11:30 +0100
Subject: [PATCH] Network comes from message

---
 functions/integrations/avatar.js | 11 ++++++-----
 functions/modules/mainnet.js     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/functions/integrations/avatar.js b/functions/integrations/avatar.js
index 18f9083..342a04e 100644
--- a/functions/integrations/avatar.js
+++ b/functions/integrations/avatar.js
@@ -7,12 +7,13 @@ const { getStorage } = require( 'firebase-admin/storage' )
 module.exports = async function( req, res ) {
 
 	const chain = process.env.NODE_ENV == 'development' ? '0x4' : '0x1'
+	// const chain = '0x1'
 
 	try {
 
 		// Get request data
-		const { message, signature, signatory, network } = req.body
-		if( !message || !signatory || !signature || !network ) throw new Error( `Malformed request` )
+		const { message, signature, signatory } = req.body
+		if( !message || !signatory || !signature ) throw new Error( `Malformed request` )
 
 		// Decode message
 		const confirmedSignatory = web3.eth.accounts.recover( message, signature )
@@ -20,12 +21,12 @@ module.exports = async function( req, res ) {
 
 		// Validate message
 		const messageObject = JSON.parse( message )
-		const { signer, tokenId, validator, chainId } = messageObject
-		if( signer.toLowerCase() !== confirmedSignatory.toLowerCase() || !tokenId || !validator || chainId !== chain ) throw new Error( `Invalid message` )
+		const { signer, tokenId, validator, chainId, network } = messageObject
+		if( signer.toLowerCase() !== confirmedSignatory.toLowerCase() || !tokenId || !validator || chainId !== chain || !network ) throw new Error( `Invalid message` )
 
 		// Check if validator was already assigned
 		const validatorProfile = await db.collection( `${ network }Validators` ).doc( validator ).get().then( dataFromSnap )
-		if( validatorProfile && validatorProfile.owner !== signatory  ) throw new Error( `Validator already claimed by another wallet. If this is in error, contact mentor.eth on Discord.\n\nThe reason someone else can claim your validator is that we don't want to you to have to expose your validator private key to the world for security reasons <3` )
+		if( validatorProfile.owner && validatorProfile.owner !== signatory  ) throw new Error( `Validator already claimed by another wallet. If this is in error, contact mentor.eth on Discord.\n\nThe reason someone else can claim your validator is that we don't want to you to have to expose your validator private key to the world for security reasons <3` )
 
 		// Write new data to db
 		await db.collection( `${ chain === '0x1' ? 'mainnet' : 'rinkeby' }Validators` ).doc( validator ).set( {
diff --git a/functions/modules/mainnet.js b/functions/modules/mainnet.js
index 0d18207..cdcac9b 100644
--- a/functions/modules/mainnet.js
+++ b/functions/modules/mainnet.js
@@ -33,7 +33,7 @@ app.get( '/api/rocketeer/:id', async ( req, res ) => {
 
 } )
 
-app.post( '/api/integrations/', setAvatarOfValidtor )
+app.post( '/api/integrations/avatar/', setAvatarOfValidtor )
 
 
 // ///////////////////////////////