Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get WordPress API path from domain server settings

Browse source
This commit is contained in:
David Rowe 2020-08-02 17:33:13 +12:00
parent 8cdd76a42e
commit c3769a5f74
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
domain-server/resources/describe-settings.json
View file

@ -87,7 +87,13 @@
{ {
"name": "oauth2_url_base", "name": "oauth2_url_base",
"label": "Authentication URL Base", "label": "Authentication URL Base",
"help": "The URL base that the Interface and domain-server will use to make API requests.", "help": "The URL base that the Interface will use to login via OAuth2.",
"advanced": true
},
{
"name": "wordpress_url_base",
"label": "WordPress API URL Base",
"help": "The URL base that the domain server will use to make WordPress API calls. Typically \"http://oursite.com/wp-json/\". However, if using non-pretty permalinks or otherwise get a 404 error then use \"http://oursite.com/?rest_route=/\".",
"advanced": true "advanced": true
} }
] ]

15
domain-server/src/DomainGatekeeper.cpp
View file

@ -450,6 +450,7 @@ SharedNodePointer DomainGatekeeper::processAssignmentConnectRequest(const NodeCo
} }
const QString AUTHENTICATION_OAUTH2_URL_BASE = "authentication.oauth2_url_base"; const QString AUTHENTICATION_OAUTH2_URL_BASE = "authentication.oauth2_url_base";
const QString AUTHENTICATION_WORDPRESS_URL_BASE = "authentication.wordpress_url_base";
const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity"; const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity";
const QString MAXIMUM_USER_CAPACITY_REDIRECT_LOCATION = "security.maximum_user_capacity_redirect_location"; const QString MAXIMUM_USER_CAPACITY_REDIRECT_LOCATION = "security.maximum_user_capacity_redirect_location";
@ -1235,13 +1236,15 @@ void DomainGatekeeper::requestDomainUser(const QString& username, const QString&
} }
_inFlightDomainUserIdentityRequests.insert(username, QPair<QString, QString>(accessToken, refreshToken)); _inFlightDomainUserIdentityRequests.insert(username, QPair<QString, QString>(accessToken, refreshToken));
QString API_BASE = "http://127.0.0.1:9001/wp-json/"; QString apiBase = _server->_settingsManager.valueForKeyPath(AUTHENTICATION_WORDPRESS_URL_BASE).toString();
// Typically "http://oursite.com/wp-json/". if (!apiBase.endsWith("/")) {
// However, if using non-pretty permalinks or otherwise get a 404 error then use "http://oursite.com/?rest_route=/". apiBase += "/";
}
// ####### TODO: Confirm API w.r.t. OAuth2 plugin's capabilities.
// Get data pertaining to "me", the user who generated the access token. // Get data pertaining to "me", the user who generated the access token.
QString API_ROUTE = "wp/v2/users/me?context=edit&_fields=id,username,roles"; // ####### TODO: Confirm API_ROUTE w.r.t. OAuth2 plugin's capabilities.
QString API_ROUTE = "wp/v2/users/me?context=edit&_fields=id,username,roles";
QUrl domainUserURL = apiBase + API_ROUTE;
// ####### TODO: Append a random key to check in response? // ####### TODO: Append a random key to check in response?
@ -1254,8 +1257,6 @@ void DomainGatekeeper::requestDomainUser(const QString& username, const QString&
QByteArray formData; // No data to send. QByteArray formData; // No data to send.
QUrl domainUserURL = API_BASE + API_ROUTE;
domainUserURL = "http://localhost:9002/resource"; // ####### TODO: Delete
request.setUrl(domainUserURL); request.setUrl(domainUserURL);
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);

1
libraries/networking/src/NodeList.cpp
View file

@ -501,6 +501,7 @@ void NodeList::sendDomainServerCheckIn() {
packetStream << domainAccountManager->getUsername(); packetStream << domainAccountManager->getUsername();
if (!domainAccountManager->getAccessToken().isEmpty()) { if (!domainAccountManager->getAccessToken().isEmpty()) {
packetStream << (domainAccountManager->getAccessToken() + ":" + domainAccountManager->getRefreshToken()); packetStream << (domainAccountManager->getAccessToken() + ":" + domainAccountManager->getRefreshToken());
}
} }
} }