Fix WFS connection's version Detect button, which did not support auth

dakcarto · nyalldawson · commit b9ec49509eb6 · 2019-06-10T08:23:50.000+10:00
Adds QgsNewHttpConnection protected member to access auth settings
diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -235,6 +235,11 @@ QPushButton *QgsNewHttpConnection::testConnectButton()
   return mTestConnectionButton;
 }
 
+QgsAuthSettingsWidget *QgsNewHttpConnection::authSettingsWidget()
+{
+  return mAuthSettings;
+}
+
 QPushButton *QgsNewHttpConnection::wfsVersionDetectButton()
 {
   return mWfsVersionDetectButton;
diff --git a/src/gui/qgsnewhttpconnection.h b/src/gui/qgsnewhttpconnection.h
@@ -115,6 +115,12 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo
      */
     QPushButton *testConnectButton();
 
+    /**
+     * Returns the current authentication settings widget.
+     * \since QGIS 3.8
+     */
+    QgsAuthSettingsWidget *authSettingsWidget() SIP_SKIP;
+
     /**
      * Returns the "WFS version detect" button.
      * \since QGIS 3.2
diff --git a/src/providers/wfs/qgswfsnewconnection.cpp b/src/providers/wfs/qgswfsnewconnection.cpp
@@ -35,7 +35,15 @@ QgsWFSNewConnection::~QgsWFSNewConnection()
 void QgsWFSNewConnection::versionDetectButton()
 {
   delete mCapabilities;
-  mCapabilities = new QgsWfsCapabilities( urlTrimmed().toString() );
+
+  // Honor any defined authentication settings
+  QgsDataSourceUri uri = QgsDataSourceUri();
+  uri.setParam( QStringLiteral( "url" ), urlTrimmed().toString() );
+  uri.setUsername( authSettingsWidget()->username() );
+  uri.setPassword( authSettingsWidget()->password() );
+  uri.setAuthConfigId( authSettingsWidget()->configId() );
+
+  mCapabilities = new QgsWfsCapabilities( uri.uri( false ) );
   connect( mCapabilities, &QgsWfsCapabilities::gotCapabilities, this, &QgsWFSNewConnection::capabilitiesReplyFinished );
   const bool synchronous = false;
   const bool forceRefresh = true;

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,11 @@ QPushButton *QgsNewHttpConnection::testConnectButton()`
`235`	`235`	`return mTestConnectionButton;`
`236`	`236`	`}`
`237`	`237`
	`238`	`+QgsAuthSettingsWidget *QgsNewHttpConnection::authSettingsWidget()`
	`239`	`+{`
	`240`	`+ return mAuthSettings;`
	`241`	`+}`
	`242`	`+`
`238`	`243`	`QPushButton *QgsNewHttpConnection::wfsVersionDetectButton()`
`239`	`244`	`{`
`240`	`245`	`return mWfsVersionDetectButton;`