[Refactor] User auth response

Changed response so it contains only information needed for the app. References #61 and #69.
fanton-dev · Feb 20, 2021 · b8a4f20 · b8a4f20
1 parent 17ed3f3
commit b8a4f20
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 55 deletions.
diff --git a/server/services/core/@types/global.d.ts b/server/services/core/@types/global.d.ts
@@ -608,7 +608,7 @@ export interface UserDatabaseController {
 
   findByPhoneNumber(
     phoneNumber: string,
-): Promise<User>;
+  ): Promise<User>;
 }
 
 /**

diff --git a/server/services/user-service/src/interfaces/controllers/post-authenticate-send-sms-token.ts b/server/services/user-service/src/interfaces/controllers/post-authenticate-send-sms-token.ts
@@ -15,15 +15,15 @@ export default function buildPostAuthenticateSendSms({
   return async function postAuthenticateSendSms(httpRequest: HttpRequest) {
     try {
       const phoneNumber = httpRequest.body['phoneNumber'];
-      const verificationInstance = await sendAuthenticationSmsCode(
+      const authenticationSmsStatus = await sendAuthenticationSmsCode(
           phoneNumber,
       );
       return {
         headers: {
           'Content-Type': 'application/json',
         },
-        statusCode: 201,
-        body: {verificationInstance},
+        statusCode: 200,
+        body: authenticationSmsStatus,
       };
     } catch (e) {
       return {

diff --git a/...er/services/user-service/src/interfaces/controllers/post-authenticate-verify-sms-token.ts b/...er/services/user-service/src/interfaces/controllers/post-authenticate-verify-sms-token.ts
@@ -23,8 +23,8 @@ export default function buildPostAuthenticateVerifyCode({
         headers: {
           'Content-Type': 'application/json',
         },
-        statusCode: 201,
-        body: {verificationInstance},
+        statusCode: 200,
+        body: verificationInstance,
       };
     } catch (e) {
       return {

diff --git a/server/services/user-service/src/usecases/send-authentication-sms-code.ts b/server/services/user-service/src/usecases/send-authentication-sms-code.ts
@@ -1,7 +1,6 @@
 import {
   SharedQueue,
   SMSApi,
-  SMSVerificationInstance,
 } from '../../../core/@types/global';
 import config from '../../../core/config';
 
@@ -27,24 +26,18 @@ export default function buildSendAuthenticationSmsCode({
   sharedQueue: SharedQueue;
 }): Function {
   return async function sendAuthenticationSmsCode(phoneNumber: string) {
-    // Internal parameter
-    let verificationInstance: SMSVerificationInstance;
-
     // Emitting an 'USER_INVALID_NUMBER' event in shared queue on invalid number
     try {
       // Sending verification code
-      verificationInstance = await smsApi.sendCode(
-          phoneNumber,
-          'sms',
-      );
+      await smsApi.sendCode(phoneNumber, 'sms');
     } catch (e) {
       sharedQueue.emit([
         config.inboundLoggerServiceQueue,
       ], {
         subject: 'USER_INVALID_NUMBER',
         body: {phoneNumber: phoneNumber, error: e.message},
       });
-      return;
+      return {phoneNumber: phoneNumber, succeeded: false};
     }
 
     // Emitting an 'USER_SMS_SEND' event in shared queue on valid number
@@ -56,6 +49,6 @@ export default function buildSendAuthenticationSmsCode({
       body: {phoneNumber: phoneNumber},
     });
 
-    return verificationInstance;
+    return {phoneNumber: phoneNumber, succeeded: true};
   };
 }
diff --git a/server/services/user-service/src/usecases/verify-authentication-sms-code.ts b/server/services/user-service/src/usecases/verify-authentication-sms-code.ts
@@ -55,51 +55,45 @@ export default function buildVerifyAuthenticationSmsCode({
         config.inboundLoggerServiceQueue,
       ], {
         subject: 'USER_INVALID_CODE',
-        body: {phoneNumber: phoneNumber, error: e.message},
+        body: {phoneNumber: phoneNumber, error: 'Invalid verification code.'},
       });
-      return {error: e.message};
+      return {error: 'Invalid verification code.'};
     }
 
-    usersDatabase.findByPhoneNumber(verificationInstance.to).catch((_) => {
-      try {
-        // Creating user object
-        user = makeUser({
-          phoneNumber: verificationInstance.to,
-        });
-        normalizedUser = exportToNormalEntity(user);
+    // If user is not found in the database we create a new user and store it
+    return usersDatabase.findByPhoneNumber(
+        verificationInstance.to,
+    ).catch((_) => {
+      // Creating user object
+      user = makeUser({
+        phoneNumber: verificationInstance.to,
+      });
+      normalizedUser = exportToNormalEntity(user);
 
-        // Inserts into database
-        usersDatabase.insert(normalizedUser).catch((e) => {
-          throw e;
-        });
+      // Inserts into database
+      usersDatabase.insert(normalizedUser).catch((e) => {
+        throw e;
+      });
 
-        // Notifying logger for a registered user
-        sharedQueue.emit([
-          config.inboundLoggerServiceQueue,
-        ], {
-          subject: 'USER_REGISTERED',
-          body: {phoneNumber: phoneNumber},
-        });
-      } catch (e) {
-        sharedQueue.emit([
-          config.inboundLoggerServiceQueue,
-        ], {
-          subject: 'USER_FAILED_REGISTRATION',
-          body: {phoneNumber: phoneNumber, error: e.message},
-        });
-        return {error: e.message};
-      }
-    });
+      // Notifying logger for a registered user
+      sharedQueue.emit([
+        config.inboundLoggerServiceQueue,
+      ], {
+        subject: 'USER_REGISTERED',
+        body: {phoneNumber: phoneNumber},
+      });
+      return normalizedUser;
+    }).then((user) => {
+      // Emitting an 'USER_LOGGED_IN' event in shared queue on valid code
+      sharedQueue.emit([
+        config.inboundDeliveryServiceQueue,
+        config.inboundLoggerServiceQueue,
+      ], {
+        subject: 'USER_LOGGED_IN',
+        body: {phoneNumber: phoneNumber},
+      });
 
-    // Emitting an 'USER_LOGGED_IN' event in shared queue on valid code
-    sharedQueue.emit([
-      config.inboundDeliveryServiceQueue,
-      config.inboundLoggerServiceQueue,
-    ], {
-      subject: 'USER_LOGGED_IN',
-      body: {phoneNumber: phoneNumber},
+      return {'userId': user.id, 'userToken': user.token};
     });
-
-    return verificationInstance;
   };
 }