Browse Source
Merge branch 'dani-garcia:main' into main
pull/6388/head
Henning
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
16 additions and
12 deletions
-
src/api/core/accounts.rs
-
src/api/identity.rs
-
src/static/templates/admin/diagnostics.hbs
|
|
@ -1704,6 +1704,6 @@ pub async fn purge_auth_requests(pool: DbPool) { |
|
|
if let Ok(conn) = pool.get().await { |
|
|
if let Ok(conn) = pool.get().await { |
|
|
AuthRequest::purge_expired_auth_requests(&conn).await; |
|
|
AuthRequest::purge_expired_auth_requests(&conn).await; |
|
|
} else { |
|
|
} else { |
|
|
error!("Failed to get DB connection while purging trashed ciphers") |
|
|
error!("Failed to get DB connection while purging auth requests") |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
@ -482,14 +482,18 @@ async fn authenticated_response( |
|
|
Value::Null |
|
|
Value::Null |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
let account_keys = json!({ |
|
|
let account_keys = if user.private_key.is_some() { |
|
|
"publicKeyEncryptionKeyPair": { |
|
|
json!({ |
|
|
"wrappedPrivateKey": user.private_key, |
|
|
"publicKeyEncryptionKeyPair": { |
|
|
"publicKey": user.public_key, |
|
|
"wrappedPrivateKey": user.private_key, |
|
|
"Object": "publicKeyEncryptionKeyPair" |
|
|
"publicKey": user.public_key, |
|
|
}, |
|
|
"Object": "publicKeyEncryptionKeyPair" |
|
|
"Object": "privateKeys" |
|
|
}, |
|
|
}); |
|
|
"Object": "privateKeys" |
|
|
|
|
|
}) |
|
|
|
|
|
} else { |
|
|
|
|
|
Value::Null |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
let mut result = json!({ |
|
|
let mut result = json!({ |
|
|
"access_token": auth_tokens.access_token(), |
|
|
"access_token": auth_tokens.access_token(), |
|
|
|
|
|
@ -8,7 +8,7 @@ |
|
|
<dl class="row"> |
|
|
<dl class="row"> |
|
|
<dt class="col-sm-5">Server Installed |
|
|
<dt class="col-sm-5">Server Installed |
|
|
<span class="badge bg-success d-none abbr-badge" id="server-success" title="Latest version is installed.">Ok</span> |
|
|
<span class="badge bg-success d-none abbr-badge" id="server-success" title="Latest version is installed.">Ok</span> |
|
|
<span class="badge bg-warning text-dark d-none abbr-badge" id="server-warning" title="There seems to be an update available.">Update</span> |
|
|
<span class="badge bg-warning text-dark d-none abbr-badge" id="server-warning" title="An update is available.">Update</span> |
|
|
<span class="badge bg-info text-dark d-none abbr-badge" id="server-branch" title="This is a branched version.">Branched</span> |
|
|
<span class="badge bg-info text-dark d-none abbr-badge" id="server-branch" title="This is a branched version.">Branched</span> |
|
|
</dt> |
|
|
</dt> |
|
|
<dd class="col-sm-7"> |
|
|
<dd class="col-sm-7"> |
|
|
@ -23,8 +23,8 @@ |
|
|
{{#if page_data.web_vault_enabled}} |
|
|
{{#if page_data.web_vault_enabled}} |
|
|
<dt class="col-sm-5">Web Installed |
|
|
<dt class="col-sm-5">Web Installed |
|
|
<span class="badge bg-success d-none abbr-badge" id="web-success" title="Latest version is installed.">Ok</span> |
|
|
<span class="badge bg-success d-none abbr-badge" id="web-success" title="Latest version is installed.">Ok</span> |
|
|
<span class="badge bg-warning text-dark d-none abbr-badge" id="web-warning" title="There seems to be an update available.">Update</span> |
|
|
<span class="badge bg-warning text-dark d-none abbr-badge" id="web-warning" title="An update is available.">Update</span> |
|
|
<span class="badge bg-info text-dark d-none abbr-badge" id="web-prerelease" title="You seem to be using a pre-release version.">Pre-Release</span> |
|
|
<span class="badge bg-info text-dark d-none abbr-badge" id="web-prerelease" title="You are using a pre-release version.">Pre-Release</span> |
|
|
</dt> |
|
|
</dt> |
|
|
<dd class="col-sm-7"> |
|
|
<dd class="col-sm-7"> |
|
|
<span id="web-installed">{{page_data.active_web_release}}</span> |
|
|
<span id="web-installed">{{page_data.active_web_release}}</span> |
|
|
|
