Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #49 from RetroShare/master

Browse Source 
upate to master
This commit is contained in:
defnax 2020-01-22 21:51:05 +01:00 committed by GitHub
commit 1da4b330b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/jsonapi/jsonapi.cpp
View File

@ -417,7 +417,7 @@ void JsonApiServer::registerHandler(
if(!rsLoginHelper->isLoggedIn()) if(!rsLoginHelper->isLoggedIn())
{ {
session->close(rb::CONFLICT); session->close(rb::CONFLICT, corsOptionsHeaders);
return; return;
} }
@ -429,7 +429,7 @@ void JsonApiServer::registerHandler(
if(authToken != "Basic") if(authToken != "Basic")
{ {
session->close(rb::UNAUTHORIZED); session->close(rb::UNAUTHORIZED, corsOptionsHeaders);
return; return;
} }
@ -437,7 +437,7 @@ void JsonApiServer::registerHandler(
authToken = decodeToken(authToken); authToken = decodeToken(authToken);
if(isAuthTokenValid(authToken)) callback(session); if(isAuthTokenValid(authToken)) callback(session);
else session->close(rb::UNAUTHORIZED); else session->close(rb::UNAUTHORIZED, corsOptionsHeaders);
} ); } );
mResources.push_back(resource); mResources.push_back(resource);

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1139</width> <width>600</width>
<height>1171</height> <height>400</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">