[auth] Update OAuth2 plugin to new QgsApplication::authManager()

qgis · Oct 27, 2017 · 6a4e397 · 6a4e397
1 parent 6354563
commit 6a4e397
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/auth/oauth2/qgsauthoauth2config.cpp b/src/auth/oauth2/qgsauthoauth2config.cpp
@@ -676,7 +676,7 @@ QgsStringMap QgsAuthOAuth2Config::mapOAuth2Configs(
   return configs;
 }
 
-QgsStringMap QgsAuthOAuth2Config::mappedOAuth2ConfigsCache(QObject *parent, const QString &extradir )
+QgsStringMap QgsAuthOAuth2Config::mappedOAuth2ConfigsCache( QObject *parent, const QString &extradir )
 {
   QgsStringMap configs;
   bool ok = false;

diff --git a/src/auth/oauth2/qgsauthoauth2edit.cpp b/src/auth/oauth2/qgsauthoauth2edit.cpp
@@ -18,6 +18,7 @@
 #include <QDir>
 #include <QFileDialog>
 
+#include "qgsapplication.h"
 #include "qgsauthguiutils.h"
 #include "qgsauthmanager.h"
 #include "qgsauthconfigedit.h"
@@ -752,7 +753,7 @@ void QgsAuthOAuth2Edit::exportOAuthConfig()
   settings.setValue( QStringLiteral( "UI/lastAuthSaveFileDir" ), QFileInfo( configpath ).absoluteDir().path() );
 
   // give it a kind of random id for re-importing
-  mOAuthConfigCustom->setId( QgsAuthManager::instance()->uniqueConfigId() );
+  mOAuthConfigCustom->setId( QgsApplication::authManager()->uniqueConfigId() );
 
   mOAuthConfigCustom->setQueryPairs( queryPairs() );
 

diff --git a/src/auth/oauth2/qgsauthoauth2method.cpp b/src/auth/oauth2/qgsauthoauth2method.cpp
@@ -499,7 +499,7 @@ QgsO2 *QgsAuthOAuth2Method::getOAuth2Bundle( const QString &authcfg, bool fullco
 
   // else build oauth2 config
   QgsAuthMethodConfig mconfig;
-  if ( !QgsAuthManager::instance()->loadAuthenticationConfig( authcfg, mconfig, fullconfig ) )
+  if ( !QgsApplication::authManager()->loadAuthenticationConfig( authcfg, mconfig, fullconfig ) )
   {
     QgsDebugMsg( QStringLiteral( "Retrieve config FAILED for authcfg: %1" ).arg( authcfg ) );
     config->deleteLater();
@@ -637,7 +637,8 @@ QGISEXTERN QgsAuthOAuth2Method *classFactory()
   return new QgsAuthOAuth2Method();
 }
 
-/** Required key function (used to map the plugin to a data store type)
+/**
+ * Required key function (used to map the plugin to a data store type)
  */
 QGISEXTERN QString authMethodKey()
 {

diff --git a/tests/src/auth/testqgsauthoauth2method.cpp b/tests/src/auth/testqgsauthoauth2method.cpp
@@ -30,7 +30,8 @@
 #include "qgsauthoauth2config.h"
 
 
-/** \ingroup UnitTests
+/**
+ * \ingroup UnitTests
  * Unit tests for QgsAuthOAuth2Config
  */
 class TestQgsAuthOAuth2Method: public QObject