refactor(credentials): use member function to change keychain key name.

Only valid for Windows.

Signed-off-by: Camila Ayres <[email protected]>

Author: camilasan

src/libsync/creds/keychainchunk.cpp

@@ -93,6 +93,15 @@ void Job::setAppName(const QString &appName)
     _appName = appName;
 }
 
+#ifdef Q_OS_WIN
+void Job::jobKeyPrependAppName(QString &key)
+{
+    // NOTE: The following is normally done in AbstractCredentials::keychainKey
+    //       when an _account is specified by our other ctr overload (see 'kck' in this file).
+    key.prepend(_appName + "_");
+}
+#endif
+
 /*
 * WriteJob
 */
@@ -112,7 +121,7 @@ WriteJob::WriteJob(const QString &key, const QByteArray &data, QObject *parent)
     : WriteJob(nullptr, key, data, parent)
 {
 #ifdef Q_OS_WIN
-    _key.prepend(_appName + "_");
+    jobKeyPrependAppName(_key);
 #endif
 }
 
@@ -233,7 +242,7 @@ ReadJob::ReadJob(const QString &key, QObject *parent)
     : ReadJob(nullptr, key, false, parent)
 {
 #ifdef Q_OS_WIN
-    _key.prepend(_appName + "_");
+    jobKeyPrependAppName(_key);
 #endif
 }
 
@@ -366,7 +375,7 @@ DeleteJob::DeleteJob(const QString &key, QObject *parent)
     : DeleteJob(nullptr, key, false, parent)
 {
 #ifdef Q_OS_WIN
-    _key.prepend(_appName + "_");
+    jobKeyPrependAppName(_key);
 #endif
 }
 

src/libsync/creds/keychainchunk.h

@@ -70,6 +70,18 @@ class OWNCLOUDSYNC_EXPORT Job : public QObject
      */
     void setAppName(const QString &AppName);
 
+#ifdef Q_OS_WIN
+    /**
+     * On Windows the credential keys aren't namespaced properly
+     * by qtkeychain. To work around that we manually add namespacing
+     * to the generated keys. See #6125.
+     * It's safe to do that since the key format is changing for 2.4
+     * anyway to include the account ids. That means old keys can be
+     * migrated to new namespaced keys on windows for 2.4. 
+     */
+    void jobKeyPrependAppName(QString &key);
+#endif
+
 protected:
     QString _serviceName;
     Account *_account = nullptr;