opportunity-service 0.0.651 → 0.0.655

package/dist/api/identity/register-new-user.js

@@ -7,26 +7,52 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Contract } from 'ethers';
+import { Contract, ethers } from 'ethers';
 import opportunityService from '../../OpportunityService';
 import { Contracts } from '../../constants';
 import addressMap from '../../blockchain/addresses.json';
 import abiMap from '../../blockchain/abi.json';
 function registerNewUser() {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const msgSender = yield opportunityService.getSignersInterface()._address;
-            console.log('Registering new user: ' + msgSender);
-            if (typeof msgSender == 'undefined')
-                throw new Error('Message sender is undefined');
-            const txResult = new Contract(addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION]).connect(opportunityService.getSignersInterface())
-                .registerNewUser({
-                from: msgSender
-            });
-        }
-        catch (error) {
-            console.log(error);
-        }
+        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const userRegistrationAddress = addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION];
+                const userRegistrationInterface = abiMap[Contracts.USER_REGISTRATION];
+                const msgSender = yield opportunityService.getSignersInterface()._address;
+                if (typeof msgSender == 'undefined')
+                    throw new Error('Message sender is undefined');
+                const userRegistrationInstance = new ethers.Contract(userRegistrationAddress, userRegistrationInterface, opportunityService.getProviderInterface());
+                console.log('Checking true identificaiton of msgSender: ' + msgSender);
+                const id = yield userRegistrationInstance.getTrueIdentification(msgSender);
+                console.log('The true identificaiton is: ' + id);
+                if (id == '0x0000000000000000000000000000000000000000') {
+                    console.log('Registering new user: ' + msgSender);
+                    const tx = new Contract(addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION]).connect(opportunityService.getSignersInterface())
+                        .registerNewUser({
+                        from: msgSender
+                    });
+                    const receipt = yield tx.wait();
+                    console.log('the receipt');
+                    console.log(receipt);
+                    if (Number(receipt.status) === 1) {
+                        console.log('transaction succeeded');
+                        resolve(true);
+                    }
+                    else {
+                        console.log('Transaction failed');
+                        resolve(false);
+                    }
+                }
+                else {
+                    console.log('User already registered');
+                    resolve(false);
+                }
+            }
+            catch (error) {
+                console.log(error);
+                reject('An error occurred while trying to complete the registration.');
+            }
+        }));
     });
 }
 export default registerNewUser;

