Skip to content

M-2865 Email with code is sent twice, if the app is clearly installed, and user logs in with email #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iosDeveloperDenis wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −11
Open

M-2865 Email with code is sent twice, if the app is clearly installed, and user logs in with email #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions lib/ddp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,20 @@ class DDP extends EventEmitter<DDPEventMap> {
// closing the connection
this.socket.send({ msg: 'pong', id: (message as any).id });
} else if (PUBLIC_EVENTS.includes(message.msg as any)) {
if (message.msg === 'result') {
const pendingMethod = this.pendingMethods.get(message.id);
const isLoginResult = pendingMethod?.method === 'login';
// should be deleted before requeueActiveMessages to avoid re-sending it
this.pendingMethods.delete(message.id);

if (isLoginResult && this.shouldReplayActionsOnLogin) {
// resume login finished (success or error) – unblock replay
this.shouldReplayActionsOnLogin = false;
this.requeueActiveMessages();
this.messageQueue.process();
}
}

if (this.isVerbose) {
if (
message.msg === 'ready' ||
Expand All @@ -368,17 +382,6 @@ class DDP extends EventEmitter<DDPEventMap> {
} else {
this.logger(message);
}
const pendingMethod = this.pendingMethods.get(message.id);
const isLoginResult = pendingMethod?.method === 'login';
// should be deleted before requeueActiveMessages to avoid re-sending it
this.pendingMethods.delete(message.id);

if (isLoginResult && this.shouldReplayActionsOnLogin) {
// resume login finished (success or error) – unblock replay
this.shouldReplayActionsOnLogin = false;
this.requeueActiveMessages();
this.messageQueue.process();
}
} else if (
message.msg === 'added' ||
message.msg === 'changed' ||
Expand Down
Loading