Fix incorrect missing authentication dialog trigger (#3703)

MerginMaps · Feb 3, 2025 · f2d6780 · f2d6780 · inputapp-bot · Feb 3, 2025
1 parent 50e7b68
commit f2d6780
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -1453,7 +1453,7 @@ bool MerginApi::validateAuth()
     return false;
   }
 
-  if ( mUserAuth->authToken().isEmpty() || mUserAuth->tokenExpiration() < QDateTime().currentDateTime().toUTC() )
+  if ( mUserAuth->authToken().isEmpty() || mUserAuth->tokenExpiration() < QDateTime().currentDateTimeUtc() )
   {
     authorize( mUserAuth->username(), mUserAuth->password() );
     CoreUtils::log( QStringLiteral( "MerginApi" ), QStringLiteral( "Requesting authorization because of missing or expired token." ) );
@@ -3967,11 +3967,9 @@ DownloadQueueItem::DownloadQueueItem( const QString &fp, qint64 s, int v, qint64
 void MerginApi::reloadProjectRole( const QString &projectFullName )
 {
   if ( projectFullName.isEmpty() )
-  {
     return;
-  }
 
-  QNetworkReply *reply = getProjectInfo( projectFullName );
+  QNetworkReply *reply = getProjectInfo( projectFullName, mUserAuth->isLoggedIn() ); //withAuth depends on whether user is logged in or not
   if ( !reply )
     return;
 

diff --git a/core/merginuserauth.cpp b/core/merginuserauth.cpp
@@ -134,3 +134,8 @@ bool MerginUserAuth::hasValidToken() const
 {
   return !mAuthToken.isEmpty() && mTokenExpiration >= QDateTime().currentDateTimeUtc();
 }
+
+bool MerginUserAuth::isLoggedIn()
+{
+  return hasAuthData() && hasValidToken();
+}
diff --git a/core/merginuserauth.h b/core/merginuserauth.h
@@ -38,6 +38,11 @@ class MerginUserAuth: public QObject
     //! i.e. we should be good to do authenticated requests.
     Q_INVOKABLE bool hasValidToken() const;
 
+    /**
+     * Returns whether user is currently logged in
+    */
+    Q_INVOKABLE bool isLoggedIn();
+
     void clear();
 
     QString username() const;