package/dist/api/identity/register-new-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-new-user.js","sourceRoot":"","sources":["../../../src/api/identity/register-new-user.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAC/C,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,UAAU,MAAM,iCAAiC,CAAA;AACxD,OAAO,MAAM,MAAM,2BAA2B,CAAA;AAG9C,SAAe,eAAe;;QAC1B,IAAI;YACR,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,QAAQ,CAAA;YACzE,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAAA;YAEjD,IAAI,OAAO,SAAS,IAAI,WAAW;gBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAEnF,MAAM,QAAQ,GAAG,IAAI,QAAQ,CACzB,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAC3E,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAClC,CAAC,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;iBAClD,eAAe,CAAC;gBACb,IAAI,EAAE,SAAS;aAClB,CAAC,CAAA;SACD;QAAC,OAAM,KAAK,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;SACrB;IACL,CAAC;CAAA;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"register-new-user.js","sourceRoot":"","sources":["../../../src/api/identity/register-new-user.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACvD,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,UAAU,MAAM,iCAAiC,CAAA;AACxD,OAAO,MAAM,MAAM,2BAA2B,CAAA;AAG9C,SAAe,eAAe;;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI;gBACA,MAAM,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;gBAC3G,MAAM,yBAAyB,GAAG,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;gBACrE,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,QAAQ,CAAA;gBAEzE,IAAI,OAAO,SAAS,IAAI,WAAW;oBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;gBAEnF,MAAM,wBAAwB,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,uBAAuB,EAAE,yBAAyB,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,CAAA;gBAEnJ,OAAO,CAAC,GAAG,CAAC,6CAA6C,GAAG,SAAS,CAAC,CAAA;gBACtE,MAAM,EAAE,GAAG,MAAM,wBAAwB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;gBAC1E,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAA;gBAEhD,IAAI,EAAE,IAAI,4CAA4C,EACtD;oBACI,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAAA;oBACjD,MAAM,EAAE,GAAG,IAAI,QAAQ,CACnB,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAC3E,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;yBACrF,eAAe,CAAC;wBACb,IAAI,EAAE,SAAS;qBACtB,CAAC,CAAA;oBAEF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;oBAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;oBAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAEpB,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;wBAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;wBACpC,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjB;yBAAM;wBACH,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;wBACjC,OAAO,CAAC,KAAK,CAAC,CAAA;qBACjB;iBACJ;qBAAM;oBACH,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;oBACtC,OAAO,CAAC,KAAK,CAAC,CAAA;iBACjB;aAGJ;YAAC,OAAM,KAAK,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAClB,MAAM,CAAC,8DAA8D,CAAC,CAAA;aACzE;QACL,CAAC,CAAA,CAAC,CAAA;IACN,CAAC;CAAA;AAED,eAAe,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opportunity-service",
-  "version": "0.0.651",
+  "version": "0.0.655",
   "description": "A service layer that connects all services between the blockchain and ui.",
   "main": "index.js",
   "scripts": {

package/src/api/identity/register-new-user.ts

@@ -1,4 +1,4 @@
-import { Contract, Transaction } from 'ethers';
+import { Contract, ethers, Transaction } from 'ethers';
 import opportunityService from '../../OpportunityService';
 import { Contracts } from '../../constants';
 
@@ -7,22 +7,52 @@ import abiMap from '../../blockchain/abi.json'
 import { Result } from 'ethers/lib/utils';
 
 async function registerNewUser() {
-    try {
-const msgSender = await opportunityService.getSignersInterface()._address
-console.log('Registering new user: ' + msgSender)
-
-if (typeof msgSender == 'undefined') throw new Error('Message sender is undefined')
-
-const txResult = new Contract(
-    addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION],
-    abiMap[Contracts.USER_REGISTRATION]
-    ).connect(opportunityService.getSignersInterface())
-    .registerNewUser({
-        from: msgSender
+    return new Promise(async (resolve, reject) => {
+        try {
+            const userRegistrationAddress = addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION]
+            const userRegistrationInterface = abiMap[Contracts.USER_REGISTRATION]
+            const msgSender = await opportunityService.getSignersInterface()._address
+
+            if (typeof msgSender == 'undefined') throw new Error('Message sender is undefined')
+
+            const userRegistrationInstance = new ethers.Contract(userRegistrationAddress, userRegistrationInterface, opportunityService.getProviderInterface())
+
+            console.log('Checking true identificaiton of msgSender: ' + msgSender)
+            const id = await userRegistrationInstance.getTrueIdentification(msgSender)
+            console.log('The true identificaiton is: ' + id)
+           
+            if (id == '0x0000000000000000000000000000000000000000')
+            {
+                console.log('Registering new user: ' + msgSender)
+                const tx = new Contract(
+                    addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION],
+                    abiMap[Contracts.USER_REGISTRATION]).connect(opportunityService.getSignersInterface())
+                    .registerNewUser({
+                        from: msgSender
+                })
+
+                const receipt = await tx.wait()
+                console.log('the receipt')
+                console.log(receipt)
+
+                if (Number(receipt.status) === 1) {
+                    console.log('transaction succeeded')
+                    resolve(true);
+                } else {
+                    console.log('Transaction failed')
+                    resolve(false)
+                }
+            } else {
+                console.log('User already registered')
+                resolve(false)
+            }
+
+    
+        } catch(error) {
+            console.log(error)
+            reject('An error occurred while trying to complete the registration.')
+        }
     })
-    } catch(error) {
-        console.log(error)
-    }
 }
 
 export default registerNewUser;