Remove odis

packages/api/src/controllers/v2/user.ts

@@ -1,6 +1,7 @@
 import { Request, Response } from 'express';
 import { getAddress } from '@ethersproject/address';
 
+import { AppUserModel } from '@impactmarket/core/src/database/models/app/appUser';
 import { AttestationType, send, verify } from '~services/attestation';
 import { ListUserNotificationsRequestSchema } from '~validators/user';
 import { RequestWithUser } from '~middlewares/core';
@@ -9,6 +10,13 @@ import { standardResponse } from '~utils/api';
 import UserLogService from '~services/app/user/log';
 import UserService from '~services/app/user';
 
+type VerifyRequestBody = {
+    email: string;
+    code: string;
+    userId: number;
+    params?: Partial<AppUserModel>;
+};
+
 class UserController {
     private userService: UserService;
     private userLogService: UserLogService;
@@ -354,9 +362,10 @@ class UserController {
             .catch(e => standardResponse(res, 400, false, '', { error: e.message }));
     };
     public verify = (req: RequestWithUser, res: Response) => {
-        const { email, code, userId } = req.body;
+        const { email, code, userId, params } = req.body as VerifyRequestBody;
+        const userParams: Partial<AppUserModel> = params ?? {};
 
-        verify(email, AttestationType.EMAIL_LINK, code!, userId)
+        verify(email, AttestationType.EMAIL_LINK, code!, userId, userParams)
             .then(r => standardResponse(res, 200, true, r, {}))
             .catch(e => standardResponse(res, 400, false, '', { error: e.message }));
     };

packages/api/src/routes/v2/protocol/index.ts

@@ -1,7 +1,7 @@
 import { Router } from 'express';
 
-import microcredit from './microcredit';
 import circulatingSupply from './circulatingSupply';
+import microcredit from './microcredit';
 
 export default (app: Router): void => {
     const route = Router();

packages/api/src/services/app/user/index.ts

@@ -148,12 +148,14 @@ export default class UserService {
                 this._userRoles(userParams.address, userParams.clientId),
                 this._userRules(userParams.address, userParams.clientId)
             ]);
+            console.log('After promises', user, userRoles, userRules);
             notificationsCount = await models.appNotification.count({
                 where: {
                     userId: user.id,
                     read: false
                 }
             });
+            console.log('Notifications count', notificationsCount);
         }
 
         // we could prevent this update, but we don't want to make the user wait
@@ -168,9 +170,10 @@ export default class UserService {
                 user.update({ clientId: 2 });
             }
         }
-
+        console.log('Before last login');
         this._updateLastLogin(user.id);
 
+        console.log('Before token');
         const token = utils.jwt.generateAccessToken({
             clientId: userParams.clientId,
             address: userParams.address,
@@ -631,6 +634,7 @@ export default class UserService {
                 loanManager: null
             };
         }
+
         const [userRoles, user] = await Promise.all([
             getUserRoles(address),
             models.appUser.findOne({

packages/api/src/services/attestation/index.ts

@@ -10,6 +10,7 @@ import { database, utils } from '@impactmarket/core';
 import { parseEther } from '@ethersproject/units';
 import { randomBytes, randomInt } from 'crypto';
 
+import { AppUserModel } from '@impactmarket/core/src/database/models/app/appUser';
 import { sendEmail } from '../../services/email';
 import { sendSMS } from '../sms';
 import config from '../../config';
@@ -81,7 +82,13 @@ const topUpOdis = async (issuer: Wallet) => {
  * @param userId user id doing the verification
  * @returns the obfuscated identifier
  */
-export const verify = async (plainTextIdentifier: string, type: AttestationType, code: string, userId: number) => {
+export const verify = async (
+    plainTextIdentifier: string,
+    type: AttestationType,
+    code: string,
+    userId: number,
+    params?: Partial<AppUserModel>
+) => {
     // check if code exists and is valid
     // TODO: create startup process to delete expired codes
     const { gt } = Op;
@@ -98,6 +105,16 @@ export const verify = async (plainTextIdentifier: string, type: AttestationType,
     if (!validCode) {
         throw Error('Invalid or expired code');
     }
+    if (type === AttestationType.EMAIL_LINK) {
+        await database.models.appUser.update(
+            {
+                emailValidated: true,
+                ...params
+            },
+            { where: { id: userId } }
+        );
+        return '';
+    }
 
     // initiate odis request
     const issuer = new Wallet(config.attestations.issuerPrivateKey, new JsonRpcProvider(config.chain.jsonRPCUrlCelo));

packages/api/src/validators/user.ts

@@ -6,6 +6,16 @@ import config from '~config/index';
 
 const validator = createValidator();
 
+const appUserModelSchema = Joi.object({
+    firstName: Joi.string().optional(),
+    lastName: Joi.string().optional(),
+    age: Joi.number().optional(),
+    gender: Joi.string().optional(),
+    language: Joi.string().optional(),
+    currency: Joi.string().optional(),
+    country: Joi.string().optional()
+}).optional();
+
 const create = celebrate({
     body: defaultSchema.object({
         address: Joi.string().required(),
@@ -51,7 +61,8 @@ const verify = celebrate({
     body: defaultSchema.object({
         email: Joi.string().required(),
         code: Joi.string().required(),
-        userId: Joi.string().required()
+        userId: Joi.string().required(),
+        params: appUserModelSchema
     })
 });