Do the right thing, avoid raw json string when preparing the configuration

Author: nirvn

src/core/qfieldcloudconnection.cpp

@@ -579,49 +579,31 @@ void QFieldCloudConnection::setAuthenticationToken( QNetworkRequest &request )
     if ( mProviderConfigId.isEmpty() && mAvailableProviders.contains( mProvider ) )
     {
       const QVariantMap providerDetails = mAvailableProviders[mProvider].details();
-      const QVariantMap providerExtraTokens = providerDetails.value( "extra_tokens" ).toMap();
-      QStringList extraTokens;
-      for ( const QString &key : providerExtraTokens.keys() )
-      {
-        extraTokens << QStringLiteral( "\"%1\":\"%2\"" ).arg( key, providerExtraTokens.value( key ).toString() );
-      }
+
+      QVariantMap configMap;
+      configMap["accessMethod"] = 0;
+      configMap["clientId"] = providerDetails.value( "client_id" ).toString();
+      configMap["clientSecret"] = providerDetails.value( "client_secret" ).toString();
+      configMap["configType"] = 1;
+      configMap["description"] = QString( "Connection details for QFieldCloud using %1 provider" ).arg( mProvider );
+      configMap["extraTokens"] = providerDetails.value( "extra_tokens" ).toMap();
+      configMap["grantFlow"] = 0;
+      configMap["name"] = QString( "Autogenerated by QField" );
+      configMap["persistToken"] = true;
+      configMap["redirectHost"] = QString( "localhost" );
+      configMap["redirectPort"] = 7070;
+      configMap["refreshTokenUrl"] = providerDetails.value( "refresh_token_url" ).toString();
+      configMap["requestTimeout"] = 30;
+      configMap["requestUrl"] = providerDetails.value( "request_url" ).toString();
+      configMap["scope"] = providerDetails.value( "scope" ).toString();
+      configMap["tokenUrl"] = providerDetails.value( "token_url" ).toString();
+      configMap["version"] = 1;
+      QJsonDocument json = QJsonDocument::fromVariant( configMap );
 
       QgsAuthMethodConfig config;
       config.setName( "qfieldcloud-sso" );
       config.setMethod( "OAuth2" );
-      config.setConfig( "oauth2config", QStringLiteral( "{\"accessMethod\":0,"
-                                                        " \"apiKey\":null,"
-                                                        " \"clientId\":\"%1\","
-                                                        " \"clientSecret\":\"%2\","
-                                                        " \"configType\":1,"
-                                                        " \"customHeader\":null,"
-                                                        " \"description\":\"\","
-                                                        " \"grantFlow\":0,"
-                                                        " \"id\":null,"
-                                                        " \"name\":null,"
-                                                        " \"objectName\":\"\","
-                                                        " \"password\":null,"
-                                                        " \"persistToken\":true,"
-                                                        " \"queryPairs\":{\"1\":\"1\"},"
-                                                        " \"redirectHost\":\"localhost\","
-                                                        " \"redirectPort\":7070,"
-                                                        " \"redirectUrl\":null,"
-                                                        " \"requestUrl\":\"%3\","
-                                                        " \"tokenUrl\":\"%4\","
-                                                        " \"refreshTokenUrl\":\"%5\","
-                                                        " \"scope\":\"%6\","
-                                                        " \"extraTokens\":{%7},"
-                                                        " \"requestTimeout\":30,"
-                                                        " \"username\":null,"
-                                                        " \"version\":1"
-                                                        "}" )
-                                          .arg( providerDetails.value( "client_id" ).toString(),
-                                                providerDetails.value( "client_secret" ).toString(),
-                                                providerDetails.value( "request_url" ).toString(),
-                                                providerDetails.value( "token_url" ).toString(),
-                                                providerDetails.value( "refresh_token_url" ).toString(),
-                                                providerDetails.value( "scope" ).toString(),
-                                                extraTokens.join( ',' ) ) );
+      config.setConfig( "oauth2config", json.toJson() );
       QgsApplication::instance()->authManager()->storeAuthenticationConfig( config, true );
 
       mProviderConfigId = config.id();