Merge lp:~stolowski/ubuntuone-credentials/get-consumer-key-15-04 into lp:ubuntuone-credentials/touch-15-04

[Paweł Stołowski]

Added Token::consumerKey() getter.

Added Token::consumerKey() getter.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:198
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-touch-15-04-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-touch-15-04-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-touch-15-04-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-touch-15-04-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-touch-15-04-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-touch-15-04-ci/1/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/ubuntuone-credentials/get-consumer-key-15-04]

199. By Paweł Stołowski on 2015-05-27

Updated changelog

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-06 13:32:36 +0000
+++ CMakeLists.txt	2015-05-27 15:13:07 +0000
@@ -2,7 +2,7 @@
 
 # This is the name and release version of the project
 PROJECT (ubuntuone-credentials)
-SET (PROJECT_VERSION 14.04)
+SET (PROJECT_VERSION 15.04)
 
 include(GNUInstallDirs)
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-01 17:53:57 +0000
+++ debian/changelog	2015-05-27 15:13:07 +0000
@@ -1,3 +1,9 @@
+ubuntuone-credentials (15.04+15.04.20150527) UNRELEASED; urgency=medium
+
+  * Added Token::consumerKey() getter.
+
+ -- Pawel Stolowski <[e-mail]>  Mon, 27 May 2015 16:38:11 +0200
+
 ubuntuone-credentials (14.04+15.04.20150401) vivid; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'debian/libubuntuoneauth-2.0-0.symbols'
--- debian/libubuntuoneauth-2.0-0.symbols	2015-01-20 15:34:22 +0000
+++ debian/libubuntuoneauth-2.0-0.symbols	2015-05-27 15:13:07 +0000
@@ -111,6 +111,7 @@
  (c++)"UbuntuOne::Token::Token(QString, QString, QString, QString)@Base" 13.08
  (c++)"UbuntuOne::Token::Token(QString, QString, QString, QString, QString, QString)@Base" 14.04+14.10.20140908
  (c++)"UbuntuOne::Token::~Token()@Base" 13.08
+ (c++)"UbuntuOne::Token::consumerKey() const@Base" 0replaceme
  (c++)"UbuntuOne::Token::created() const@Base" 14.04+14.10.20140818
  (c++)"UbuntuOne::Token::updated() const@Base" 14.04+14.10.20140818
  (c++)"UbuntuOne::Keyring::storeToken(UbuntuOne::Token)@Base" 13.08

=== modified file 'libubuntuoneauth/tests/test_token.cpp'
--- libubuntuoneauth/tests/test_token.cpp	2014-09-09 13:53:07 +0000
+++ libubuntuoneauth/tests/test_token.cpp	2015-05-27 15:13:07 +0000
@@ -44,6 +44,20 @@
     delete token;
 }
 
+void TestConsumerKey()
+{
+    Token token("a", "b", "c", "d");
+    QString expected("c");
+    QCOMPARE(token.consumerKey(), expected);
+}
+
+void TestConsumerKeyOfEmptyToken()
+{
+    Token token;
+    QVERIFY(!token.isValid());
+    QCOMPARE(token.consumerKey(), QString(""));
+}
+
 void TestToken::testTokenCopy()
 {
     Token *old_token = new Token("a", "b", "c", "d");

=== modified file 'libubuntuoneauth/token.cpp'
--- libubuntuoneauth/token.cpp	2014-09-09 13:53:07 +0000
+++ libubuntuoneauth/token.cpp	2015-05-27 15:13:07 +0000
@@ -87,6 +87,16 @@
     }
 
     /**
+     * \fn QString Token::consumerKey()
+     *
+     * Retruns a consumer key for this token, or empty string if consumer key is not set.
+     */
+    QString Token::consumerKey() const
+    {
+        return _tokenHash.value(TOKEN_CONSUMER_KEY, "");
+    }
+
+    /**
      * \fn bool Token::isValid()
      *
      * Check that the token is valid.

=== modified file 'libubuntuoneauth/token.h'
--- libubuntuoneauth/token.h	2014-09-09 13:53:07 +0000
+++ libubuntuoneauth/token.h	2015-05-27 15:13:07 +0000
@@ -52,6 +52,8 @@
 
         static QString dateStringToISO(const QString date);
 
+        QString consumerKey() const;
+
     private:
         QHash<QString, QString> _tokenHash;
     };