rename flag, add to unit test

hicommonwealth · Dec 23, 2024 · b735202 · b735202
1 parent 6362be4
commit b735202
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/libs/model/src/user/SignIn.command.ts b/libs/model/src/user/SignIn.command.ts
@@ -59,8 +59,8 @@ export function SignIn(): Command<typeof schemas.SignIn> {
       const { base, encodedAddress, ss58Prefix, hex, existingHexUserId } = actor
         .user.auth as VerifiedAddress;
 
-      const signed_in = actor.user.id > 0;
-      let user_id = signed_in ? actor.user.id : (existingHexUserId ?? null);
+      const was_signed_in = actor.user.id > 0;
+      let user_id = was_signed_in ? actor.user.id : (existingHexUserId ?? null);
 
       await verifySessionSignature(
         deserializeCanvas(session),
@@ -199,7 +199,7 @@ export function SignIn(): Command<typeof schemas.SignIn> {
         ...addr.toJSON(),
         community_base: base,
         community_ss58_prefix: ss58Prefix,
-        signed_in,
+        was_signed_in,
         user_created,
         address_created,
         first_community,

diff --git a/libs/model/test/user/signin-lifecycle.spec.ts b/libs/model/test/user/signin-lifecycle.spec.ts
@@ -125,6 +125,7 @@ describe('SignIn Lifecycle', async () => {
         expect(addr!.verification_token).to.be.not.null;
         expect(addr!.verified).to.be.not.null;
 
+        expect(addr!.was_signed_in).to.be.false;
         expect(addr!.first_community).to.be.true;
         expect(addr!.user_created).to.be.true;
         expect(addr!.address_created).to.be.true;
@@ -160,6 +161,7 @@ describe('SignIn Lifecycle', async () => {
 
         expect(addr!).to.not.be.null;
         expect(addr!.User).to.be.not.null;
+        expect(addr!.was_signed_in).to.be.true;
         expect(addr!.first_community).to.be.false;
         expect(addr!.user_created).to.be.false;
         expect(addr!.address_created).to.be.false;
@@ -315,6 +317,7 @@ describe('SignIn Lifecycle', async () => {
           },
         });
         expect(transferred).to.not.be.null;
+        expect(transferred!.was_signed_in).to.be.true;
         expect(transferred!.address).to.be.equal(ref.address);
 
         // check that user 2 now owns 2 addresses from user 1

diff --git a/libs/schemas/src/commands/user.schemas.ts b/libs/schemas/src/commands/user.schemas.ts
@@ -15,7 +15,7 @@ export const SignIn = {
   output: Address.extend({
     community_base: z.nativeEnum(ChainBase),
     community_ss58_prefix: z.number().nullish(),
-    signed_in: z.boolean().describe('True when user was already signed in'),
+    was_signed_in: z.boolean().describe('True when user was already signed in'),
     user_created: z
       .boolean()
       .describe(

diff --git a/packages/commonwealth/server/api/user.ts b/packages/commonwealth/server/api/user.ts
@@ -10,7 +10,10 @@ export const trpcRouter = trpc.router({
   signIn: trpc.command(User.SignIn, trpc.Tag.User, [
     async (input, output, ctx) => {
       await new Promise((resolve, reject) => {
-        if (output.signed_in) return resolve(true);
+        // no need to login if we're already signed in
+        if (output.was_signed_in) return resolve(true);
+
+        // complete passport login
         ctx.req.login(output.User as Express.User, (err) => {
           if (err) {
             analytics().track(
@@ -33,7 +36,7 @@ export const trpcRouter = trpc.router({
               MixpanelUserSignupEvent.NEW_USER_SIGNUP,
               { community_id: output.community_id },
             ]
-          : !output.signed_in
+          : !output.was_signed_in
             ? [
                 MixpanelLoginEvent.LOGIN_COMPLETED,
                 {