merge develop

communcom · Mar 23, 2020 · ac3ca7c · ac3ca7c
2 parents 2003b7d + a3e488b
commit ac3ca7c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.1
+1.4.0
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "registration-service",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Commun registration service",
   "main": "./src/index.js",
   "scripts": {

diff --git a/src/controllers/Registration.js b/src/controllers/Registration.js
@@ -133,7 +133,7 @@ class Registration extends Basic {
         return { currentState: States.SET_USERNAME };
     }
 
-    async setUsername({ phone, username, identity }) {
+    async setUsername({ phone, username, identity, referralId }) {
         const userModel = await this._getUserModel(phone, identity);
 
         if (!userModel) {
@@ -150,8 +150,12 @@ class Registration extends Basic {
 
         const userId = await this.blockchain.generateNewUserId();
 
+        if (referralId || !env.GLS_ALLOW_NON_REFERRALS) {
+            await this.checkReferredUserExists({ referralId });
+        }
+
         const query = identity ? { identity } : { phone };
-        await User.updateOne(query, { userId, username, state: States.TO_BLOCK_CHAIN });
+        await User.updateOne(query, { userId, username, state: States.TO_BLOCK_CHAIN, referralId });
 
         return { userId, currentState: States.TO_BLOCK_CHAIN };
     }

diff --git a/src/services/Connector.js b/src/services/Connector.js
@@ -113,6 +113,9 @@ class Connector extends BasicConnector {
                             username: {
                                 type: 'string',
                             },
+                            referralId: {
+                                type: 'string',
+                            },
                         },
                     },
                 },