Bugfix/account deployment via cmd fix initial setup #5320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #5320 +/- ##
==========================================
- Coverage 57.98% 57.97% -0.01%
==========================================
Files 141 141
Lines 18113 18116 +3
==========================================
Hits 10503 10503
- Misses 7610 7613 +3
|
allexzander
force-pushed
the
bugfix/account-deployment-via-cmd-fix-initial-setup
branch
from
22fad82 to
0305762
Compare
|
AppImage file: nextcloud-PR-5320-030576215904fca1bb91cef52de9c54bdb1c813c-x86_64.AppImage |
Signed-off-by: alex-z <[email protected]>
…setup command-line. Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
…nd-line. Signed-off-by: alex-z <[email protected]>
…t setup. Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
Signed-off-by: alex-z <[email protected]>
…s are passed. Signed-off-by: alex-z <[email protected]>
allexzander
force-pushed
the
bugfix/account-deployment-via-cmd-fix-initial-setup
branch
from
0305762 to
ac1abb2
Compare
|
SonarCloud Quality Gate failed. |
claucambra
reviewed
Feb 20, 2023
|
|
||
| /// Sets account id if not set (call only before adding it to the AccountManager) | ||
| void setIdForAccount(OCC::Account *a); |
There was a problem hiding this comment.
Suggested change
| void setIdForAccount(OCC::Account *a); | |
| void setIdForAccount(OCC::Account *account); |
|
|
||
| const auto userIdParsed = QStringLiteral("%1@%2").arg(userIdSplit.first()).arg(_serverUrl.host()); | ||
|
|
||
| if (AccountManager::instance()->accountFromUserId(QStringLiteral("%1@%2").arg(_userId).arg(_serverUrl.host())) || AccountManager::instance()->accountFromUserId(userIdParsed)) { |
There was a problem hiding this comment.
nitpick: a little more readable (and safe, not that it's likely to matter)
Suggested change
| if (AccountManager::instance()->accountFromUserId(QStringLiteral("%1@%2").arg(_userId).arg(_serverUrl.host())) || AccountManager::instance()->accountFromUserId(userIdParsed)) { | |
| if (const auto accManager = AccountManager::instance(); | |
| accManager->accountFromUserId(QStringLiteral("%1@%2").arg(_userId).arg(_serverUrl.host())) || | |
| accManager->accountFromUserId(userIdParsed)) { |
| } | ||
| } | ||
|
|
||
| void AccountSetupFromCommandLineJob::accountCredentialsWriteJoobDone() |
There was a problem hiding this comment.
Suggested change
| void AccountSetupFromCommandLineJob::accountCredentialsWriteJoobDone() | |
| void AccountSetupFromCommandLineJob::accountCredentialsWriteJobDone() |
| @@ -203,7 +203,7 @@ bool CredentialsStub::stillValid(QNetworkReply * /*reply*/) | |||
| return false; | |||
| } | |||
|
|
|||
| void CredentialsStub::persist() { } | |||
| void CredentialsStub::persist(bool saveAccount) { Q_UNUSED(saveAccount) } | |||
There was a problem hiding this comment.
Suggested change
| void CredentialsStub::persist(bool saveAccount) { Q_UNUSED(saveAccount) } | |
| void CredentialsStub::persist(const bool saveAccount) { Q_UNUSED(saveAccount) } |
|
Why we never merged this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.