Merge branch 'master' into develop1044ImplementTOTPFromQRCode

mooltipass · May 13, 2024 · 5982884 · 5982884
2 parents 93ca4fc + c187a04
commit 5982884
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/scripts/ci/osx/install.sh b/scripts/ci/osx/install.sh
@@ -7,8 +7,8 @@ brew install jq lftp
 brew uninstall wget
 brew install wget
 echo "Current PATH: $PATH"
-pip3 install --upgrade pip
-pip3 install aqtinstall -t /Users/travis/aqt
+pip3 install --break-system-packages --upgrade pip
+pip3 install --break-system-packages aqtinstall -t /Users/travis/aqt
 export PYTHONPATH=$PYTHONPATH:/Users/travis/aqt
 /Users/travis/aqt/bin/aqt install-qt mac desktop 6.2.4 clang_64 -m all -O /Users/travis/Qt
 networksetup -setv6off Ethernet
diff --git a/src/MPDevice.cpp b/src/MPDevice.cpp
@@ -7827,8 +7827,15 @@ void MPDevice::setMMCredentials(const QJsonArray &creds, bool noDelete,
             int keyAfterLogin = 0;
             int keyAfterPwd = 0;
             QString multipleDomains = "";
+            QString servicePwd = service;
             if (isBLE())
             {
+                multipleDomains = qjobject["multiple_domains"].toString();
+                // For multiple domain we need the add the first domain to service name for password save
+                if (!multipleDomains.isEmpty())
+                {
+                    servicePwd += Common::getFirstDomain(multipleDomains);
+                }
                 category = qjobject["category"].toInt();
                 keyAfterLogin = qjobject["key_after_login"].toInt();
                 keyAfterPwd = qjobject["key_after_pwd"].toInt();
@@ -7842,20 +7849,13 @@ void MPDevice::setMMCredentials(const QJsonArray &creds, bool noDelete,
 
                     if (!totpObject["totp_secret_key"].toString().isEmpty())
                     {
-                        bleImpl->createTOTPCredMessage(service, login, qjobject["totp"].toObject());
+                        bleImpl->createTOTPCredMessage(servicePwd, login, qjobject["totp"].toObject());
                     }
                 }
                 QJsonArray pointedToAddr = qjobject["pointed_to_child"].toArray();
                 for (qint32 j = 0; j < pointedToAddr.size(); j++) { pointedToAddrArray.append(pointedToAddr[j].toInt()); }
-
-                multipleDomains = qjobject["multiple_domains"].toString();
-            }
-            QString servicePwd = service;
-            // For multiple domain we need the add the first domain to service name for password save
-            if (!multipleDomains.isEmpty())
-            {
-                servicePwd += Common::getFirstDomain(multipleDomains);
             }
+
             for (qint32 j = 0; j < addrArray.size(); j++) { nodeAddr.append(addrArray[j].toInt()); }
             qDebug() << "MMM Save: tackling " << login << " for service " << service << " at address " << nodeAddr.toHex();