Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix authentication configuration is lost when adding Arcgis Feature
Service/Map service layers via source select dialog instead of browser

Fixes #39822

(cherry picked from commit 443695c)
  • Loading branch information
nyalldawson committed Nov 20, 2020
1 parent b21bc03 commit f5bc8c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/providers/arcgisrest/qgsafssourceselect.cpp
Expand Up @@ -168,7 +168,7 @@ void QgsAfsSourceSelect::buildQuery( const QgsOwsConnection &connection, const Q
ds.removeParam( QStringLiteral( "url" ) );
ds.setParam( QStringLiteral( "url" ), url );
QgsDataProvider::ProviderOptions providerOptions;
QgsAfsProvider provider( ds.uri(), providerOptions );
QgsAfsProvider provider( ds.uri( false ), providerOptions );
if ( !provider.isValid() )
{
return;
Expand Down Expand Up @@ -204,7 +204,7 @@ QString QgsAfsSourceSelect::getLayerURI( const QgsOwsConnection &connection,
{
ds.setParam( QStringLiteral( "bbox" ), QStringLiteral( "%1,%2,%3,%4" ).arg( bBox.xMinimum() ).arg( bBox.yMinimum() ).arg( bBox.xMaximum() ).arg( bBox.yMaximum() ) );
}
return ds.uri();
return ds.uri( false );
}


Expand Down
2 changes: 1 addition & 1 deletion src/providers/arcgisrest/qgsamssourceselect.cpp
Expand Up @@ -170,7 +170,7 @@ QString QgsAmsSourceSelect::getLayerURI( const QgsOwsConnection &connection,
ds.setParam( QStringLiteral( "layer" ), layerId );
ds.setParam( QStringLiteral( "crs" ), crs );
ds.setParam( QStringLiteral( "format" ), getSelectedImageEncoding() );
return ds.uri();
return ds.uri( false );
}

void QgsAmsSourceSelect::addServiceLayer( QString uri, QString typeName )
Expand Down

0 comments on commit f5bc8c9

Please sign in to comment.