Add "Request New Authorization"

OPM · Feb 14, 2025 · 651110f · 651110f
1 parent 860588d
commit 651110f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaCloudConnector.cpp b/ApplicationLibCode/Application/Tools/Cloud/RiaCloudConnector.cpp
@@ -247,11 +247,12 @@ void RiaCloudConnector::setTokenDataFilePath( const QString& filePath )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RiaCloudConnector::forceNewTokens()
+void RiaCloudConnector::clearTokens()
 {
     if ( m_authCodeFlow )
     {
-        m_authCodeFlow->grant();
+        m_authCodeFlow->setToken( "" );
+        m_authCodeFlow->setRefreshToken( "" );
     }
 }
 

diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaCloudConnector.h b/ApplicationLibCode/Application/Tools/Cloud/RiaCloudConnector.h
@@ -50,7 +50,7 @@ class RiaCloudConnector : public QObject
 
     QString requestTokenBlocking();
     void    requestTokenWithCancelButton();
-    void    forceNewTokens();
+    void    clearTokens();
 
     bool isGranted() const;
 

diff --git a/ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp b/ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp
@@ -44,6 +44,9 @@ RimCloudDataSourceCollection::RimCloudDataSourceCollection()
     CAF_PDM_InitFieldNoDefault( &m_authenticate, "Authenticate", "" );
     caf::PdmUiPushButtonEditor::configureEditorLabelLeft( &m_authenticate );
 
+    CAF_PDM_InitFieldNoDefault( &m_requestNewAuthentication, "RequestNewAuthentication", "" );
+    caf::PdmUiPushButtonEditor::configureEditorLabelLeft( &m_requestNewAuthentication );
+
     CAF_PDM_InitFieldNoDefault( &m_sumoFieldName, "SumoFieldId", "Field Id" );
     CAF_PDM_InitFieldNoDefault( &m_sumoCaseId, "SumoCaseId", "Case Id" );
     m_sumoCaseId.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
@@ -110,6 +113,13 @@ void RimCloudDataSourceCollection::fieldChangedByUi( const caf::PdmFieldHandle*
 
         m_authenticate = false;
     }
+    else if ( changedField == &m_requestNewAuthentication )
+    {
+        m_sumoConnector->clearTokens();
+        m_sumoConnector->requestTokenWithCancelButton();
+
+        m_requestNewAuthentication = false;
+    }
 
     if ( changedField == &m_sumoFieldName )
     {
@@ -196,12 +206,16 @@ void RimCloudDataSourceCollection::defineUiOrdering( QString uiConfigName, caf::
 {
     auto authGroup = uiOrdering.addNewGroup( "Authentication" );
     authGroup->add( &m_authenticate );
+    authGroup->add( &m_requestNewAuthentication );
 
     bool    isGranted = m_sumoConnector && m_sumoConnector->isGranted();
     QString text      = "Authentication Status: ";
     text += isGranted ? "<font color='#228B22'>✔ Granted</font>" : "<font color='#FFA500'>❌ Not Granted</font>";
 
     m_authenticate.uiCapability()->setUiName( text );
+    m_authenticate.uiCapability()->setUiReadOnly( isGranted );
+
+    m_requestNewAuthentication.uiCapability()->setUiHidden( isGranted );
 
     if ( isGranted )
     {
@@ -230,15 +244,21 @@ void RimCloudDataSourceCollection::defineEditorAttribute( const caf::PdmFieldHan
             attrib->m_buttonText = "Authenticate";
         }
     }
-
-    if ( field == &m_addDataSources )
+    else if ( field == &m_requestNewAuthentication )
+    {
+        if ( auto attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )
+        {
+            attrib->m_buttonText = "Request New Authentication";
+        }
+    }
+    else if ( field == &m_addDataSources )
     {
         if ( auto attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )
         {
             attrib->m_buttonText = "Add Data Sources(s)";
         }
     }
-    if ( field == &m_addEnsembles )
+    else if ( field == &m_addEnsembles )
     {
         if ( auto attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )
         {

diff --git a/ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.h b/ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.h
@@ -58,6 +58,7 @@ class RimCloudDataSourceCollection : public caf::PdmObject
 
 private:
     caf::PdmField<bool>                 m_authenticate;
+    caf::PdmField<bool>                 m_requestNewAuthentication;
     caf::PdmField<QString>              m_sumoFieldName;
     caf::PdmField<QString>              m_sumoCaseId;
     caf::PdmField<std::vector<QString>> m_sumoEnsembleNames;