Enable PGSQL Layer Authentication #5341

mohsenD98 · 2024-06-16T13:01:43Z

This PR aims to resolve #5285.

Describe: When the username and password for the PGSQL layer are not stored in the project, QField fails to load the layer and displays an "Unsupported" error message. This PR aims to resolve this issue

Fix: By inheritance from qgscredentials and overriding request function in QFieldAppAuthRequestHandler we can add realm to unhandledRealm by authNeeded and that will do the rest.

Result: With this fix, when a user attempts to load a PGSQL layer without credentials stored in the project, they will be prompted to enter their username and password. Once authenticated, the layer will be loaded successfully.

New look:

Add flickable, image, submit button and reformatting hole file. Also fix and injection warning.

fix this warning: onCancel@qrc:/qml/qgismobileapp.qml:3635 Too many arguments, ignoring 1

qfield-fairy · 2024-06-16T18:55:25Z

🎉 Ta-daaa, freshly created APKs are available for 6462267: arm64-android

Other architectures

github-actions

clang-tidy made some suggestions

src/core/messagelogmodel.cpp

github-actions · 2024-06-16T18:57:13Z

src/core/qfieldappauthrequesthandler.cpp

+  QgsCredentials::setInstance( this );
+}
+
+bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message )


warning: 2 adjacent parameters of 'request' of similar type ('QString &') are easily swapped by mistake [bugprone-easily-swappable-parameters]

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

Additional context

src/core/qfieldappauthrequesthandler.cpp:30: the first parameter in the range is 'username'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

src/core/qfieldappauthrequesthandler.cpp:30: the last parameter in the range is 'password'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

suricactus

Great functionality!

I did not review in detail or test, just two small things I saw quickly scanning .

src/core/messagelogmodel.h

src/qml/qgismobileapp.qml

mohsenD98 · 2024-06-17T08:04:52Z

Great functionality!

I did not review in detail or test, just two small things I saw quickly scanning .

Appreciate your quick feedback! I've reviewed and fixed the two items you mentioned, I've committed the changes :)

github-actions

clang-tidy made some suggestions

github-actions · 2024-06-17T08:20:07Z

src/core/qfieldappauthrequesthandler.cpp

+  QgsCredentials::setInstance( this );
+}
+
+bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message )


warning: 2 adjacent parameters of 'request' of similar type ('QString &') are easily swapped by mistake [bugprone-easily-swappable-parameters]

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

Additional context

src/core/qfieldappauthrequesthandler.cpp:30: the first parameter in the range is 'username'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

src/core/qfieldappauthrequesthandler.cpp:30: the last parameter in the range is 'password'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

nirvn · 2024-06-17T09:18:20Z

src/core/messagelogmodel.cpp

@@ -59,21 +59,43 @@ QVariant MessageLogModel::data( const QModelIndex &index, int role ) const
  return QVariant();
 }

-void MessageLogModel::suppressTags( const QList<QString> &tags )
+void MessageLogModel::suppress( const QVariantMap &model )


Suggested change

void MessageLogModel::suppress( const QVariantMap &model )

void MessageLogModel::suppress( const QVariantMap &filter )

nirvn · 2024-06-17T09:18:34Z

src/core/messagelogmodel.cpp

  }
 }

-void MessageLogModel::unsuppressTags( const QList<QString> &tags )
+void MessageLogModel::unsuppress( const QVariantMap &model )


Suggested change

void MessageLogModel::unsuppress( const QVariantMap &model )

void MessageLogModel::unsuppress( const QVariantMap &filter )

nirvn · 2024-06-17T09:19:33Z

src/core/messagelogmodel.h

@@ -77,7 +77,7 @@ class MessageLogModel : public QAbstractListModel
  private:
    QgsMessageLog *mMessageLog = nullptr;
    QVector<LogMessage> mMessages;
-    QList<QString> mSuppressedTags;
+    QMap<QString, QStringList> mSuppressedModel;


Model seems off here --

Suggested change

QMap<QString, QStringList> mSuppressedModel;

QMap<QString, QStringList> mSuppressedFilters;

nirvn · 2024-06-17T09:20:32Z

src/core/messagelogmodel.cpp

@@ -86,8 +108,16 @@ void MessageLogModel::clear()

 void MessageLogModel::onMessageReceived( const QString &message, const QString &tag, Qgis::MessageLevel level )
 {
-  if ( mSuppressedTags.contains( tag ) || tag == QLatin1String( "3D" ) )
-    return;
+  if ( mSuppressedModel.contains( tag ) || tag == QLatin1String( "3D" ) )


Suggested change

if ( mSuppressedModel.contains( tag ) || tag == QLatin1String( "3D" ) )

if ( tag == QLatin1String( "3D" )

{

return;

}

else if ( mSuppressedModel.contains( tag ) )

nirvn · 2024-06-17T09:21:33Z

src/core/messagelogmodel.cpp

+  {
+    for ( const QString &filter : mSuppressedModel[tag] )
+    {
+      if ( message.contains( filter ) )


Let's bit a bit more flexible:

Suggested change

if ( message.contains( filter ) )

if ( message.contains( filter, Qt::CaseInsensitive ) )

github-actions

clang-tidy made some suggestions

github-actions · 2024-06-17T10:57:34Z

src/core/qfieldappauthrequesthandler.cpp

+  QgsCredentials::setInstance( this );
+}
+
+bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message )


warning: 2 adjacent parameters of 'request' of similar type ('QString &') are easily swapped by mistake [bugprone-easily-swappable-parameters]

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

Additional context

src/core/qfieldappauthrequesthandler.cpp:30: the first parameter in the range is 'username'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

src/core/qfieldappauthrequesthandler.cpp:30: the last parameter in the range is 'password'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

github-actions

clang-tidy made some suggestions

github-actions · 2024-06-17T12:09:19Z

src/core/qfieldappauthrequesthandler.cpp

+  QgsCredentials::setInstance( this );
+}
+
+bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message )


