WIP to undo

Author: osdiab

packages/server/src/routes/members/createMember.ts

@@ -5,7 +5,8 @@ import { CollectionReference, Firestore } from "@google-cloud/firestore";
 import {
   OperationType,
   RequestVerificationOperation,
-  Operation
+  Operation,
+  CreateMemberOperationToBeCreated
 } from "@raha/api-shared/dist/models/Operation";
 import { InvalidInviteOperationError } from "@raha/api-shared/dist/errors/RahaApiError/members/createMember/InvalidInviteOperation";
 import { MemberId } from "@raha/api-shared/dist/models/identifiers";
@@ -14,6 +15,7 @@ import { NotFoundError } from "@raha/api-shared/dist/errors/RahaApiError/NotFoun
 import { MemberAlreadyExistsError } from "@raha/api-shared/dist/errors/RahaApiError/members/createMember/MemberAlreadyExists";
 import { MissingParamsError } from "@raha/api-shared/dist/errors/RahaApiError/MissingParamsError";
 import { CreateMemberApiEndpoint } from "@raha/api-shared/dist/routes/members/definitions";
+import { MemberToBeCreated } from "@raha/api-shared/dist/models/Member";
 
 import { Config } from "../../config/config";
 import { sendPushNotification } from "../../helpers/sendPushNotification";
@@ -106,14 +108,13 @@ async function _createInvitedMember(
     throw new NotFoundError(requestInviteFromMemberId);
   }
 
-  const newCreateMemberOperation: OperationToInsert = {
+  const newCreateMemberOperation: CreateMemberOperationToBeCreated = {
     creator_uid: loggedInUid,
     op_code: OperationType.CREATE_MEMBER,
     data: {
       username,
       full_name: fullName,
-      request_invite_from_member_id: requestInviteFromMemberId,
-      identity_video_url: getPublicInviteVideoUrlForMember(config, loggedInUid)
+      request_invite_from_member_id: requestInviteFromMemberId
     },
     created_at: firestore.FieldValue.serverTimestamp()
   };
@@ -182,22 +183,23 @@ async function _createUninvitedMember(
   username: string,
   videoToken: string
 ) {
-  const newCreateMemberOperation: OperationToInsert = {
+  const newCreateMemberOperation: CreateMemberOperationToBeCreated = {
     creator_uid: loggedInUid,
     op_code: OperationType.CREATE_MEMBER,
     data: {
       username,
-      full_name: fullName,
-      identity_video_url: getPublicInviteVideoUrlForMember(config, loggedInUid)
+      full_name: fullName
     },
     created_at: firestore.FieldValue.serverTimestamp()
   };
-  const newMember = {
+
+  type MemberToInsert = MemberToBeCreated & {
+    created_at: firestore.FieldValue;
+  };
+  const newMember: MemberToInsert = {
     username,
     full_name: fullName,
-    // TODO Remove or-check once we're sure all clients have upgraded to request email on signup.
-    // Updated client will have version number 0.0.6 for Android.
-    email_address: emailAddress || null,
+    email_address: emailAddress,
     email_address_is_verified: false,
     invite_confirmed: false,
     identity_video_url: LEGACY_getPublicInviteVideoUrlForMember(
@@ -268,21 +270,20 @@ export const createMember = (
           throw new MemberAlreadyExistsError();
         }
 
+        //
         const {
           username,
           fullName,
           emailAddress,
-          videoToken,
+          // videoReference,
           inviteToken
         } = call.body;
 
         const requiredParams = {
           username,
           fullName,
-          // TODO Enable this check once we're sure all clients have upgraded to request email on signup.
-          // Updated client will have version number 0.0.6 for Android.
-          // emailAddress
-          videoToken
+          emailAddress
+          // videoReference
         };
         const missingParams = (Object.keys(requiredParams) as Array<
           keyof typeof requiredParams