Skip to content

Commit

Permalink
Added support to have user@domain as registration username
Browse files Browse the repository at this point in the history
Signed-off-by: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>
  • Loading branch information
Pekka Lundstrom committed Jan 16, 2013
1 parent e7832a7 commit f4c46c8
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion libssu/ssu.cpp
Expand Up @@ -470,10 +470,24 @@ void Ssu::requestFinished(QNetworkReply *reply){
emit done();
}

void Ssu::sendRegistration(QString username, QString password){
void Ssu::sendRegistration(QString usernameDomain, QString password){
errorFlag = false;

QString ssuCaCertificate, ssuRegisterUrl;
QString username, domain;

// Username can include also domain, (user@domain), separate those
if (usernameDomain.contains('@')) {
// separate domain/username and set domain
username = usernameDomain.section('@', 0, 0);
domain = usernameDomain.section('@', 1, 1);
setDomain(domain);
qDebug() << "got username:" << username << "at domain:" << domain;
} else {
// No domain defined
username = usernameDomain;
}

if (!settings->contains("ca-certificate")){
setError("CA certificate for SSU not set (config key 'ca-certificate')");
return;
Expand Down

0 comments on commit f4c46c8

Please sign in to comment.