From 77ccda89b029653ac0f4a9ae305e57bb046b7410 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Wed, 24 Oct 2012 11:02:08 +0300
Subject: [PATCH] Add variable URLs for credentials files

---
 libssu/ssu.cpp                    | 7 +++++++
 libssu/ssu.h                      | 4 ++++
 ssu-defaults.ini                  | 1 +
 ssuurlresolver/ssuurlresolver.cpp | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp
index ca72a14..89d5851 100644
--- a/libssu/ssu.cpp
+++ b/libssu/ssu.cpp
@@ -126,6 +126,13 @@ QString Ssu::credentialsScope(QString repoName, bool rndRepo){
     return "your-configuration-is-broken-and-does-not-contain-credentials-scope";
 }
 
+QString Ssu::credentialsUrl(QString scope){
+  if (settings->contains("credentials-url-" + scope))
+    return settings->value("credentials-url-" + scope).toString();
+  else
+    return "your-configuration-is-broken-and-does-not-contain-credentials-url-for-" + scope;
+}
+
 QString Ssu::deviceFamily(){
   QString model = deviceModel();
 
diff --git a/libssu/ssu.h b/libssu/ssu.h
index ae222da..503e4f8 100644
--- a/libssu/ssu.h
+++ b/libssu/ssu.h
@@ -36,6 +36,10 @@ class Ssu: public QObject {
      * @return a string containing the scope; it can be used to look up login credentials using  credentials()
      */
     QString credentialsScope(QString repoName, bool rndRepo=false);
+    /**
+     * Return the URL for which credentials scope is valid
+     */
+    QString credentialsUrl(QString scope);
     /**
      * Try to find the device family for the system this is running on
      */
diff --git a/ssu-defaults.ini b/ssu-defaults.ini
index 27019b7..706f829 100644
--- a/ssu-defaults.ini
+++ b/ssu-defaults.ini
@@ -14,3 +14,4 @@ credentials-scope=example
 
 [2]
 release=latest
+credentials-url-example=https://example.com
diff --git a/ssuurlresolver/ssuurlresolver.cpp b/ssuurlresolver/ssuurlresolver.cpp
index a7f1fb6..d213936 100644
--- a/ssuurlresolver/ssuurlresolver.cpp
+++ b/ssuurlresolver/ssuurlresolver.cpp
@@ -84,7 +84,7 @@ void SsuUrlResolver::run(){
       credentialsFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
       QTextStream out(&credentialsFile);
       QPair<QString, QString> credentials = ssu.credentials(credentialsScope);
-      out << "[ssu-credentials]\n";
+      out << "[" << ssu.credentialsUrl(credentialsScope) << "]\n";
       out << "username=" << credentials.first << "\n";
       out << "password=" << credentials.second << "\n";
       out.flush();