mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-15 06:52:04 +00:00
Merge branch 'v143/sso' into release/v1.43.0
# Conflicts: # docs/api/openapi.yaml # src/__tests__/contract-stub-inventory.test.ts
This commit is contained in:
commit
5c039a220b
39 files changed
+2649
-365
No files matched your search
@@ -110,6 +110,18 @@ export function ManagedProfileHandover({
|
||||
name: profileName,
|
||||
})}
|
||||
</p>
|
||||
{/* v1.43 — how the person will get in, when it is not only a password
|
||||
they set themselves (the description already implies that one). */}
|
||||
{status.data.available && status.data.methods?.includes("sso") ? (
|
||||
<p className="text-sm" data-slot="managed-profile-handover-methods">
|
||||
{t(
|
||||
status.data.methods.includes("password")
|
||||
? "recordSharing.managed.handover.methodBoth"
|
||||
: "recordSharing.managed.handover.methodSso",
|
||||
{ name: profileName },
|
||||
)}
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
{!status.data.available ? (
|
||||
<>
|
||||
|
||||
Reference in new issue
Block a user