Skip to content

Commit a60edb9

Browse files
authored
Fix log request (#4037)
1 parent ed76d58 commit a60edb9

1 file changed

Lines changed: 4 additions & 16 deletions

File tree

app/inputhelp.cpp

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -254,23 +254,11 @@ void InputHelp::submitReport()
254254
const QString log = fullLog( false );
255255
const QByteArray logArr = log.toUtf8();
256256
const QString app = QStringLiteral( "input-%1-%2" ).arg( InputUtils::appPlatform(), CoreUtils::appVersion() );
257-
QNetworkRequest request;
258-
QString params;
257+
QString username = mMerginApi->userInfo()->username().toHtmlEscaped();
258+
if ( username.isEmpty() ) username = "unknown";
259+
const QString params = QStringLiteral( "?app=%1&username=%2" ).arg( app, username );
259260

260-
// log storage on old AWS lambda doesn't support any user authentication thus we pass username as parameter to "sign" the log
261-
if ( mMerginApi->serverDiagnosticLogsUrl() == MerginApi::sDefaultReportLogUrl )
262-
{
263-
QString username = mMerginApi->userInfo()->username().toHtmlEscaped();
264-
if ( username.isEmpty() )
265-
username = "unknown";
266-
params = QStringLiteral( "?app=%1&username=%2" ).arg( app, username );
267-
request = mMerginApi->getDefaultRequest( false );
268-
}
269-
else
270-
{
271-
params = QStringLiteral( "?app=%1" ).arg( app );
272-
request = mMerginApi->getDefaultRequest();
273-
}
261+
QNetworkRequest request = mMerginApi->getDefaultRequest();
274262
request.setRawHeader( "Content-Type", "text/plain" );
275263
request.setUrl( mMerginApi->serverDiagnosticLogsUrl() + params );
276264
const QNetworkReply *reply = mManager.post( request, logArr );

0 commit comments

Comments
 (0)