warning: 2 adjacent parameters of 'request' of similar type ('QString &') are easily swapped by mistake [bugprone-easily-swappable-parameters]

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

Additional context

src/core/qfieldappauthrequesthandler.cpp:30: the first parameter in the range is 'username'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

src/core/qfieldappauthrequesthandler.cpp:30: the last parameter in the range is 'password'

bool QFieldAppAuthRequestHandler::request( const QString &realm, QString &username, QString &password, const QString &message ) ^

mohsenD98 requested a review from nirvn June 16, 2024 13:01

mohsenD98 self-assigned this Jun 16, 2024

nirvn and others added 6 commits June 16, 2024 21:49

wip credentials

3fbbafc

Make suppress and unsuppress more general.

be7f485

Extract title from realm and use it in login dialog.

4971061

Polish login dialog.

10bb410

Add flickable, image, submit button and reformatting hole file. Also fix and injection warning.

Remove unwanted emit keyword.

969ace8

LoginDialog: Fix a warning onCancel

21d1b56

fix this warning: onCancel@qrc:/qml/qgismobileapp.qml:3635 Too many arguments, ignoring 1

mohsenD98 force-pushed the credentials branch from e5eaf18 to 21d1b56 Compare June 16, 2024 18:45

github-actions bot reviewed Jun 16, 2024

View reviewed changes

suricactus reviewed Jun 16, 2024

View reviewed changes

src/core/messagelogmodel.h Outdated Show resolved Hide resolved

src/qml/qgismobileapp.qml Outdated Show resolved Hide resolved

PR review: cleaner code.

b434dd2

mohsenD98 force-pushed the credentials branch from e8380fc to b434dd2 Compare June 17, 2024 08:06

github-actions bot reviewed Jun 17, 2024

View reviewed changes

nirvn reviewed Jun 17, 2024

View reviewed changes

PR review: cleaner code (rename "model" to "filter" and CaseInsensitive)

f6c3129

github-actions bot reviewed Jun 17, 2024

View reviewed changes

nirvn approved these changes Jun 17, 2024

View reviewed changes

fix cppcheck warning

6462267

nirvn merged commit c577b27 into master Jun 17, 2024
19 checks passed

nirvn deleted the credentials branch June 17, 2024 11:55

github-actions bot reviewed Jun 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable PGSQL Layer Authentication #5341

Enable PGSQL Layer Authentication #5341

mohsenD98 commented Jun 16, 2024

qfield-fairy commented Jun 16, 2024 •

edited

Loading

github-actions bot left a comment

github-actions bot Jun 16, 2024

suricactus left a comment

mohsenD98 commented Jun 17, 2024

github-actions bot left a comment

github-actions bot Jun 17, 2024

nirvn Jun 17, 2024

nirvn Jun 17, 2024

nirvn Jun 17, 2024

nirvn Jun 17, 2024

nirvn Jun 17, 2024

github-actions bot left a comment

github-actions bot Jun 17, 2024

github-actions bot left a comment

github-actions bot Jun 17, 2024

	void MessageLogModel::suppress( const QVariantMap &model )
	void MessageLogModel::suppress( const QVariantMap &filter )

	void MessageLogModel::unsuppress( const QVariantMap &model )
	void MessageLogModel::unsuppress( const QVariantMap &filter )

	QMap<QString, QStringList> mSuppressedModel;
	QMap<QString, QStringList> mSuppressedFilters;

-  if ( mSuppressedModel.contains( tag ) || tag == QLatin1String( "3D" ) )
+  if ( tag == QLatin1String( "3D" )
+  {
+    return;
+  }
+  else if ( mSuppressedModel.contains( tag ) )

	if ( message.contains( filter ) )
	if ( message.contains( filter, Qt::CaseInsensitive ) )

Enable PGSQL Layer Authentication #5341

Enable PGSQL Layer Authentication #5341

Conversation

mohsenD98 commented Jun 16, 2024

qfield-fairy commented Jun 16, 2024 • edited Loading

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Jun 16, 2024

Choose a reason for hiding this comment

suricactus left a comment

Choose a reason for hiding this comment

mohsenD98 commented Jun 17, 2024

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Jun 17, 2024

Choose a reason for hiding this comment

nirvn Jun 17, 2024

Choose a reason for hiding this comment

nirvn Jun 17, 2024

Choose a reason for hiding this comment

nirvn Jun 17, 2024

Choose a reason for hiding this comment

nirvn Jun 17, 2024

Choose a reason for hiding this comment

nirvn Jun 17, 2024

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Jun 17, 2024

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Jun 17, 2024

Choose a reason for hiding this comment

qfield-fairy commented Jun 16, 2024 •

edited

Loading