OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Osdu: make sure token is valid before background loading.

Browse Source
This commit is contained in:
Kristian Bendiksen 2024-07-13 12:48:06 +02:00
parent 2651ca91b6
commit 76a1d43b0e
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/Application/Tools/Cloud/RiaCloudConnector.h
View File

@ -48,6 +48,8 @@ public:
QString server() const; QString server() const;
QString requestTokenBlocking();
public slots: public slots:
void requestToken(); void requestToken();
void requestFailed( const QAbstractOAuth::Error error ); void requestFailed( const QAbstractOAuth::Error error );
@ -61,8 +63,6 @@ private slots:
void accessGranted(); void accessGranted();
protected: protected:
QString requestTokenBlocking();
static QString constructAuthUrl( const QString& authority ); static QString constructAuthUrl( const QString& authority );
static QString constructTokenUrl( const QString& authority ); static QString constructTokenUrl( const QString& authority );

19
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp
View File

@ -155,6 +155,25 @@ void RimWellPathCollection::loadDataAndUpdate()
readWellPathFormationFiles(); readWellPathFormationFiles();
auto hasOsduData = []( const std::vector<RimWellPath*>& wellPaths ) -> bool
{
for ( RimWellPath* wellPath : wellPaths )
{
if ( dynamic_cast<RimOsduWellPath*>( wellPath ) )
{
return true;
}
}
return false;
};
if ( hasOsduData( allWellPaths() ) )
{
auto osduConnector = RiaApplication::instance()->makeOsduConnector();
osduConnector->requestTokenBlocking();
}
caf::DataLoadController* dataLoadController = caf::DataLoadController::instance(); caf::DataLoadController* dataLoadController = caf::DataLoadController::instance();
const QString wellPathGeometryKeyword = "WELL_PATH_GEOMETRY"; const QString wellPathGeometryKeyword = "WELL_PATH_GEOMETRY";