@ -72,7 +72,7 @@ QString CommaApi::create_jwt(QVector<QPair<QString, QJsonValue>> payloads, int e
}
}
HttpRequest : : HttpRequest ( QObject * parent , QString requestURL , const QString & cache_key ) : cache_key ( cache_key ) , QObject ( parent ) {
HttpRequest : : HttpRequest ( QObject * parent , QString requestURL , const QString & cache_key , bool create_jwt_ ) : cache_key ( cache_key ) , create_jwt ( create_jwt_ ) , QObject ( parent ) {
networkAccessManager = new QNetworkAccessManager ( this ) ;
networkAccessManager = new QNetworkAccessManager ( this ) ;
reply = NULL ;
reply = NULL ;
@ -91,7 +91,15 @@ HttpRequest::HttpRequest(QObject *parent, QString requestURL, const QString &cac
}
}
void HttpRequest : : sendRequest ( QString requestURL ) {
void HttpRequest : : sendRequest ( QString requestURL ) {
QString token = CommaApi : : create_jwt ( ) ;
QString token ;
if ( create_jwt ) {
token = CommaApi : : create_jwt ( ) ;
} else {
QString token_json = QString : : fromStdString ( util : : read_file ( util : : getenv_default ( " HOME " , " /.comma/auth.json " , " /.comma/auth.json " ) ) ) ;
QJsonDocument json_d = QJsonDocument : : fromJson ( token_json . toUtf8 ( ) ) ;
token = json_d [ " access_token " ] . toString ( ) ;
}
QNetworkRequest request ;
QNetworkRequest request ;
request . setUrl ( QUrl ( requestURL ) ) ;
request . setUrl ( QUrl ( requestURL ) ) ;
request . setRawHeader ( QByteArray ( " Authorization " ) , ( " JWT " + token ) . toUtf8 ( ) ) ;
request . setRawHeader ( QByteArray ( " Authorization " ) , ( " JWT " + token ) . toUtf8 ( ) ) ;