Merge pull request #5387 from boundlessgeo/auth_fix_wfs_from_browser

elpaso · web-flow · commit b77c11f4c633 · 2017-10-17T12:25:40.000+02:00
[auth][bugfix] Do not expand authentication URI in browser items
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -46,7 +46,7 @@ QgsWfsLayerItem::QgsWfsLayerItem( QgsDataItem *parent, QString name, const QgsDa
 {
   QgsSettings settings;
   bool useCurrentViewExtent = settings.value( QStringLiteral( "Windows/WFSSourceSelect/FeatureCurrentViewExtent" ), true ).toBool();
-  mUri = QgsWFSDataSourceURI::build( uri.uri(), featureType, crsString, QString(), useCurrentViewExtent );
+  mUri = QgsWFSDataSourceURI::build( uri.uri( false ), featureType, crsString, QString(), useCurrentViewExtent );
   setState( Populated );
   mIconName = QStringLiteral( "mIconConnect.png" );
   mBaseUri = uri.param( QStringLiteral( "url" ) );
@@ -278,7 +278,7 @@ void QgsWfsRootItem::newConnection()
 
 QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
 {
-  QgsDebugMsg( "thePath = " + path );
+  QgsDebugMsgLevel( "WFS path = " + path, 4 );
   if ( path.isEmpty() )
   {
     return new QgsWfsRootItem( parentItem, QStringLiteral( "WFS" ), QStringLiteral( "wfs:" ) );
@@ -291,7 +291,7 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat
     if ( QgsWfsConnection::connectionList().contains( connectionName ) )
     {
       QgsWfsConnection connection( connectionName );
-      return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, connection.uri().uri() );
+      return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, connection.uri().uri( false ) );
     }
   }
   else if ( path.startsWith( QLatin1String( "geonode:/" ) ) )
@@ -306,9 +306,9 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat
 
       QgsWFSDataSourceURI sourceUri( geonodeRequest.fetchServiceUrlsBlocking( QStringLiteral( "WFS" ) )[0] );
 
-      QgsDebugMsg( QString( "WFS full uri: '%1'." ).arg( QString( sourceUri.uri() ) ) );
+      QgsDebugMsgLevel( QString( "WFS full uri: '%1'." ).arg( QString( sourceUri.uri() ) ), 4 );
 
-      return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri() );
+      return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri( false ) );
     }
   }
 
@@ -335,9 +335,9 @@ QVector<QgsDataItem *> QgsWfsDataItemProvider::createDataItems( const QString &p
         for ( const QString &encodedUri : encodedUris )
         {
           QgsWFSDataSourceURI uri( encodedUri );
-          QgsDebugMsg( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri() ) );
+          QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri( false ) ), 4 );
 
-          QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri() );
+          QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri( false ) );
           if ( item )
           {
             items.append( item );

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ QgsWfsLayerItem::QgsWfsLayerItem( QgsDataItem *parent, QString name, const QgsDa`
`46`	`46`	`{`
`47`	`47`	`QgsSettings settings;`
`48`	`48`	`bool useCurrentViewExtent = settings.value( QStringLiteral( "Windows/WFSSourceSelect/FeatureCurrentViewExtent" ), true ).toBool();`
`49`		`- mUri = QgsWFSDataSourceURI::build( uri.uri(), featureType, crsString, QString(), useCurrentViewExtent );`
	`49`	`+ mUri = QgsWFSDataSourceURI::build( uri.uri( false ), featureType, crsString, QString(), useCurrentViewExtent );`
`50`	`50`	`setState( Populated );`
`51`	`51`	`mIconName = QStringLiteral( "mIconConnect.png" );`
`52`	`52`	`mBaseUri = uri.param( QStringLiteral( "url" ) );`
`@@ -278,7 +278,7 @@ void QgsWfsRootItem::newConnection()`
`278`	`278`
`279`	`279`	`QgsDataItem QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDataItem parentItem )`
`280`	`280`	`{`
`281`		`- QgsDebugMsg( "thePath = " + path );`
	`281`	`+ QgsDebugMsgLevel( "WFS path = " + path, 4 );`
`282`	`282`	`if ( path.isEmpty() )`
`283`	`283`	`{`
`284`	`284`	`return new QgsWfsRootItem( parentItem, QStringLiteral( "WFS" ), QStringLiteral( "wfs:" ) );`
`@@ -291,7 +291,7 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat`
`291`	`291`	`if ( QgsWfsConnection::connectionList().contains( connectionName ) )`
`292`	`292`	`{`
`293`	`293`	`QgsWfsConnection connection( connectionName );`
`294`		`- return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, connection.uri().uri() );`
	`294`	`+ return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, connection.uri().uri( false ) );`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`	`else if ( path.startsWith( QLatin1String( "geonode:/" ) ) )`
`@@ -306,9 +306,9 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat`
`306`	`306`
`307`	`307`	`QgsWFSDataSourceURI sourceUri( geonodeRequest.fetchServiceUrlsBlocking( QStringLiteral( "WFS" ) )[0] );`
`308`	`308`
`309`		`- QgsDebugMsg( QString( "WFS full uri: '%1'." ).arg( QString( sourceUri.uri() ) ) );`
	`309`	`+ QgsDebugMsgLevel( QString( "WFS full uri: '%1'." ).arg( QString( sourceUri.uri() ) ), 4 );`
`310`	`310`
`311`		`- return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri() );`
	`311`	`+ return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri( false ) );`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
`@@ -335,9 +335,9 @@ QVector<QgsDataItem *> QgsWfsDataItemProvider::createDataItems( const QString &p`
`335`	`335`	`for ( const QString &encodedUri : encodedUris )`
`336`	`336`	`{`
`337`	`337`	`QgsWFSDataSourceURI uri( encodedUri );`
`338`		`- QgsDebugMsg( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri() ) );`
	`338`	`+ QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri( false ) ), 4 );`
`339`	`339`
`340`		`- QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri() );`
	`340`	`+ QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri( false ) );`
`341`	`341`	`if ( item )`
`342`	`342`	`{`
`343`	`343`	`items.append( item );`