yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: fIxed GUI Tester to comply with latest gRPC changes.

Browse Source
This commit is contained in:
Xavier Michelon
2023-01-06 07:20:53 +01:00
parent 16aaa1b050
commit 700836aea0
10 changed files with 128 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
internal/frontend/bridge-gui/bridge-gui-tester/GRPCService.cpp
View File

@ -412,15 +412,7 @@ Status GRPCService::Login(ServerContext *, LoginRequest const *request, Empty *)
return Status::OK;
}
SPUser const user = randomUser();
QString const userID = user->id();
user->setUsername(QString::fromStdString(request->username()));
usersTab.userTable().append(user);
if (usersTab.nextUserAlreadyLoggedIn()) {
qtProxy_.sendDelayedEvent(newLoginAlreadyLoggedInEvent(userID));
}
qtProxy_.sendDelayedEvent(newLoginFinishedEvent(userID));
this->finishLogin();
return Status::OK;
}
@ -445,15 +437,7 @@ Status GRPCService::Login2FA(ServerContext *, LoginRequest const *request, Empty
return Status::OK;
}
SPUser const user = randomUser();
QString const userID = user->id();
user->setUsername(QString::fromStdString(request->username()));
usersTab.userTable().append(user);
if (usersTab.nextUserAlreadyLoggedIn()) {
qtProxy_.sendDelayedEvent(newLoginAlreadyLoggedInEvent(userID));
}
qtProxy_.sendDelayedEvent(newLoginFinishedEvent(userID));
this->finishLogin();
return Status::OK;
}
@ -476,15 +460,7 @@ Status GRPCService::Login2Passwords(ServerContext *, LoginRequest const *request
return Status::OK;
}
SPUser const user = randomUser();
QString const userID = user->id();
user->setUsername(QString::fromStdString(request->username()));
usersTab.userTable().append(user);
if (usersTab.nextUserAlreadyLoggedIn()) {
qtProxy_.sendDelayedEvent(newLoginAlreadyLoggedInEvent(userID));
}
qtProxy_.sendDelayedEvent(newLoginFinishedEvent(userID));
this->finishLogin();
return Status::OK;
}
@ -842,3 +818,26 @@ bool GRPCService::sendEvent(SPStreamEvent const &event) {
}
return isStreaming_;
}
//****************************************************************************************************************************************************
//
//****************************************************************************************************************************************************
void GRPCService::finishLogin() {
UsersTab &usersTab = app().mainWindow().usersTab();
SPUser user = usersTab.userWithUsername(loginUsername_);
bool const alreadyExist = user.get();
if (!user) {
user = randomUser();
user->setUsername(loginUsername_);
usersTab.userTable().append(user);
} else {
if (user->state() == EUserState::State::Connected) {
qtProxy_.sendDelayedEvent(newLoginAlreadyLoggedInEvent(user->id()));
} else {
user->setState(EUserState::State::Connected);
}
}
qtProxy_.sendDelayedEvent(newLoginFinishedEvent(user->id(), alreadyExist));
}