Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(sso): harden sign-in, linking and provider requests (#3686)

Hampus6434bdfb9126
diff --git a/fluxer_admin/openapi-admin.json b/fluxer_admin/openapi-admin.json
index 1ec03a57c..831f24dc1 100644
--- a/fluxer_admin/openapi-admin.json
+++ b/fluxer_admin/openapi-admin.json
@@ -11388,7 +11388,7 @@
"content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
}
},
- "description": "Release every provider subject bound to the account. On an instance that stores email addresses, the next single sign-on with the same verified email binds the account again. A released subject of a deleted account can sign in to a new account. Creates audit log entry. Requires USER_UPDATE_EMAIL permission.",
+ "description": "Release every provider subject bound to the account and sign it out on every device. On an instance that stores email addresses, the next single sign-on with the same verified email binds the account again. A released subject of a deleted account can sign in to a new account. Creates audit log entry. Requires USER_UPDATE_EMAIL permission.",
"security": [{"adminApiKey": []}],
"parameters": [
{
@@ -16664,6 +16664,11 @@
"nullable": true,
"description": "Notice shown to everyone on the instance, or null",
"allOf": [{"$ref": "#/components/schemas/InstanceNoticeSchema"}]
+ },
+ "warnings": {
+ "type": "array",
+ "items": {"type": "string"},
+ "description": "Problems the save found that did not stop it. Always empty outside a save response"
}
},
"required": [
@@ -16685,7 +16690,8 @@
"integrations",
"media",
"billing",
- "notice"
+ "notice",
+ "warnings"
],
"additionalProperties": false
},
@@ -16953,6 +16959,10 @@
"required": ["group", "role_id"]
},
"description": "Groups whose members get a role in the single community. Every listed role is managed by single sign-on, and is added or removed to match the groups at each sign-in"
+ },
+ "migrate_identities": {
+ "description": "Only for a save that changes the issuer while accounts are linked to the old one. True moves those links to the new issuer, false leaves them on the old one. Applies to this save only and is never stored",
+ "type": "boolean"
}
}
},
@@ -25033,6 +25043,7 @@
"INSTANCE_POLICY_TRANSITION_NOT_ALLOWED",
"SLOWMODE_RATE_LIMITED",
"SEARCH_INDEX_NOT_READY",
+ "SSO_PROVIDER_UNAVAILABLE",
"SSO_REQUIRED",
"STORE_BILLING_UNAVAILABLE",
"STORE_NOTIFICATION_UNAUTHORIZED",
@@ -25397,6 +25408,7 @@
"This instance policy change is not allowed.",
"Slowmode rate limited.",
"The search index isn't ready yet. Try again in a moment.",
+ "Your sign-in provider didn't answer. Try again in a moment.",
"{reason, select, managed_credentials {This instance requires single sign-on, so your SSO provider manages your email and password.} no_account {This instance only lets existing accounts sign in with SSO, and there's no account for you yet. Ask an admin of this instance for access.} managed_username {This instance requires single sign-on, so your username comes from your SSO provider.} other {This instance requires single sign-on. Sign in with the SSO button on the sign-in page.}}",
"In-app purchases are unavailable right now. Try again later.",
"The notification signature is invalid.",
diff --git a/fluxer_admin/src/api/types/instance_config.rs b/fluxer_admin/src/api/types/instance_config.rs
index feb4afe02..885d517cb 100644
--- a/fluxer_admin/src/api/types/instance_config.rs
+++ b/fluxer_admin/src/api/types/instance_config.rs
@@ -56,6 +56,8 @@ pub struct InstanceConfigResponse {
pub guild_visits: GuildVisitsConfigResponse,
#[serde(default)]
pub notice: Option<InstanceNoticeResponse>,
+ #[serde(default)]
+ pub warnings: Vec<String>,
}
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
@@ -1238,6 +1240,8 @@ pub struct SsoConfigUpdateRequest {
pub groups_claim: Option<Option<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub group_role_mappings: Option<Vec<SsoGroupRoleMapping>>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub migrate_identities: Option<bool>,
}
#[derive(Clone, Debug, Default, Serialize)]
diff --git a/fluxer_admin/src/routes/system_actions.rs b/fluxer_admin/src/routes/system_actions.rs
index b8b71b6d2..6aa9fc8cd 100644
--- a/fluxer_admin/src/routes/system_actions.rs
+++ b/fluxer_admin/src/routes/system_actions.rs
@@ -278,11 +278,16 @@ pub async fn instance_config_post(
if matches!(feedback, UpdateFeedback::Premium | UpdateFeedback::Billing) {
remember_premium_branding(&state, &result);
}
- match feedback {
+ let warnings = result
+ .as_ref()
+ .map(|saved| saved.warnings.clone())
+ .unwrap_or_default();
+ let flash = match feedback {
UpdateFeedback::Field(api_path, field) => field_result(result, api_path, field),
UpdateFeedback::Billing => super::billing_actions::billing_result(result),
UpdateFeedback::Standard | UpdateFeedback::Premium => instance_config_result(result),
- }
+ };
+ with_save_warnings(flash, &warnings)
};
state.forget_instance_settings();
instance_config_response(config, &headers, flash)
@@ -328,6 +333,13 @@ fn with_api_reason(summary: &str, error: &crate::api::client::ApiError) -> Strin
}
}
+fn with_save_warnings(flash: FlashData, warnings: &[String]) -> FlashData {
+ if warnings.is_empty() {
+ return flash;
+ }
+ FlashData::info(format!("Instance config updated. {}", warnings.join(" ")))
+}
+
fn instance_config_result<T>(result: Result<T, crate::api::client::ApiError>) -> FlashData {
match result {
Ok(_) => FlashData::success("Instance config updated"),
@@ -537,3 +549,19 @@ fn build_media_update(form: &MultiValueForm) -> InstanceConfigUpdateRequest {
..Default::default()
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn a_save_with_warnings_shows_them_instead_of_plain_success() {
+ let warnings = vec!["Couldn't connect to the sign-in provider.".to_owned()];
+ let flash = with_save_warnings(FlashData::success("Instance config updated"), &warnings);
+ assert_eq!(flash.flash_type, "info");
+ assert_eq!(
+ flash.message,
+ "Instance config updated. Couldn't connect to the sign-in provider."
+ );
+ }
+}
diff --git a/fluxer_admin/src/routes/system_actions/sso.rs b/fluxer_admin/src/routes/system_actions/sso.rs
index b602ace4a..1dda794ac 100644
--- a/fluxer_admin/src/routes/system_actions/sso.rs
+++ b/fluxer_admin/src/routes/system_actions/sso.rs
@@ -72,6 +72,11 @@ pub(super) fn build_sso_update(
.first("sso_group_role_mappings")
.map(parse_sso_group_role_mappings)
.transpose()?,
+ migrate_identities: match form.clean("sso_migrate_identities").as_deref() {
+ Some("move") => Some(true),
+ Some("leave") => Some(false),
+ _ => None,
+ },
}),
..Default::default()
})
diff --git a/fluxer_admin/src/templates/pages/instance_config/sso.rs b/fluxer_admin/src/templates/pages/instance_config/sso.rs
index 87897dc5d..ba62c6fc8 100644
--- a/fluxer_admin/src/templates/pages/instance_config/sso.rs
+++ b/fluxer_admin/src/templates/pages/instance_config/sso.rs
@@ -4,9 +4,10 @@ use crate::templates::pages::instance_config::ConfigForm;
use crate::{
api::types::{AccountIdentityMode, SsoConfigResponse},
templates::components::{
+ alert::{AlertVariant, alert},
form::{
- Checkbox, FORM_INPUT_CLASS, form_actions, form_field_group, submit_button, text_input,
- textarea_input,
+ Checkbox, FORM_INPUT_CLASS, form_actions, form_field_group, select_input,
+ submit_button, text_input, textarea_input,
},
section_card::section_card_with_description,
},
@@ -48,6 +49,13 @@ pub(super) fn sso_config_section(
form method="post" action={(base) "/instance-config?action=update_sso"} {
(config_form.fields())
div class="space-y-6" {
+ @if sso.enabled && sso.issuer.as_deref().is_none_or(|issuer| issuer.trim().is_empty()) {
+ (alert(
+ AlertVariant::Warning,
+ Some("SSO is off until you add an issuer."),
+ html! { "Fill in Issuer below, or run rexctl config set sso.issuer <issuer URL> on the server." },
+ ))
+ }
div class="flex flex-col gap-2" {
(Checkbox {
name: "sso_enabled",
@@ -63,6 +71,9 @@ pub(super) fn sso_config_section(
checked: sso.enforced,
enabled: true,
}.render())
+ p class="text-xs text-neutral-500" {
+ "If your provider is down, run rexctl admins sign-in-link <admin> on the server to get in."
+ }
(Checkbox {
name: "sso_auto_provision",
value: "true",
@@ -70,6 +81,9 @@ pub(super) fn sso_config_section(
checked: sso.auto_provision,
enabled: true,
}.render())
+ p class="text-xs text-neutral-500" {
+ "New people get an account even when registration is closed, and still wait for approval if accounts need it. Limit who gets in at your provider or with Allowed Email Domains."
+ }
(Checkbox {
name: "sso_username_from_provider",
value: "true",
@@ -86,10 +100,28 @@ pub(super) fn sso_config_section(
}
}
div class="grid grid-cols-1 gap-4 sm:grid-cols-2" {
- (text_input("sso_display_name", "Display Name", sso.display_name.as_deref().unwrap_or(""), "Example Identity Provider"))
- (text_input("sso_issuer", "Issuer", sso.issuer.as_deref().unwrap_or(""), "https://idp.example.com"))
+ (form_field_group("Issuer", "sso_issuer", true, None,
+ Some("The issuer URL of your sign-in provider. For Microsoft Entra, use https://login.microsoftonline.com/<tenant>/v2.0, not /common."),
+ html! {
+ input type="text" id="sso_issuer" name="sso_issuer"
+ value=(sso.issuer.as_deref().unwrap_or(""))
+ placeholder="https://idp.example.com"
+ class=(FORM_INPUT_CLASS);
+ },
+ ))
+ div class="space-y-2" {
+ (select_input("sso_migrate_identities", "SSO Links When the Issuer Changes", &[
+ ("", "Don't save if accounts are linked"),
+ ("move", "Move them to the new issuer"),
+ ("leave", "Leave them on the old issuer"),
+ ], ""))
+ p class="text-xs text-neutral-500" {
+ "Only used for this save. Move them when it's the same provider at a new address. Leave them when it's a different provider."
+ }
+ }
}
div class="grid grid-cols-1 gap-4 sm:grid-cols-2" {
+ (text_input("sso_display_name", "Display Name", sso.display_name.as_deref().unwrap_or(""), "Example Identity Provider"))
(form_field_group("Button Text", "sso_button_label", false, None,
Some("Shown on the sign-in button. Leave empty to use \"Continue with\" and the display name, or \"Continue with SSO\" if there's no display name."),
html! {
@@ -158,7 +190,7 @@ pub(super) fn sso_config_section(
p class="text-xs text-neutral-500" {
"Only used in single-community mode. Write one mapping per line, as the group name the provider sends, \"=\" and the ID of a role in the single community. \
At every SSO sign-in, members get each listed role whose group they are in and lose each listed role whose group they left. \
- Roles not listed here are never changed. If the provider sends no groups claim, roles stay as they are. \
+ Roles not listed here are never changed. If the provider sends no groups claim, members lose every listed role. Keycloak leaves the claim out when someone is in no groups. \
Leave the claim empty to use \"groups\"."
}
}
diff --git a/fluxer_api/pkgs/http_client/src/HttpClientRequestInternals.ts b/fluxer_api/pkgs/http_client/src/HttpClientRequestInternals.ts
index a1e40ed52..d8467a550 100644
--- a/fluxer_api/pkgs/http_client/src/HttpClientRequestInternals.ts
+++ b/fluxer_api/pkgs/http_client/src/HttpClientRequestInternals.ts
@@ -105,7 +105,7 @@ export function resolveRequestBody(body: unknown, headers: Headers): string | un
export function createRequestSignal(timeoutMs: number, inputSignal?: AbortSignal): RequestSignalContext {
const controller = new AbortController();
const timeoutId = setTimeout(() => {
- controller.abort('Request timed out');
+ controller.abort(new DOMException('Request timed out', 'TimeoutError'));
}, timeoutMs);
timeoutId.unref();
let inputSubscription: Disposable | undefined;
@@ -126,7 +126,7 @@ export function createRequestSignal(timeoutMs: number, inputSignal?: AbortSignal
export function classifyRequestError(error: unknown): ClassifiedRequestError {
const message = error instanceof Error ? error.message : 'Request failed';
- if (error instanceof Error && error.name === 'AbortError') {
+ if (error instanceof Error && (error.name === 'AbortError' || error.name === 'TimeoutError')) {
return {
message,
isNetworkError: false,
diff --git a/fluxer_api/pkgs/http_client/src/HttpError.ts b/fluxer_api/pkgs/http_client/src/HttpError.ts
index 683852aab..56bac69ae 100644
--- a/fluxer_api/pkgs/http_client/src/HttpError.ts
+++ b/fluxer_api/pkgs/http_client/src/HttpError.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-export type HttpErrorType = 'aborted' | 'network_error' | 'unknown';
+export type HttpErrorType = 'aborted' | 'blocked' | 'network_error' | 'unresolvable_host' | 'unknown';
export class HttpError extends Error {
constructor(
diff --git a/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts b/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts
index 322965f98..86a8b0215 100644
--- a/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts
+++ b/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts
@@ -12,7 +12,7 @@ import type {
RequestUrlPolicy,
RequestUrlValidationContext,
} from '@pkgs/http_client/src/HttpClientTypes';
-import {HttpError} from '@pkgs/http_client/src/HttpError';
+import {HttpError, type HttpErrorType} from '@pkgs/http_client/src/HttpError';
import {Agent, Dispatcher1Wrapper} from 'undici';
const DEFAULT_DNS_CACHE_TTL_MS = 60000;
@@ -146,9 +146,14 @@ function getPolicyErrorContext(context: RequestUrlValidationContext): string {
return 'initial request';
}
-function createBlockedRequestError(url: URL, context: RequestUrlValidationContext, reason: string): HttpError {
+function createBlockedRequestError(
+ url: URL,
+ context: RequestUrlValidationContext,
+ reason: string,
+ errorType: HttpErrorType = 'blocked',
+): HttpError {
const message = `Blocked outbound ${getPolicyErrorContext(context)} to ${formatUrlForDiagnostics(url)}: ${reason}`;
- return new HttpError(message, undefined, undefined, true, 'network_error');
+ return new HttpError(message, undefined, undefined, true, errorType);
}
async function defaultLookupHost(hostname: string): Promise<Array<string>> {
@@ -246,9 +251,12 @@ export function createPublicInternetRequestUrlPolicy(
if (!isFqdnHostname(normalizedHostname) && !(allowPrivateAddresses && isSingleLabelHostname(normalizedHostname))) {
throw createBlockedRequestError(url, context, 'Hostname is not a valid FQDN');
}
- const resolvedAddresses = await resolveHostname(normalizedHostname);
+ const resolvedAddresses = await resolveHostname(normalizedHostname).catch((error: unknown) => {
+ const reason = error instanceof Error ? error.message : String(error);
+ throw createBlockedRequestError(url, context, `Hostname lookup failed: ${reason}`, 'unresolvable_host');
+ });
if (resolvedAddresses.length === 0) {
- throw createBlockedRequestError(url, context, 'Hostname resolved to no IP addresses');
+ throw createBlockedRequestError(url, context, 'Hostname resolved to no IP addresses', 'unresolvable_host');
}
if (allowPrivateAddresses) {
return;
diff --git a/fluxer_api/pkgs/http_client/src/__tests__/HttpClient.test.ts b/fluxer_api/pkgs/http_client/src/__tests__/HttpClient.test.ts
index df9c485a4..967199154 100644
--- a/fluxer_api/pkgs/http_client/src/__tests__/HttpClient.test.ts
+++ b/fluxer_api/pkgs/http_client/src/__tests__/HttpClient.test.ts
@@ -18,6 +18,13 @@ describe('HttpClient', () => {
await redirectServer.close();
});
describe('sendRequest', () => {
+ it('reports a request that runs out of time as aborted', async () => {
+ const client = createHttpClient(TEST_USER_AGENT);
+ testServer.setHandler(() => {});
+ const failure = await client.sendRequest({url: testServer.url, timeout: 50}).catch((error: unknown) => error);
+ expect(failure).toBeInstanceOf(HttpError);
+ expect(failure).toMatchObject({errorType: 'aborted', message: 'Request timed out'});
+ });
describe('redirects', () => {
it('strips sensitive headers on cross-origin redirects', async () => {
const client = createHttpClient(TEST_USER_AGENT);
diff --git a/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts b/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts
index ad21212be..a8211e608 100644
--- a/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts
+++ b/fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts
@@ -3,9 +3,13 @@
import {isDeepStrictEqual} from 'node:util';
import {AdminAuditReadActions} from '@app/api/admin/AdminAuditActions';
import {recordAdminRead, recordAdminWrite} from '@app/api/admin/AdminAuditRecorder';
+import {migrateSsoIdentities} from '@app/api/admin/controllers/SsoIdentityAdminController';
import {startAttachmentDecayReconcile} from '@app/api/attachment/AttachmentDecayReconcileRun';
import {maybeAutoJoinInvite} from '@app/api/auth/AuthRegistration';
-import {ssoDiscoveryCacheKey} from '@app/api/auth/services/SsoService';
+import {ssoProviderIdOf} from '@app/api/auth/services/SsoIdentityLinks';
+import {SsoIdentityRepository} from '@app/api/auth/services/SsoIdentityRepository';
+import {legacySsoDiscoveryCacheKey, ssoDiscoveryCacheKey} from '@app/api/auth/services/SsoService';
+import {tryDiscoverOidcProviderMetadata} from '@app/api/auth/services/SsoUtils';
import {createGuildID, createInviteCode, createUserID} from '@app/api/BrandedTypes';
import {loadSigningKey} from '@app/api/bluesky/BlueskyOAuthService';
import {Config} from '@app/api/Config';
@@ -17,6 +21,7 @@ import {
type InstanceConfigRepository,
type InstanceIntegrationsConfigPatch,
type InstancePolicyConfig,
+ type InstanceSsoConfig,
REGISTRATION_PENDING_APPROVAL_TRAIT,
REGISTRATION_REJECTED_TRAIT,
type SsoGroupRoleMapping,
@@ -152,6 +157,32 @@ async function readSavedSmtpConfig(): Promise<StoredEmailSmtpConfig> {
return (await getInstanceConfigRepository().getInstanceIntegrationsConfig()).email.smtp;
}
+type SsoProviderKey = Pick<InstanceSsoConfig, 'issuer' | 'authorizationUrl'>;
+
+async function isSameSsoProvider(current: SsoProviderKey, next: SsoProviderKey): Promise<boolean> {
+ const withoutTrailingSlash = (id: string) => id.replace(/\/+$/, '');
+ if (withoutTrailingSlash(ssoProviderIdOf(current)) === withoutTrailingSlash(ssoProviderIdOf(next))) return true;
+ if (current.issuer || !current.authorizationUrl || !next.issuer) return false;
+ const discovered = await tryDiscoverOidcProviderMetadata(next.issuer);
+ return discovered?.authorization_endpoint === current.authorizationUrl;
+}
+
+async function shouldMoveSsoIdentities(
+ current: SsoProviderKey,
+ next: SsoProviderKey,
+ choice: boolean | undefined,
+): Promise<boolean> {
+ const fromProviderId = ssoProviderIdOf(current);
+ if (!next.issuer || fromProviderId === ssoProviderIdOf(next)) return false;
+ const linked = (await new SsoIdentityRepository().listForProvider(fromProviderId)).length;
+ if (linked === 0) return false;
+ if (choice !== undefined) return choice;
+ if (await isSameSsoProvider(current, next)) return true;
+ throw InputValidationError.fromCode('issuer', ValidationErrorCodes.SSO_ISSUER_CHANGE_HAS_IDENTITIES, {
+ count: linked,
+ });
+}
+
async function validateSsoGroupRoleMappings(
mappings: Array<{group: string; role_id: string}> | undefined,
): Promise<Array<SsoGroupRoleMapping> | undefined> {
@@ -187,7 +218,7 @@ function nonEmptyPatch<T extends object>(value: T | null | undefined): Partial<T
return Object.keys(patch).length > 0 ? patch : undefined;
}
-async function buildInstanceConfigResponse(): Promise<InstanceConfigResponse> {
+async function buildInstanceConfigResponse(warnings: Array<string> = []): Promise<InstanceConfigResponse> {
const instanceConfigRepository = getInstanceConfigRepository();
const [
ssoConfig,
@@ -306,6 +337,7 @@ async function buildInstanceConfigResponse(): Promise<InstanceConfigResponse> {
media,
billing,
notice,
+ warnings,
};
}
@@ -586,6 +618,7 @@ interface InstanceConfigUpdateContext {
readonly data: InstanceConfigUpdateRequest;
readonly instanceConfigRepository: InstanceConfigRepository;
readonly integrationsPatch: InstanceIntegrationsConfigPatch | null;
+ readonly warnings: Array<string>;
}
function createInstanceConfigSectionApplier<T extends object>(
@@ -677,7 +710,7 @@ const INSTANCE_CONFIG_SECTION_APPLIERS = {
),
sso: createInstanceConfigSectionApplier(
({data}) => data.sso,
- async (sso, {ctx, instanceConfigRepository}) => {
+ async (sso, {ctx, instanceConfigRepository, warnings}) => {
const suppliedButtonLabel = readOptionalField(sso, 'button_label');
const buttonLabel = suppliedButtonLabel === undefined ? undefined : normalizeSsoButtonLabel(suppliedButtonLabel);
const current = await instanceConfigRepository.getSsoConfig({includeSecret: true});
@@ -698,6 +731,11 @@ const INSTANCE_CONFIG_SECTION_APPLIERS = {
const validated = await normalizeAndValidateSsoConfig(next, {
testModeEnabled: Config.dev.testModeEnabled,
});
+ const moveIdentities = await shouldMoveSsoIdentities(
+ current,
+ validated,
+ readOptionalField(sso, 'migrate_identities'),
+ );
const supplied = <T>(field: keyof typeof sso, value: T): T | undefined =>
readOptionalField(sso, field) === undefined ? undefined : value;
await instanceConfigRepository.setSsoConfig({
@@ -719,8 +757,18 @@ const INSTANCE_CONFIG_SECTION_APPLIERS = {
groupsClaim: readOptionalField(sso, 'groups_claim'),
groupRoleMappings: await validateSsoGroupRoleMappings(readOptionalField(sso, 'group_role_mappings')),
});
+ if (moveIdentities) {
+ await migrateSsoIdentities(ctx, ssoProviderIdOf(current), ssoProviderIdOf(validated));
+ }
for (const issuer of new Set([current.issuer, validated.issuer])) {
- if (issuer) await ctx.get('cacheService').delete(ssoDiscoveryCacheKey(issuer));
+ if (!issuer) continue;
+ await ctx.get('cacheService').delete(ssoDiscoveryCacheKey(issuer));
+ await ctx.get('cacheService').delete(legacySsoDiscoveryCacheKey(issuer));
+ }
+ if (validated.providerUnreachable) {
+ warnings.push(
+ "Couldn't connect to the sign-in provider at its issuer URL. The SSO button stays hidden until the provider answers.",
+ );
}
},
),
@@ -920,7 +968,8 @@ export function InstanceConfigAdminController(app: HonoApp) {
const integrationsPatch = toIntegrationsPatch(data.integrations, await readSavedSmtpConfig());
await assertConsistentInstanceConfig(data, integrationsPatch);
await assertValidBlueskyKeys(integrationsPatch);
- const updateContext = {ctx, data, instanceConfigRepository, integrationsPatch};
+ const warnings: Array<string> = [];
+ const updateContext = {ctx, data, instanceConfigRepository, integrationsPatch, warnings};
for (const applySection of Object.values(INSTANCE_CONFIG_SECTION_APPLIERS)) {
const pendingUpdate = applySection(updateContext);
if (pendingUpdate) await pendingUpdate;
@@ -933,7 +982,7 @@ export function InstanceConfigAdminController(app: HonoApp) {
sections: listSuppliedSections(data),
},
});
- return ctx.json(await buildInstanceConfigResponse());
+ return ctx.json(await buildInstanceConfigResponse(warnings));
},
);
app.post(
diff --git a/fluxer_api/src/api/admin/controllers/SsoIdentityAdminController.ts b/fluxer_api/src/api/admin/controllers/SsoIdentityAdminController.ts
index 2c15ebe3a..3bad0605a 100644
--- a/fluxer_api/src/api/admin/controllers/SsoIdentityAdminController.ts
+++ b/fluxer_api/src/api/admin/controllers/SsoIdentityAdminController.ts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {AdminAuditReadActions} from '@app/api/admin/AdminAuditActions';
-import {recordAdminRead} from '@app/api/admin/AdminAuditRecorder';
+import {recordAdminRead, recordAdminWrite} from '@app/api/admin/AdminAuditRecorder';
+import {revokeAllAuthSessions} from '@app/api/auth/AuthSessionRevocation';
import {SsoIdentityLinkService, ssoProviderIdOf} from '@app/api/auth/services/SsoIdentityLinks';
import {SsoIdentityRepository} from '@app/api/auth/services/SsoIdentityRepository';
import {createUserID} from '@app/api/BrandedTypes';
@@ -11,7 +12,7 @@ import {RateLimitMiddleware} from '@app/api/middleware/RateLimitMiddleware';
import {OpenAPI} from '@app/api/middleware/ResponseTypeMiddleware';
import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
import {RateLimitConfigs} from '@app/api/RateLimitConfig';
-import type {HonoApp} from '@app/api/types/HonoEnv';
+import type {HonoApp, HonoEnv} from '@app/api/types/HonoEnv';
import {Validator} from '@app/api/Validator';
import {AdminACLs} from '@fluxer/constants/src/AdminACLs';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
@@ -25,6 +26,7 @@ import {
AdminUserSsoIdentityListResponse,
} from '@fluxer/schema/src/domains/admin/AdminSsoSchemas';
import {UserIdParam} from '@fluxer/schema/src/domains/common/CommonParamSchemas';
+import type {Context} from 'hono';
const ssoIdentityRepository = new SsoIdentityRepository();
@@ -41,6 +43,26 @@ async function currentProviderId(): Promise<string> {
return ssoProviderIdOf(await getInstanceConfigRepository().getSsoConfig());
}
+export async function migrateSsoIdentities(
+ ctx: Context<HonoEnv>,
+ fromProviderId: string,
+ toProviderId: string,
+): Promise<{moved: number; skipped: number}> {
+ const result = await new SsoIdentityLinkService(ctx.get('userRepository')).migrate(fromProviderId, toProviderId);
+ await recordAdminWrite(ctx, {
+ targetType: 'instance_config',
+ targetId: 0n,
+ action: 'migrate_sso_identities',
+ metadata: {
+ from_provider_id: fromProviderId,
+ to_provider_id: toProviderId,
+ moved_count: result.moved,
+ skipped_count: result.skipped,
+ },
+ });
+ return result;
+}
+
export function SsoIdentityAdminController(app: HonoApp) {
app.get(
'/admin/users/:user_id/sso-identities',
@@ -146,7 +168,7 @@ export function SsoIdentityAdminController(app: HonoApp) {
security: 'adminApiKey',
tags: 'Admin',
description:
- 'Release every provider subject bound to the account. On an instance that stores email addresses, the next single sign-on with the same verified email binds the account again. A released subject of a deleted account can sign in to a new account. Creates audit log entry. Requires USER_UPDATE_EMAIL permission.',
+ 'Release every provider subject bound to the account and sign it out on every device. On an instance that stores email addresses, the next single sign-on with the same verified email binds the account again. A released subject of a deleted account can sign in to a new account. Creates audit log entry. Requires USER_UPDATE_EMAIL permission.',
}),
async (ctx) => {
const userId = createUserID(ctx.req.valid('param').user_id);
@@ -164,6 +186,7 @@ export function SsoIdentityAdminController(app: HonoApp) {
auditLogReason: ctx.get('auditLogReason'),
metadata: new Map([['identity_count', before.length.toString()]]),
});
+ await revokeAllAuthSessions(ctx.get('apiContext').services, userId);
return ctx.json({sso_identities: identities.map(mapSsoIdentity)});
},
);
@@ -188,23 +211,7 @@ export function SsoIdentityAdminController(app: HonoApp) {
if (fromProviderId === toProviderId) {
throw InputValidationError.create('from_provider_id', 'This is the provider in use');
}
- const {moved, skipped} = await new SsoIdentityLinkService(ctx.get('userRepository')).migrate(
- fromProviderId,
- toProviderId,
- );
- await ctx.get('adminService').auditService.createAuditLog({
- adminUserId: ctx.get('adminUserId'),
- targetType: 'instance_config',
- targetId: 0n,
- action: 'migrate_sso_identities',
- auditLogReason: ctx.get('auditLogReason'),
- metadata: new Map([
- ['from_provider_id', fromProviderId],
- ['to_provider_id', toProviderId],
- ['moved_count', moved.toString()],
- ['skipped_count', skipped.toString()],
- ]),
- });
+ const {moved, skipped} = await migrateSsoIdentities(ctx, fromProviderId, toProviderId);
return ctx.json({to_provider_id: toProviderId, moved_count: moved, skipped_count: skipped});
},
);
diff --git a/fluxer_api/src/api/admin/services/AdminUserSecurityService.ts b/fluxer_api/src/api/admin/services/AdminUserSecurityService.ts
index a5ed68261..ec3907eae 100644
--- a/fluxer_api/src/api/admin/services/AdminUserSecurityService.ts
+++ b/fluxer_api/src/api/admin/services/AdminUserSecurityService.ts
@@ -599,16 +599,18 @@ export class AdminUserSecurityService {
app: AdminSessionApp;
deletedAt: Date | null;
}> = [
- ...activeSessions.map((s) => ({
- sessionIdHash: s.sessionIdHash,
- createdAt: s.createdAt,
- approximateLastUsedAt: s.approximateLastUsedAt,
- clientIp: s.clientIp,
- clientUserAgent: s.clientUserAgent,
- clientOs: s.clientOs ?? null,
- app: sessionApp(s),
- deletedAt: null as Date | null,
- })),
+ ...activeSessions
+ .filter((s) => !s.isExpiredSsoSession())
+ .map((s) => ({
+ sessionIdHash: s.sessionIdHash,
+ createdAt: s.createdAt,
+ approximateLastUsedAt: s.approximateLastUsedAt,
+ clientIp: s.clientIp,
+ clientUserAgent: s.clientUserAgent,
+ clientOs: s.clientOs ?? null,
+ app: sessionApp(s),
+ deletedAt: null as Date | null,
+ })),
...tombstones.map((t) => ({
sessionIdHash: t.sessionIdHash,
createdAt: t.createdAt,
diff --git a/fluxer_api/src/api/admin/tests/SsoDiscoveryCache.test.ts b/fluxer_api/src/api/admin/tests/SsoDiscoveryCache.test.ts
index b0de897f3..050b78b1b 100644
--- a/fluxer_api/src/api/admin/tests/SsoDiscoveryCache.test.ts
+++ b/fluxer_api/src/api/admin/tests/SsoDiscoveryCache.test.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {ssoDiscoveryCacheKey} from '@app/api/auth/services/SsoService';
+import {legacySsoDiscoveryCacheKey, ssoDiscoveryCacheKey} from '@app/api/auth/services/SsoService';
import {createTestAccount, setUserACLs, type TestAccount} from '@app/api/auth/tests/AuthTestUtils';
import {getCacheService} from '@app/api/middleware/ServiceSingletons';
import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
@@ -49,6 +49,15 @@ describe('SSO provider discovery cache', () => {
expect(await cachedFor(NEW_ISSUER)).toBeNull();
});
+ it('forgets the entries older servers wrote for the issuer when the SSO settings are saved', async () => {
+ await saveSso({enabled: false, issuer: OLD_ISSUER});
+ await getCacheService().set(legacySsoDiscoveryCacheKey(OLD_ISSUER), {issuer: OLD_ISSUER}, 3600);
+
+ await saveSso({client_id: 'another-client'});
+
+ expect(await getCacheService().get(legacySsoDiscoveryCacheKey(OLD_ISSUER))).toBeNull();
+ });
+
it('forgets the discovered endpoints when other SSO settings change', async () => {
await saveSso({enabled: false, issuer: OLD_ISSUER});
await getCacheService().set(ssoDiscoveryCacheKey(OLD_ISSUER), {issuer: OLD_ISSUER}, 3600);
diff --git a/fluxer_api/src/api/admin/tests/SsoIdentityAdmin.test.ts b/fluxer_api/src/api/admin/tests/SsoIdentityAdmin.test.ts
index cf8c1576b..35a1479e3 100644
--- a/fluxer_api/src/api/admin/tests/SsoIdentityAdmin.test.ts
+++ b/fluxer_api/src/api/admin/tests/SsoIdentityAdmin.test.ts
@@ -50,7 +50,7 @@ describe('SSO identity admin routes', () => {
await disableSso(harness, admin.token);
await createBuilder(harness, admin.token)
.patch('/admin/instance/config')
- .body({sso: {issuer: null}})
+ .body({sso: {issuer: null, migrate_identities: false}})
.execute();
getConfig().instance.selfHosted = originalSelfHosted;
getInstanceConfigRepository().clearCacheForTesting();
@@ -69,14 +69,14 @@ describe('SSO identity admin routes', () => {
return {
expect(status: number, code?: string) {
return {
- async execute(): Promise<{user_id: string}> {
- const start = await createBuilderWithoutAuth<{state: string}>(harness)
+ async execute(): Promise<{user_id: string; token: string}> {
+ const start = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
.post('/auth/sso/start')
.body({})
.execute();
- return createBuilderWithoutAuth<{user_id: string}>(harness)
+ return createBuilderWithoutAuth<{user_id: string; token: string}>(harness)
.post('/auth/sso/complete')
- .body({code: JSON.stringify(claims), state: start.state})
+ .body({code: JSON.stringify(claims), state: start.state, client_binding: start.client_binding})
.expect(status, code)
.execute();
},
@@ -86,7 +86,10 @@ describe('SSO identity admin routes', () => {
}
async function setIssuer(issuer: string): Promise<void> {
- await createBuilder(harness, admin.token).patch('/admin/instance/config').body({sso: {issuer}}).execute();
+ await createBuilder(harness, admin.token)
+ .patch('/admin/instance/config')
+ .body({sso: {issuer, migrate_identities: false}})
+ .execute();
}
async function listIdentities(userId: string) {
@@ -177,13 +180,20 @@ describe('SSO identity admin routes', () => {
});
describe('after the issuer changes', () => {
- it('refuses the old account until the subjects are moved, then signs it in', async () => {
+ it('links the account again by email when the subjects stay on the old issuer', async () => {
+ await setIssuer('test-old');
+ const email = createUniqueEmail('sso-admin-relink');
+ const userId = await signInWithSso(`itest-admin-sso-relink-old-${Date.now()}`, email);
+ await setIssuer('test-new');
+ expect(await signInWithSso(`itest-admin-sso-relink-new-${Date.now()}`, email)).toBe(userId);
+ });
+
+ it('moves the subjects to the new issuer, then signs the account in', async () => {
await setIssuer('test-old');
const sub = `itest-admin-sso-move-${Date.now()}`;
const email = createUniqueEmail('sso-admin-move');
const userId = await signInWithSso(sub, email);
await setIssuer('test-new');
- await completeSso(sub, email).expect(400, 'INVALID_FORM_BODY').execute();
const moved = await migrate('test-old').expect(200).execute();
expect(moved).toEqual({to_provider_id: 'test-new', moved_count: 1, skipped_count: 0});
expect(await signInWithSso(sub, email)).toBe(userId);
@@ -242,6 +252,14 @@ describe('SSO identity admin routes', () => {
expect(await listIdentities(userId)).toEqual([{provider_id: 'test', subject: after}]);
});
+ it('signs the account out when it unbinds it', async () => {
+ const login = await completeSso(`itest-admin-sso-signout-${Date.now()}`, createUniqueEmail('sso-admin-signout'))
+ .expect(200)
+ .execute();
+ await unlink(login.user_id).expect(200).execute();
+ await createBuilder(harness, login.token).get('/users/@me').expect(401).execute();
+ });
+
it('requires the email update permission to bind or unbind', async () => {
const viewer = await setUserACLs(harness, await createTestAccount(harness), [
AdminACLs.AUTHENTICATE,
diff --git a/fluxer_api/src/api/auth/AuthController.ts b/fluxer_api/src/api/auth/AuthController.ts
index 10fef56b4..ea5ff1477 100644
--- a/fluxer_api/src/api/auth/AuthController.ts
+++ b/fluxer_api/src/api/auth/AuthController.ts
@@ -157,7 +157,7 @@ export function AuthController(app: HonoApp) {
security: [],
tags: ['Auth'],
description:
- 'Complete the SSO authentication flow with the authorization code from the SSO provider. Returns authentication token and user information.',
+ 'Complete the SSO authentication flow with the authorization code from the SSO provider. Returns authentication token and user information, or linked when the flow was started from account settings.',
}),
async (ctx) => {
const result = await ctx
diff --git a/fluxer_api/src/api/auth/AuthLogin.ts b/fluxer_api/src/api/auth/AuthLogin.ts
index d6c70821b..60a9683fe 100644
--- a/fluxer_api/src/api/auth/AuthLogin.ts
+++ b/fluxer_api/src/api/auth/AuthLogin.ts
@@ -517,8 +517,9 @@ export async function createLoginSession(
ctx: ApiContext,
user: User,
request: Request,
+ authMethod?: 'sso',
): Promise<[token: string, AuthSessionModel]> {
- return AuthSession.createAuthSession(ctx, {user, origin: AuthSession.resolveSessionOrigin(ctx, request)});
+ return AuthSession.createAuthSession(ctx, {user, origin: AuthSession.resolveSessionOrigin(ctx, request), authMethod});
}
export async function completeMfaLogin(
@@ -529,7 +530,10 @@ export async function completeMfaLogin(
ssoLinks: SsoPendingLinks,
): Promise<[token: string, AuthSessionModel]> {
const {cache, rateLimit} = ctx.services;
- const sessionUser = await ssoLinks.completePendingLink(await applyPendingRecovery(ctx, user, ticket), ticket);
+ const {user: sessionUser, authMethod} = await ssoLinks.completePendingLink(
+ await applyPendingRecovery(ctx, user, ticket),
+ ticket,
+ );
if (await cache.get<boolean>(mfaTicketNetworkKey(ticket))) {
await cache.delete(mfaTicketNetworkKey(ticket));
await ctx.services.users.createAuthorizedIp(
@@ -540,7 +544,7 @@ export async function completeMfaLogin(
await cache.delete(`mfa-ticket:${ticket}`);
await rateLimit.resetLimit(`mfa:ticket:${ticket}`);
await rateLimit.resetLimit(`mfa:user:${user.id}`);
- const session = await createLoginSession(ctx, sessionUser, request);
+ const session = await createLoginSession(ctx, sessionUser, request, authMethod);
emitLogin(sessionUser, true, {mfa: true});
return session;
}
diff --git a/fluxer_api/src/api/auth/AuthMfa.ts b/fluxer_api/src/api/auth/AuthMfa.ts
index 06ed54077..0fef9c0b3 100644
--- a/fluxer_api/src/api/auth/AuthMfa.ts
+++ b/fluxer_api/src/api/auth/AuthMfa.ts
@@ -653,7 +653,7 @@ export async function getAvailableMfaMethods(ctx: ApiContext, userId: UserID): P
}
const credentials = await users.listWebAuthnCredentials(userId);
const hasPasskeyCredentials = credentials.length > 0;
- const methods = deriveSudoMethods(user, hasPasskeyCredentials, await hasUnconsumedBackupCodes(ctx, userId));
+ const methods = deriveSudoMethods(user, hasPasskeyCredentials, await hasUnconsumedBackupCodes(ctx, userId), false);
return {
totp: methods.totp,
webauthn: methods.webauthn,
diff --git a/fluxer_api/src/api/auth/AuthRequestService.ts b/fluxer_api/src/api/auth/AuthRequestService.ts
index 9b2e441e1..3a1f08c0b 100644
--- a/fluxer_api/src/api/auth/AuthRequestService.ts
+++ b/fluxer_api/src/api/auth/AuthRequestService.ts
@@ -174,7 +174,14 @@ export class AuthRequestService {
completeSso(data: SsoCompleteRequest, request: Request, requestCache: RequestCache, clientIp: string) {
return this.toSsoCompleteResponse(
- this.ssoService.completeLogin({code: data.code, state: data.state, request, requestCache, clientIp}),
+ this.ssoService.completeLogin({
+ code: data.code,
+ state: data.state,
+ clientBinding: data.client_binding ?? undefined,
+ request,
+ requestCache,
+ clientIp,
+ }),
);
}
@@ -524,6 +531,9 @@ export class AuthRequestService {
resultPromise: ReturnType<SsoService['completeLogin']>,
): Promise<SsoCompleteResponse> {
const {redirect_to, ...result} = await resultPromise;
+ if ('linked' in result) {
+ return {linked: true, redirect_to};
+ }
return {...(await this.toAuthLoginResponse(result)), redirect_to};
}
diff --git a/fluxer_api/src/api/auth/AuthSession.ts b/fluxer_api/src/api/auth/AuthSession.ts
index 0cb6389d5..172cfc473 100644
--- a/fluxer_api/src/api/auth/AuthSession.ts
+++ b/fluxer_api/src/api/auth/AuthSession.ts
@@ -38,6 +38,8 @@ export interface SessionOrigin {
interface CreateAuthSessionParams {
user: User;
origin: SessionOrigin;
+ authMethod?: 'sso';
+ signedInAt?: Date;
}
interface LogoutAuthSessionsParams {
@@ -80,7 +82,7 @@ export function resolveSessionOrigin(ctx: ApiContext, request: Request): Session
export async function createAuthSession(
ctx: ApiContext,
- {user, origin}: CreateAuthSessionParams,
+ {user, origin, authMethod, signedInAt}: CreateAuthSessionParams,
): Promise<[token: string, AuthSession]> {
const {users} = ctx.services;
if (user.isBot) throw new BotUserAuthSessionCreationDeniedError();
@@ -101,7 +103,7 @@ export async function createAuthSession(
const authSession = await users.createAuthSession({
user_id: user.id,
session_id_hash: Buffer.from(AuthUtility.getTokenIdHash(ctx, token)),
- created_at: now,
+ created_at: signedInAt ?? now,
approx_last_used_at: now,
client_ip: origin.ip,
client_user_agent: origin.userAgent,
@@ -112,11 +114,16 @@ export async function createAuthSession(
app_release_channel: null,
app_build_number: null,
app_beta_number: null,
+ auth_method: authMethod ?? null,
version: 1,
});
return [token, authSession];
}
+function sameSsoSignIn(session: AuthSession): Pick<CreateAuthSessionParams, 'authMethod' | 'signedInAt'> {
+ return session.authMethod === 'sso' ? {authMethod: 'sso', signedInAt: session.createdAt} : {};
+}
+
export async function createAdditionalAuthSessionFromToken(
ctx: ApiContext,
{token, expectedUserId, origin}: CreateAdditionalAuthSessionFromTokenParams,
@@ -133,13 +140,17 @@ export async function createAdditionalAuthSessionFromToken(
if (expectedUserId && user.id.toString() !== expectedUserId) {
throw new SessionTokenMismatchError();
}
- const [newToken] = await createAuthSession(ctx, {user, origin});
+ const [newToken] = await createAuthSession(ctx, {user, origin, ...sameSsoSignIn(existingSession)});
return {token: newToken, userId: user.id.toString()};
}
export async function getAuthSessionByToken(ctx: ApiContext, token: string): Promise<AuthSession | null> {
- const {users} = ctx.services;
- return users.getAuthSessionByToken(Buffer.from(AuthUtility.getTokenIdHash(ctx, token)));
+ const session = await ctx.services.users.getAuthSessionByToken(Buffer.from(AuthUtility.getTokenIdHash(ctx, token)));
+ if (!session?.isExpiredSsoSession()) return session;
+ void deleteAndTerminateAuthSessions(ctx, session.userId, [session]).catch((error: unknown) => {
+ Logger.warn({error, userId: session.userId}, 'Failed to revoke an expired SSO session');
+ });
+ return null;
}
export async function getAuthSessions(
@@ -148,7 +159,7 @@ export async function getAuthSessions(
currentSessionIdHash?: Uint8Array,
): Promise<Array<AuthSessionResponse>> {
const {users} = ctx.services;
- const authSessions = await users.listAuthSessions(userId);
+ const authSessions = (await users.listAuthSessions(userId)).filter((session) => !session.isExpiredSsoSession());
return await mapAuthSessionsToResponse({authSessions, currentSessionIdHash});
}
@@ -196,7 +207,11 @@ export async function replaceCurrentAuthSession(
(authSession) => !authSession.sessionIdHash.equals(currentAuthSession.sessionIdHash),
);
await deleteAndTerminateAuthSessions(ctx, user.id, otherAuthSessions);
- const [newToken, newAuthSession] = await createAuthSession(ctx, {user, origin: resolveSessionOrigin(ctx, request)});
+ const [newToken, newAuthSession] = await createAuthSession(ctx, {
+ user,
+ origin: resolveSessionOrigin(ctx, request),
+ ...sameSsoSignIn(currentAuthSession),
+ });
const newAuthSessionIdHash = encodeSessionIdHash(newAuthSession.sessionIdHash);
await deleteAndTerminateAuthSessions(ctx, user.id, [currentAuthSession]);
await dispatchAuthSessionChange(ctx, {
diff --git a/fluxer_api/src/api/auth/services/SsoIdentityLinks.ts b/fluxer_api/src/api/auth/services/SsoIdentityLinks.ts
index 2af580303..f7d9f339f 100644
--- a/fluxer_api/src/api/auth/services/SsoIdentityLinks.ts
+++ b/fluxer_api/src/api/auth/services/SsoIdentityLinks.ts
@@ -22,9 +22,16 @@ export function ssoIdentityTrait(providerId: string, sub: string): string {
return `sso_identity:${digest}`;
}
+function ssoProviderTrait(providerId: string): string {
+ return `sso_provider:${createHash('sha256').update(providerId).digest('hex').slice(0, 32)}`;
+}
+
+export function isLinkedToSsoProvider(user: User, providerId: string): boolean {
+ return user.traits.has(`sso:${providerId}`) || user.traits.has(ssoProviderTrait(providerId));
+}
+
export function ssoIdentityTraits(providerId: string, sub: string): Array<string> {
- const providerDigest = createHash('sha256').update(providerId).digest('hex').slice(0, 32);
- return [UserTraits.SSO, `sso:${providerId}`, `sso_provider:${providerDigest}`, ssoIdentityTrait(providerId, sub)];
+ return [UserTraits.SSO, `sso:${providerId}`, ssoProviderTrait(providerId), ssoIdentityTrait(providerId, sub)];
}
function withoutSsoIdentityTraits(traits: Iterable<string>): Set<string> {
diff --git a/fluxer_api/src/api/auth/services/SsoService.ts b/fluxer_api/src/api/auth/services/SsoService.ts
index 74cf95644..62e28897c 100644
--- a/fluxer_api/src/api/auth/services/SsoService.ts
+++ b/fluxer_api/src/api/auth/services/SsoService.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {createHash, randomBytes} from 'node:crypto';
+import {createHash, randomBytes, timingSafeEqual} from 'node:crypto';
import type {ApiContext} from '@app/api/ApiContext';
import {createMfaTicketResponse, type LoginMfaResult} from '@app/api/auth/AuthLogin';
import * as AuthMfa from '@app/api/auth/AuthMfa';
@@ -8,9 +8,16 @@ import {assertAccountCreationPastSetup, maybeAutoJoinInvite} from '@app/api/auth
import * as AuthSession from '@app/api/auth/AuthSession';
import * as AuthUtility from '@app/api/auth/AuthUtility';
import {assertEmailNotBlocklisted, isEmailBlocklisted} from '@app/api/auth/EmailBlocklist';
-import {ssoIdentityTrait, ssoIdentityTraits, ssoProviderIdOf} from '@app/api/auth/services/SsoIdentityLinks';
+import {
+ isLinkedToSsoProvider,
+ ssoIdentityTrait,
+ ssoIdentityTraits,
+ ssoProviderIdOf,
+} from '@app/api/auth/services/SsoIdentityLinks';
import {SsoIdentityRepository} from '@app/api/auth/services/SsoIdentityRepository';
import {
+ acceptedIssuers,
+ type DiscoveredOidcProviderMetadata,
parseTokenEndpointResponse,
sanitizeSsoRedirectTo,
tryDiscoverOidcProviderMetadata,
@@ -34,8 +41,8 @@ import {canJoinSingleCommunity, type SingleCommunityService} from '@app/api/inst
import {
deriveSsoRedirectUri,
getSsoRequestUrlPolicy,
+ isHttpsSsoUrl,
isTestSsoProvider,
- validateSsoPublicOutboundUrl,
} from '@app/api/instance/SsoConfigValidation';
import type {InviteService} from '@app/api/invite/InviteService';
import {Logger} from '@app/api/Logger';
@@ -51,7 +58,7 @@ import {
reserveUsername,
type UsernameReservation,
} from '@app/api/user/UniqueUsernames';
-import {isEnforcementDeletion, isProfileSubstringExempt} from '@app/api/user/UserHelpers';
+import {isEnforcementDeletion, isProfileSubstringExempt, isSignInRefused} from '@app/api/user/UserHelpers';
import {dispatchUserUpdate} from '@app/api/user/UserMappers';
import {renameUser} from '@app/api/user/UserRename';
import {USERNAME_MODE_DISCRIMINATOR} from '@app/api/user/UserTag';
@@ -67,6 +74,7 @@ import {SSO_MOBILE_CALLBACK_URI, SSO_MOBILE_STATE_PREFIX} from '@fluxer/constant
import {ProfileFieldPrivacyFlags, UserFlags} from '@fluxer/constants/src/UserConstants';
import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {RegistrationPendingApprovalError} from '@fluxer/errors/src/domains/auth/RegistrationPendingApprovalError';
+import {SsoProviderUnavailableError} from '@fluxer/errors/src/domains/auth/SsoProviderUnavailableError';
import {SsoRequiredError, SsoRequiredReasons} from '@fluxer/errors/src/domains/auth/SsoRequiredError';
import {ContentBlockedError} from '@fluxer/errors/src/domains/content/ContentBlockedError';
import {FeatureTemporarilyDisabledError} from '@fluxer/errors/src/domains/core/FeatureTemporarilyDisabledError';
@@ -74,11 +82,12 @@ import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidat
import type {LoggerInterface} from '@fluxer/logger/src/LoggerInterface';
import {EmailType} from '@fluxer/schema/src/primitives/UserValidators';
import {formatUrlForDiagnostics} from '@pkgs/http_client/src/HttpClientDiagnostics';
+import type {StreamResponse} from '@pkgs/http_client/src/HttpClientTypes';
+import {HttpError, type HttpErrorType} from '@pkgs/http_client/src/HttpError';
import {ms, seconds} from 'itty-time';
import {
type CryptoKey,
createLocalJWKSet,
- decodeJwt,
type FlattenedJWSInput,
errors as JoseErrors,
type JSONWebKeySet,
@@ -90,16 +99,31 @@ import {
interface SsoStatePayload {
codeVerifier: string;
nonce: string;
+ clientBindingHash?: string;
redirectTo?: string;
redirectUri?: string;
+ link?: SsoLinkRequest;
createdAt: number;
}
+interface SsoLinkRequest {
+ userId: string;
+ sessionIdHash: string;
+}
+
interface PendingSsoLink {
userId: string;
providerId: string;
subject: string;
groups: Array<string> | null;
+ claims: ResolvedSsoClaims;
+}
+
+interface LegacyPendingSsoLink {
+ userId: string;
+ providerId: string;
+ subject: string;
+ groups: Array<string> | null;
}
interface SsoSignIn {
@@ -108,7 +132,7 @@ interface SsoSignIn {
redirect_to: string;
}
-type SsoCompletion = SsoSignIn | (LoginMfaResult & {redirect_to: string});
+type SsoCompletion = SsoSignIn | (LoginMfaResult & {redirect_to: string}) | {linked: true; redirect_to: string};
interface PublicSsoStatus {
enabled: boolean;
@@ -126,6 +150,8 @@ interface ResolvedSsoConfig extends InstanceSsoConfig {
providerId: string;
isTestProvider: boolean;
issuerForVerification: string | null;
+ tokenEndpointAuthMethods: Array<string> | null;
+ discoveryFailed: boolean;
}
interface ResolvedSsoClaims {
@@ -135,6 +161,7 @@ interface ResolvedSsoClaims {
name: string | null;
sub: string;
groups: Array<string> | null;
+ groupsOverage: boolean;
}
interface RemoteJwkSetResolver {
@@ -146,14 +173,55 @@ interface RemoteJwkSetResolver {
jwks: () => JSONWebKeySet | undefined;
}
+interface DiscoveryCacheEntry {
+ metadata: DiscoveredOidcProviderMetadata | null;
+ fetchedAt: number;
+ failed: boolean;
+}
+
interface JwksCacheEntry {
jwks: RemoteJwkSetResolver;
cachedAt: number;
}
+type ClientAuthMethod = 'client_secret_basic' | 'client_secret_post';
+
+interface TokenEndpointError {
+ error: string | null;
+ description: string | null;
+}
+
+type TokenAttempt =
+ | {ok: true; tokens: {id_token?: string; access_token?: string}}
+ | {ok: false; status: number; error: TokenEndpointError};
+
const CODE_VERIFIER_BYTE_LENGTH = 32;
const STATE_BYTE_LENGTH = 16;
+const CLIENT_BINDING_BYTE_LENGTH = 32;
+const MOBILE_REQUIRES_CLIENT_BINDING = false;
+const MOBILE_REQUIRES_SSO_SECOND_FACTOR = false;
const NONCE_BYTE_LENGTH = 16;
+const DISCOVERY_CACHE_TTL_SECONDS = seconds('30 days');
+const DISCOVERY_FRESH_MS = ms('1 hour');
+const DISCOVERY_FAILURE_FRESH_MS = ms('1 minute');
+
+const TOKEN_ERROR_BODY_MAX_BYTES = 4 * 1024;
+const PROVIDER_ERROR_TEXT_MAX_LENGTH = 300;
+const MISCONFIGURED_CLIENT_ERRORS = new Set(['invalid_client', 'unauthorized_client']);
+const PROVIDER_UNAVAILABLE_ERROR_TYPES = new Set<HttpErrorType>(['aborted', 'network_error', 'unresolvable_host']);
+
+const discoveryRefreshes = new Map<string, Promise<DiscoveredOidcProviderMetadata | null>>();
+const jwksCache = new Map<string, JwksCacheEntry>();
+const jwksCreations = new Map<string, Promise<RemoteJwkSetResolver>>();
+const workingClientAuthMethods = new Map<string, ClientAuthMethod>();
+const MISSING_ISSUER_WARNING_INTERVAL_MS = ms('1 hour');
+let missingIssuerWarnedAt = 0;
+
+export function resetSsoProviderCachesForTests(): void {
+ jwksCache.clear();
+ jwksCreations.clear();
+ workingClientAuthMethods.clear();
+}
let ssoLogger: LoggerInterface | undefined;
@@ -174,13 +242,90 @@ function buildStateCacheKey(state: string): string {
return `sso:state:${state}`;
}
+function buildLinkStateCacheKey(state: string): string {
+ return `sso:link-state:${state}`;
+}
+
function pendingSsoLinkKey(ticket: string): string {
return `sso:pending-link:${ticket}`;
}
+function issuerCacheId(issuer: string): string {
+ return createHash('sha256').update(issuer).digest('hex').slice(0, 32);
+}
+
export function ssoDiscoveryCacheKey(issuer: string): string {
- const key = createHash('sha256').update(issuer).digest('hex').slice(0, 32);
- return `sso:oidc-discovery:${key}`;
+ return `sso:oidc-discovery:v2:${issuerCacheId(issuer)}`;
+}
+
+export function legacySsoDiscoveryCacheKey(issuer: string): string {
+ return `sso:oidc-discovery:${issuerCacheId(issuer)}`;
+}
+
+function isDiscoveryFresh(entry: DiscoveryCacheEntry): boolean {
+ return Date.now() - entry.fetchedAt < (entry.failed ? DISCOVERY_FAILURE_FRESH_MS : DISCOVERY_FRESH_MS);
+}
+
+function clientAuthMethodsToTry(tokenUrl: string, supported: Array<string> | null): Array<ClientAuthMethod> {
+ const basicFirst =
+ !supported?.length || (supported.includes('client_secret_basic') && !supported.includes('client_secret_post'));
+ const first = workingClientAuthMethods.get(tokenUrl) ?? (basicFirst ? 'client_secret_basic' : 'client_secret_post');
+ return [first, first === 'client_secret_post' ? 'client_secret_basic' : 'client_secret_post'];
+}
+
+async function sendProviderRequest(
+ request: Parameters<typeof FetchUtils.sendRequest>[0],
+): Promise<Awaited<ReturnType<typeof FetchUtils.sendRequest>>> {
+ try {
+ return await FetchUtils.sendRequest(request, {requestUrlPolicy: getSsoRequestUrlPolicy(), maxRedirects: 0});
+ } catch (error) {
+ getLogger().warn({url: formatUrlForDiagnostics(request.url), error}, 'SSO provider request failed');
+ if (error instanceof HttpError && error.errorType && PROVIDER_UNAVAILABLE_ERROR_TYPES.has(error.errorType)) {
+ throw new SsoProviderUnavailableError();
+ }
+ throw InputValidationError.fromCode('sso', ValidationErrorCodes.SSO_MISCONFIGURED);
+ }
+}
+
+function formEncode(value: string): string {
+ return new URLSearchParams({v: value}).toString().slice(2);
+}
+
+function basicAuthorization(clientId: string, clientSecret: string): string {
+ return `Basic ${Buffer.from(`${formEncode(clientId)}:${formEncode(clientSecret)}`).toString('base64')}`;
+}
+
+function providerErrorText(value: unknown): string | null {
+ return typeof value === 'string' ? value.slice(0, PROVIDER_ERROR_TEXT_MAX_LENGTH) : null;
+}
+
+function wwwAuthenticateError(header: string | null): string | null {
+ return providerErrorText(header?.match(/error="([^"]*)"/)?.[1]);
+}
+
+function isRefusedClient(attempt: TokenAttempt): boolean {
+ return !attempt.ok && (attempt.status === 400 || attempt.status === 401) && attempt.error.error !== 'invalid_grant';
+}
+
+function discoveredHttpsUrl(url: string | undefined): string | null {
+ return url && isHttpsSsoUrl(url) ? url : null;
+}
+
+function hashClientBinding(clientBinding: string): string {
+ return createHash('sha256').update(clientBinding).digest('base64url');
+}
+
+function isClientBindingValid(
+ state: string,
+ expectedHash: string | undefined,
+ clientBinding: string | undefined,
+): boolean {
+ if (clientBinding === undefined) {
+ return state.startsWith(SSO_MOBILE_STATE_PREFIX) && !MOBILE_REQUIRES_CLIENT_BINDING;
+ }
+ const actual = Buffer.from(hashClientBinding(clientBinding));
+ const expected = Buffer.from(expectedHash ?? '');
+ return actual.length === expected.length && timingSafeEqual(actual, expected);
}
function isMobileSsoRedirectUri(requestedRedirectUri: string | undefined, defaultRedirectUri: string): boolean {
@@ -255,6 +400,11 @@ function readGroupsClaim(
return value.filter((group): group is string => typeof group === 'string');
}
+function hasGroupsOverage(record: Record<string, unknown> | JWTPayload | null | undefined, key: string): boolean {
+ const claimNames = record?.['_claim_names'];
+ return record?.['hasgroups'] === true || (typeof claimNames === 'object' && claimNames !== null && key in claimNames);
+}
+
function parseTestProviderClaims(rawPayload: string, groupsClaim: string): ResolvedSsoClaims {
const parsed = rawPayload.trim().startsWith('{') ? parseJsonRecord(rawPayload) : null;
if (!parsed) {
@@ -266,6 +416,7 @@ function parseTestProviderClaims(rawPayload: string, groupsClaim: string): Resol
name: 'Test SSO User',
sub: normalizeSsoSubject(email),
groups: null,
+ groupsOverage: false,
};
}
const rawEmail = readStringClaim(parsed, 'email');
@@ -281,6 +432,7 @@ function parseTestProviderClaims(rawPayload: string, groupsClaim: string): Resol
name: readDisplayName(parsed),
sub: normalizeSsoSubject(sub),
groups: readGroupsClaim(parsed, groupsClaim),
+ groupsOverage: hasGroupsOverage(parsed, groupsClaim),
};
}
@@ -349,7 +501,50 @@ function resolveEmailVerified({
if (values.includes(false)) {
return false;
}
- return values.length > 0 && values.includes(true);
+ if (values.length === 0) {
+ return claims !== null && idTokenEmail === email && isEntraVerifiedDomainEmail(claims['xms_edov']);
+ }
+ return values.includes(true);
+}
+
+function isEntraVerifiedDomainEmail(value: unknown): boolean {
+ return value === 1 || value === '1' || coerceEmailVerified(value) === true;
+}
+
+async function readTokenError(resp: StreamResponse, url: string): Promise<TokenEndpointError> {
+ try {
+ const rawBody = await FetchUtils.streamToStringWithLimit(resp.stream, {
+ maxBytes: TOKEN_ERROR_BODY_MAX_BYTES,
+ headers: resp.headers,
+ url,
+ description: 'SSO token error response',
+ });
+ const parsed = parseJsonRecord(rawBody);
+ return {error: providerErrorText(parsed?.['error']), description: providerErrorText(parsed?.['error_description'])};
+ } catch {
+ return {error: null, description: null};
+ }
+}
+
+function claimsFromLegacyPendingLink(pending: LegacyPendingSsoLink): ResolvedSsoClaims {
+ return {
+ email: null,
+ emailVerified: false,
+ preferredUsername: null,
+ name: null,
+ sub: pending.subject,
+ groups: pending.groups,
+ groupsOverage: false,
+ };
+}
+
+function warnAboutMissingIssuer(): void {
+ const now = Date.now();
+ if (now - missingIssuerWarnedAt < MISSING_ISSUER_WARNING_INTERVAL_MS) return;
+ missingIssuerWarnedAt = now;
+ getLogger().warn(
+ 'SSO is turned on without an issuer and stays off until one is set with rexctl config set sso.issuer',
+ );
}
function isJsonWebKeySet(value: unknown): value is JSONWebKeySet {
@@ -360,9 +555,7 @@ function isJsonWebKeySet(value: unknown): value is JSONWebKeySet {
export class SsoService {
private static readonly STATE_TTL_SECONDS = seconds('10 minutes');
- private static readonly DISCOVERY_TTL_SECONDS = seconds('1 hour');
private static readonly JWKS_CACHE_TTL_MS = ms('1 hour');
- private readonly jwksCache = new Map<string, JwksCacheEntry>();
private readonly ssoIdentityRepository = new SsoIdentityRepository();
constructor(
@@ -379,11 +572,10 @@ export class SsoService {
async getPublicStatus(): Promise<PublicSsoStatus> {
const config = await this.getResolvedConfig();
- const enabled = config.enabled && config.ready;
return {
- enabled,
- enforced: enabled && config.enforced,
- username_from_provider: enabled && config.usernameFromProvider,
+ enabled: config.ready,
+ enforced: config.enabled && config.enforced,
+ username_from_provider: config.enabled && config.usernameFromProvider,
display_name: config.displayName ?? null,
button_label: config.buttonLabel,
redirect_uri: config.redirectUri,
@@ -391,27 +583,41 @@ export class SsoService {
}
async isEnforced(): Promise<boolean> {
- const config = await this.getResolvedConfig();
- return config.enabled && config.ready && config.enforced;
+ const stored = await this.instanceConfigRepository.getSsoConfig();
+ return stored.enabled && stored.enforced;
}
async managesUsernames(): Promise<boolean> {
- return this.takesUsernameFromProvider(await this.getResolvedConfig());
+ return this.takesUsernameFromProvider(await this.instanceConfigRepository.getSsoConfig());
}
- private async takesUsernameFromProvider(config: ResolvedSsoConfig): Promise<boolean> {
+ private async takesUsernameFromProvider(config: InstanceSsoConfig): Promise<boolean> {
return (
config.enabled &&
- config.ready &&
config.usernameFromProvider &&
(await this.instanceConfigRepository.getAccountIdentityMode()) === AccountIdentityModes.USERNAME
);
}
- async startLogin({redirectTo, redirectUri}: {redirectTo?: string; redirectUri?: string} = {}): Promise<{
+ async startLink(user: User, sessionIdHash: Buffer) {
+ return this.startLogin({
+ link: {userId: user.id.toString(), sessionIdHash: sessionIdHash.toString('base64url')},
+ });
+ }
+
+ async startLogin({
+ redirectTo,
+ redirectUri,
+ link,
+ }: {
+ redirectTo?: string;
+ redirectUri?: string;
+ link?: SsoLinkRequest;
+ } = {}): Promise<{
authorization_url: string;
state: string;
redirect_uri: string;
+ client_binding: string;
}> {
const config = await this.requireReadyConfig();
const isMobile = isMobileSsoRedirectUri(redirectUri, config.redirectUri);
@@ -419,15 +625,19 @@ export class SsoService {
const codeVerifier = randomBase64Url(CODE_VERIFIER_BYTE_LENGTH);
const codeChallenge = buildCodeChallenge(codeVerifier);
const nonce = randomBase64Url(NONCE_BYTE_LENGTH);
+ const clientBinding = randomBase64Url(CLIENT_BINDING_BYTE_LENGTH);
const statePayload: SsoStatePayload = {
codeVerifier,
nonce,
+ clientBindingHash: hashClientBinding(clientBinding),
redirectTo: sanitizeSsoRedirectTo(redirectTo),
redirectUri: config.redirectUri,
+ link,
createdAt: Date.now(),
};
const {cache} = this.apiContext.services;
- await cache.set(buildStateCacheKey(state), statePayload, SsoService.STATE_TTL_SECONDS);
+ const stateKey = link ? buildLinkStateCacheKey(state) : buildStateCacheKey(state);
+ await cache.set(stateKey, statePayload, SsoService.STATE_TTL_SECONDS);
const searchParams = new URLSearchParams({
response_type: 'code',
client_id: config.clientId ?? '',
@@ -453,26 +663,35 @@ export class SsoService {
throw new FeatureTemporarilyDisabledError();
}
}
- return {authorization_url: authorizationUrlString, state, redirect_uri: config.redirectUri};
+ return {
+ authorization_url: authorizationUrlString,
+ state,
+ redirect_uri: config.redirectUri,
+ client_binding: clientBinding,
+ };
}
async completeLogin({
code,
state,
+ clientBinding,
request,
requestCache,
clientIp,
}: {
code: string;
state: string;
+ clientBinding: string | undefined;
request: Request;
requestCache: RequestCache;
clientIp: string;
}): Promise<SsoCompletion> {
const config = await this.requireReadyConfig();
const {cache} = this.apiContext.services;
- const statePayload = await cache.getAndDelete<SsoStatePayload>(buildStateCacheKey(state));
- if (!statePayload) {
+ const statePayload =
+ (await cache.getAndDelete<SsoStatePayload>(buildStateCacheKey(state))) ??
+ (await cache.getAndDelete<SsoStatePayload>(buildLinkStateCacheKey(state)));
+ if (!statePayload || !isClientBindingValid(state, statePayload.clientBindingHash, clientBinding)) {
throw InputValidationError.fromCode('state', ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE);
}
const tokenResponse = await this.exchangeCode({
@@ -483,22 +702,23 @@ export class SsoService {
});
const claims = await this.resolveClaims(tokenResponse, config, statePayload.nonce);
const redirectTo = statePayload.redirectTo ?? '';
- const resolved = await this.resolveUserFromClaims(claims, config, requestCache, clientIp);
+ if (statePayload.link) {
+ await this.linkSignedInUser(statePayload.link, claims, config);
+ return {linked: true, redirect_to: redirectTo};
+ }
+ const linkedNeedsSecondFactor = !state.startsWith(SSO_MOBILE_STATE_PREFIX) || MOBILE_REQUIRES_SSO_SECOND_FACTOR;
+ const resolved = await this.resolveUserFromClaims(claims, config, requestCache, clientIp, linkedNeedsSecondFactor);
if (resolved.secondFactorRequired) {
return {...(await this.challengeSecondFactor(resolved.user, claims, config)), redirect_to: redirectTo};
}
const {user} = resolved;
- await this.joinCommunityAndSyncRoles(user, claims.groups, config, requestCache);
+ await this.joinCommunityAndSyncRoles(user, claims, config, requestCache);
const [token] = await AuthSession.createAuthSession(this.apiContext, {
user,
origin: AuthSession.resolveSessionOrigin(this.apiContext, request),
+ authMethod: 'sso',
});
- if (config.enforced && claims.email && claims.emailVerified) {
- await this.syncEnforcedEmail(user, claims.email);
- }
- if (!user.isBot && (await this.takesUsernameFromProvider(config))) {
- await this.syncProviderUsername(user, claims);
- }
+ await this.syncFromProvider(user, claims, config);
return {token, user_id: user.id.toString(), redirect_to: redirectTo};
}
@@ -506,26 +726,53 @@ export class SsoService {
return this.apiContext.services.cache.exists(pendingSsoLinkKey(ticket));
}
- async completePendingLink(user: User, ticket: string): Promise<User> {
+ async completePendingLink(user: User, ticket: string): Promise<{user: User; authMethod?: 'sso'}> {
const {cache} = this.apiContext.services;
- const pending = await cache.getAndDelete<PendingSsoLink>(pendingSsoLinkKey(ticket));
+ const pending = await cache.getAndDelete<PendingSsoLink | LegacyPendingSsoLink>(pendingSsoLinkKey(ticket));
if (!pending) {
- return user;
+ return {user};
}
try {
const config = await this.requireReadyConfig();
if (pending.userId !== user.id.toString() || pending.providerId !== config.providerId) {
throw InputValidationError.fromCode('ticket', ValidationErrorCodes.SESSION_TIMEOUT);
}
- const linkedUser = await this.bindSsoIdentity(user, pending.subject, config);
- await this.joinCommunityAndSyncRoles(linkedUser, pending.groups, config, createRequestCache());
- return linkedUser;
+ const claims = 'claims' in pending ? pending.claims : claimsFromLegacyPendingLink(pending);
+ const linkedUser = await this.bindSsoIdentity(user, claims.sub, config);
+ await this.joinCommunityAndSyncRoles(linkedUser, claims, config, createRequestCache());
+ if ('claims' in pending && !isSignInRefused(linkedUser)) {
+ await this.syncFromProvider(linkedUser, claims, config);
+ }
+ return {user: linkedUser, authMethod: 'sso'};
} catch (error) {
await cache.delete(`mfa-ticket:${ticket}`);
throw error;
}
}
+ private async linkSignedInUser(
+ link: SsoLinkRequest,
+ claims: ResolvedSsoClaims,
+ config: ResolvedSsoConfig,
+ ): Promise<void> {
+ const {users, gateway} = this.apiContext.services;
+ const session = await users.getAuthSessionByToken(Buffer.from(link.sessionIdHash, 'base64url'));
+ const user = session?.userId.toString() === link.userId ? await users.findUnique(session.userId) : null;
+ if (!user || isSignInRefused(user)) {
+ throw InputValidationError.fromCode('state', ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE);
+ }
+ const usernameMode =
+ (await this.instanceConfigRepository.getAccountIdentityMode()) === AccountIdentityModes.USERNAME;
+ const email = resolveUsableSsoEmail(claims, config.allowedEmailDomains, usernameMode);
+ const holder = await this.findMappedUser(claims.sub, config, usernameMode ? null : email);
+ if (holder && holder.id !== user.id) {
+ throw InputValidationError.fromCode('sub', ValidationErrorCodes.SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT);
+ }
+ const linkedUser = await this.bindSsoIdentity(user, claims.sub, config);
+ await dispatchUserUpdate(gateway, linkedUser);
+ getLogger().info({user_id: user.id.toString()}, 'Connected an SSO identity from account settings');
+ }
+
private async challengeSecondFactor(
user: User,
claims: ResolvedSsoClaims,
@@ -542,6 +789,7 @@ export class SsoService {
providerId: config.providerId,
subject: claims.sub,
groups: claims.groups,
+ claims,
};
await this.apiContext.services.cache.set(pendingSsoLinkKey(challenge.ticket), pending, seconds('5 minutes'));
return challenge;
@@ -557,14 +805,14 @@ export class SsoService {
private async joinCommunityAndSyncRoles(
user: User,
- groups: Array<string> | null,
+ claims: ResolvedSsoClaims,
config: ResolvedSsoConfig,
requestCache: RequestCache,
): Promise<void> {
if (canJoinSingleCommunity(user)) {
await this.singleCommunityService.joinStockCommunity(user.id, requestCache);
}
- await this.syncGroupRoles(user, groups, config, requestCache);
+ await this.syncGroupRoles(user, claims, config, requestCache);
}
private async resolveUserFromClaims(
@@ -572,13 +820,16 @@ export class SsoService {
config: ResolvedSsoConfig,
requestCache: RequestCache,
clientIp: string,
+ linkedNeedsSecondFactor: boolean,
): Promise<{user: User; secondFactorRequired: boolean}> {
const accountIdentity = await this.instanceConfigRepository.getAccountIdentity();
const usernameMode = accountIdentity.mode === AccountIdentityModes.USERNAME;
const email = resolveUsableSsoEmail(claims, config.allowedEmailDomains, usernameMode);
- getLogger().info(usernameMode ? {has_sub: true} : {email, has_sub: true}, 'SSO login with sub claim');
const mappedUser = await this.findMappedUser(claims.sub, config, usernameMode ? null : email);
if (mappedUser) {
+ if (linkedNeedsSecondFactor && (await this.hasSecondFactor(mappedUser))) {
+ return {user: mappedUser, secondFactorRequired: true};
+ }
return {user: await this.bindSsoIdentity(mappedUser, claims.sub, config), secondFactorRequired: false};
}
const {users} = this.apiContext.services;
@@ -587,8 +838,11 @@ export class SsoService {
this.assertLinkable(existingUser, claims.sub, config);
if (
!existingUser.traits.has(ssoIdentityTrait(config.providerId, claims.sub)) &&
- (await this.hasSecondFactor(existingUser))
+ (!existingUser.emailVerified || !(await this.instanceConfigRepository.isEmailEnabled()))
) {
+ throw InputValidationError.fromCode('email', ValidationErrorCodes.SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN);
+ }
+ if (await this.hasSecondFactor(existingUser)) {
return {user: existingUser, secondFactorRequired: true};
}
return {user: await this.bindSsoIdentity(existingUser, claims.sub, config), secondFactorRequired: false};
@@ -623,14 +877,22 @@ export class SsoService {
private async syncGroupRoles(
user: User,
- groups: Array<string> | null,
+ {groups, groupsOverage}: ResolvedSsoClaims,
config: ResolvedSsoConfig,
requestCache: RequestCache,
): Promise<void> {
- if (groups === null || config.groupRoleMappings.length === 0) return;
+ if (config.groupRoleMappings.length === 0) return;
const guildId = await this.singleCommunityService.getStockCommunityId();
if (guildId === null) return;
- const memberOf = new Set(groups);
+ if (groups === null) {
+ getLogger().warn(
+ {user_id: user.id.toString(), groups_overage: groupsOverage},
+ groupsOverage
+ ? 'SSO provider left out the groups claim because the user is in too many groups; removing mapped roles. In Entra, limit the token to the groups you map'
+ : 'SSO provider sent no groups claim; removing mapped roles',
+ );
+ }
+ const memberOf = new Set(groups ?? []);
try {
await this.guildMemberService.systemSyncManagedRoles({
targetId: user.id,
@@ -672,6 +934,15 @@ export class SsoService {
return null;
}
+ private async syncFromProvider(user: User, claims: ResolvedSsoClaims, config: ResolvedSsoConfig): Promise<void> {
+ if (config.enforced && claims.email && claims.emailVerified) {
+ await this.syncEnforcedEmail(user, claims.email);
+ }
+ if (!user.isBot && (await this.takesUsernameFromProvider(config))) {
+ await this.syncProviderUsername(user, claims);
+ }
+ }
+
private async syncEnforcedEmail(user: User, email: string): Promise<void> {
if (user.email?.toLowerCase() === email) {
return;
@@ -761,9 +1032,7 @@ export class SsoService {
}
private assertLinkable(user: User, sub: string, config: ResolvedSsoConfig): void {
- const identityTrait = ssoIdentityTrait(config.providerId, sub);
- const existingIdentities = Array.from(user.traits).filter((trait) => trait.startsWith('sso_identity:'));
- if (existingIdentities.length > 0 && !user.traits.has(identityTrait)) {
+ if (isLinkedToSsoProvider(user, config.providerId) && !user.traits.has(ssoIdentityTrait(config.providerId, sub))) {
getLogger().error({user_id: user.id.toString()}, 'SSO identity claim did not match linked account');
throw InputValidationError.fromCode('sub', ValidationErrorCodes.SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY);
}
@@ -991,55 +1260,68 @@ export class SsoService {
groups:
readGroupsClaim(claims, config.groupsClaim ?? DEFAULT_GROUPS_CLAIM) ??
readGroupsClaim(userInfo, config.groupsClaim ?? DEFAULT_GROUPS_CLAIM),
+ groupsOverage:
+ hasGroupsOverage(claims, config.groupsClaim ?? DEFAULT_GROUPS_CLAIM) ||
+ hasGroupsOverage(userInfo, config.groupsClaim ?? DEFAULT_GROUPS_CLAIM),
};
}
private async verifyIdToken(idToken: string, config: ResolvedSsoConfig, expectedNonce: string): Promise<JWTPayload> {
try {
- if (config.jwksUrl) {
- const jwks = await this.getOrCreateJwks(config.jwksUrl);
- const {payload} = await jwtVerify(idToken, jwks, {
- issuer: config.issuerForVerification ?? undefined,
- audience: config.clientId ?? undefined,
- clockTolerance: 10,
- });
- const nonce = payload['nonce'];
- if (nonce === undefined) {
- getLogger().warn('SSO id_token missing required nonce claim');
- throw new Error('nonce missing');
- }
- if (typeof nonce !== 'string' || nonce.length === 0 || nonce !== expectedNonce) {
- throw new Error('nonce mismatch');
- }
- return payload;
+ if (!config.jwksUrl || !config.issuerForVerification) {
+ throw new Error('id_token cannot be verified without a JWKS URL and an issuer');
}
- return decodeJwt(idToken);
+ const jwks = await this.getOrCreateJwks(config.jwksUrl);
+ const {payload} = await jwtVerify(idToken, jwks, {
+ issuer: acceptedIssuers(config.issuerForVerification),
+ audience: config.clientId ?? undefined,
+ clockTolerance: 10,
+ });
+ const nonce = payload['nonce'];
+ if (nonce === undefined) {
+ getLogger().warn('SSO id_token missing required nonce claim');
+ throw new Error('nonce missing');
+ }
+ if (typeof nonce !== 'string' || nonce.length === 0 || nonce !== expectedNonce) {
+ throw new Error('nonce mismatch');
+ }
+ return payload;
} catch (error) {
+ if (error instanceof SsoProviderUnavailableError) throw error;
getLogger().error({error}, 'Failed to verify SSO id_token');
throw InputValidationError.fromCode('id_token', ValidationErrorCodes.INVALID_SSO_TOKEN);
}
}
private async getOrCreateJwks(jwksUrl: string): Promise<RemoteJwkSetResolver> {
- await this.assertPublicOutboundUrl(jwksUrl, 'jwks_url');
- const now = Date.now();
- const cached = this.jwksCache.get(jwksUrl);
- if (cached && now - cached.cachedAt < SsoService.JWKS_CACHE_TTL_MS) {
+ const cached = jwksCache.get(jwksUrl);
+ if (cached && Date.now() - cached.cachedAt < SsoService.JWKS_CACHE_TTL_MS) {
return cached.jwks;
}
+ let creation = jwksCreations.get(jwksUrl);
+ if (!creation) {
+ creation = this.createJwks(jwksUrl).finally(() => jwksCreations.delete(jwksUrl));
+ jwksCreations.set(jwksUrl, creation);
+ }
+ return creation;
+ }
+
+ private async createJwks(jwksUrl: string): Promise<RemoteJwkSetResolver> {
+ const now = Date.now();
const fetchJwks = async (): Promise<JSONWebKeySet> => {
- const response = await FetchUtils.sendRequest(
- {
- url: jwksUrl,
- method: 'GET',
- headers: {Accept: 'application/json'},
- timeout: ms('5 seconds'),
- serviceName: 'sso_jwks',
- },
- {requestUrlPolicy: getSsoRequestUrlPolicy()},
- );
+ const response = await sendProviderRequest({
+ url: jwksUrl,
+ method: 'GET',
+ headers: {Accept: 'application/json'},
+ timeout: ms('15 seconds'),
+ serviceName: 'sso_jwks',
+ });
if (response.status < 200 || response.status >= 300) {
FetchUtils.discardResponseBody(response.stream, response.status);
+ if (response.status >= 500) {
+ getLogger().warn({status: response.status, url: formatUrlForDiagnostics(jwksUrl)}, 'SSO keys request failed');
+ throw new SsoProviderUnavailableError();
+ }
throw new Error(`Failed to fetch JWKS: HTTP ${response.status}`);
}
const rawBody = await FetchUtils.streamToStringWithLimit(response.stream, {
@@ -1064,7 +1346,7 @@ export class SsoService {
currentJwks = await fetchJwks();
currentResolver = createLocalJWKSet(currentJwks);
fetchedAt = Date.now();
- this.jwksCache.set(jwksUrl, {jwks, cachedAt: fetchedAt});
+ jwksCache.set(jwksUrl, {jwks, cachedAt: fetchedAt});
})().finally(() => {
pendingReload = null;
});
@@ -1113,11 +1395,11 @@ export class SsoService {
writable: false,
},
});
- this.jwksCache.set(jwksUrl, {jwks, cachedAt: now});
- if (this.jwksCache.size > 10) {
- for (const [url, entry] of this.jwksCache.entries()) {
+ jwksCache.set(jwksUrl, {jwks, cachedAt: now});
+ if (jwksCache.size > 10) {
+ for (const [url, entry] of jwksCache.entries()) {
if (now - entry.cachedAt >= SsoService.JWKS_CACHE_TTL_MS) {
- this.jwksCache.delete(url);
+ jwksCache.delete(url);
}
}
}
@@ -1125,23 +1407,36 @@ export class SsoService {
}
private async fetchUserInfo(userInfoUrl: string, accessToken: string): Promise<Record<string, unknown>> {
- const resp = await FetchUtils.sendRequest(
- {
- url: userInfoUrl,
- method: 'GET',
- headers: {
- Authorization: `Bearer ${accessToken}`,
- Accept: 'application/json',
- },
- timeout: ms('15 seconds'),
- serviceName: 'sso_user_info',
+ const resp = await sendProviderRequest({
+ url: userInfoUrl,
+ method: 'GET',
+ headers: {
+ Authorization: `Bearer ${accessToken}`,
+ Accept: 'application/json',
},
- {requestUrlPolicy: getSsoRequestUrlPolicy()},
- );
+ timeout: ms('15 seconds'),
+ serviceName: 'sso_user_info',
+ });
if (resp.status < 200 || resp.status >= 300) {
FetchUtils.discardResponseBody(resp.stream, resp.status);
+ getLogger().warn(
+ {
+ status: resp.status,
+ userinfo_url: formatUrlForDiagnostics(userInfoUrl),
+ error: wwwAuthenticateError(resp.headers.get('www-authenticate')),
+ },
+ 'SSO userinfo request failed',
+ );
throw InputValidationError.fromCode('access_token', ValidationErrorCodes.FAILED_TO_FETCH_SSO_USER_INFO);
}
+ if (resp.headers.get('content-type')?.toLowerCase().includes('application/jwt')) {
+ FetchUtils.discardResponseBody(resp.stream, resp.status);
+ getLogger().warn(
+ {userinfo_url: formatUrlForDiagnostics(userInfoUrl)},
+ 'SSO provider sent a signed userinfo response, which Fluxer does not support. Turn off userinfo signing for this client at the provider.',
+ );
+ throw InputValidationError.fromCode('sso', ValidationErrorCodes.SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED);
+ }
try {
const rawBody = await FetchUtils.streamToStringWithLimit(resp.stream, {
maxBytes: EXTERNAL_RESPONSE_LIMITS.ssoUserInfoBytes,
@@ -1176,135 +1471,163 @@ export class SsoService {
if (config.isTestProvider) {
return {id_token: code};
}
- const body = new URLSearchParams({
+ const tokenUrl = config.tokenUrl ?? '';
+ const params = {
grant_type: 'authorization_code',
code,
redirect_uri: redirectUri,
client_id: config.clientId ?? '',
code_verifier: codeVerifier,
- });
- if (config.clientSecret) {
- body.set('client_secret', config.clientSecret);
+ };
+ const methods: Array<ClientAuthMethod | null> = config.clientSecret
+ ? clientAuthMethodsToTry(tokenUrl, config.tokenEndpointAuthMethods)
+ : [null];
+ let method = methods[0] ?? null;
+ let attempt = await this.requestTokens(tokenUrl, params, method, config);
+ if (methods.length > 1 && isRefusedClient(attempt)) {
+ method = methods[1] ?? null;
+ attempt = await this.requestTokens(tokenUrl, params, method, config);
+ }
+ if (!attempt.ok) {
+ getLogger().warn(
+ {
+ status: attempt.status,
+ token_url: formatUrlForDiagnostics(tokenUrl),
+ error: attempt.error.error,
+ error_description: attempt.error.description,
+ },
+ 'SSO token request failed',
+ );
+ if (attempt.status >= 500) {
+ throw new SsoProviderUnavailableError();
+ }
+ if (attempt.status === 401 || (attempt.error.error && MISCONFIGURED_CLIENT_ERRORS.has(attempt.error.error))) {
+ throw InputValidationError.fromCode('sso', ValidationErrorCodes.SSO_MISCONFIGURED);
+ }
+ throw InputValidationError.fromCode('code', ValidationErrorCodes.INVALID_SSO_AUTHORIZATION_CODE);
}
+ if (method && methods.length > 1) {
+ workingClientAuthMethods.set(tokenUrl, method);
+ }
+ return attempt.tokens;
+ }
+
+ private async requestTokens(
+ tokenUrl: string,
+ params: Record<string, string>,
+ method: ClientAuthMethod | null,
+ config: ResolvedSsoConfig,
+ ): Promise<TokenAttempt> {
+ const body = new URLSearchParams(params);
const headers: Record<string, string> = {
Accept: 'application/json',
'Content-Type': 'application/x-www-form-urlencoded',
};
- const resp = await FetchUtils.sendRequest(
- {
- url: config.tokenUrl ?? '',
- method: 'POST',
- headers,
- body,
- timeout: ms('15 seconds'),
- serviceName: 'sso_token_exchange',
- },
- {requestUrlPolicy: getSsoRequestUrlPolicy()},
- );
+ if (method === 'client_secret_basic') {
+ headers['Authorization'] = basicAuthorization(config.clientId ?? '', config.clientSecret ?? '');
+ } else if (method === 'client_secret_post') {
+ body.set('client_secret', config.clientSecret ?? '');
+ }
+ const resp = await sendProviderRequest({
+ url: tokenUrl,
+ method: 'POST',
+ headers,
+ body,
+ timeout: ms('15 seconds'),
+ serviceName: 'sso_token_exchange',
+ });
if (resp.status < 200 || resp.status >= 300) {
- FetchUtils.discardResponseBody(resp.stream, resp.status);
- throw InputValidationError.fromCode('code', ValidationErrorCodes.INVALID_SSO_AUTHORIZATION_CODE);
+ return {ok: false, status: resp.status, error: await readTokenError(resp, tokenUrl)};
}
const rawBody = await FetchUtils.streamToStringWithLimit(resp.stream, {
maxBytes: EXTERNAL_RESPONSE_LIMITS.ssoTokenBytes,
headers: resp.headers,
- url: config.tokenUrl ?? '',
+ url: tokenUrl,
description: 'SSO token response',
});
- return parseTokenEndpointResponse(resp.headers.get('content-type'), rawBody);
+ return {ok: true, tokens: parseTokenEndpointResponse(resp.headers.get('content-type'), rawBody)};
}
private async getResolvedConfig(): Promise<ResolvedSsoConfig> {
const {config} = this.apiContext.services;
const stored = await this.instanceConfigRepository.getSsoConfig({includeSecret: true});
- const redirectUri = deriveSsoRedirectUri(config.endpoints.webApp);
- const scope = stored.scope?.trim() || 'openid email profile';
- const providerId = ssoProviderIdOf(stored);
- let authorizationUrl = stored.authorizationUrl;
- let tokenUrl = stored.tokenUrl;
- let userInfoUrl = stored.userInfoUrl;
- let jwksUrl = stored.jwksUrl;
- let issuerForVerification = stored.issuer;
- const isTestProvider = isTestSsoProvider(
- {
- authorizationUrl,
- tokenUrl,
- },
- config.dev.testModeEnabled,
- );
- const validatedIssuer =
- stored.issuer && !isTestProvider
- ? await this.validateOptionalPublicOutboundUrl(stored.issuer, 'issuer')
- : stored.issuer;
- if (validatedIssuer) {
- const cacheKey = ssoDiscoveryCacheKey(validatedIssuer);
- const {cache} = this.apiContext.services;
- let discovered = await cache.get<{
- issuer: string;
- authorization_endpoint?: string;
- token_endpoint?: string;
- userinfo_endpoint?: string;
- jwks_uri?: string;
- }>(cacheKey);
- if (!discovered && (!authorizationUrl || !tokenUrl || !jwksUrl || !userInfoUrl)) {
- discovered = await tryDiscoverOidcProviderMetadata(validatedIssuer);
- if (discovered) {
- await cache.set(cacheKey, discovered, SsoService.DISCOVERY_TTL_SECONDS);
- }
- }
- authorizationUrl = authorizationUrl ?? discovered?.authorization_endpoint ?? null;
- tokenUrl = tokenUrl ?? discovered?.token_endpoint ?? null;
- userInfoUrl = userInfoUrl ?? discovered?.userinfo_endpoint ?? null;
- jwksUrl = jwksUrl ?? discovered?.jwks_uri ?? null;
- issuerForVerification = discovered?.issuer ?? validatedIssuer;
- }
- if (!isTestProvider) {
- authorizationUrl = await this.validateOptionalPublicOutboundUrl(authorizationUrl, 'authorization_url');
- tokenUrl = await this.validateOptionalPublicOutboundUrl(tokenUrl, 'token_url');
- userInfoUrl = await this.validateOptionalPublicOutboundUrl(userInfoUrl, 'user_info_url');
- jwksUrl = await this.validateOptionalPublicOutboundUrl(jwksUrl, 'jwks_url');
- }
- const canResolveClaims = isTestProvider || Boolean(jwksUrl) || Boolean(userInfoUrl);
- const ready =
- stored.enabled && Boolean(authorizationUrl) && Boolean(tokenUrl) && Boolean(stored.clientId) && canResolveClaims;
- return {
+ const isTestProvider = isTestSsoProvider(stored, config.dev.testModeEnabled);
+ const resolved: ResolvedSsoConfig = {
...stored,
- authorizationUrl,
- tokenUrl,
- userInfoUrl,
- jwksUrl,
- redirectUri,
- scope,
- ready,
- providerId,
+ redirectUri: deriveSsoRedirectUri(config.endpoints.webApp),
+ scope: stored.scope?.trim() || 'openid email profile',
+ ready: false,
+ providerId: ssoProviderIdOf(stored),
isTestProvider,
- issuerForVerification,
+ issuerForVerification: stored.issuer,
+ tokenEndpointAuthMethods: null,
+ discoveryFailed: false,
};
+ if (!stored.enabled) {
+ return resolved;
+ }
+ if (!isTestProvider && !stored.issuer) {
+ warnAboutMissingIssuer();
+ return resolved;
+ }
+ const needsDiscovery = !stored.authorizationUrl || !stored.tokenUrl || !stored.jwksUrl || !stored.userInfoUrl;
+ const discovered = stored.issuer && needsDiscovery ? await this.discoverProvider(stored.issuer) : null;
+ resolved.discoveryFailed = needsDiscovery && !discovered;
+ if (discovered) {
+ resolved.authorizationUrl ??= discoveredHttpsUrl(discovered.authorization_endpoint);
+ resolved.tokenUrl ??= discoveredHttpsUrl(discovered.token_endpoint);
+ resolved.userInfoUrl ??= discoveredHttpsUrl(discovered.userinfo_endpoint);
+ resolved.jwksUrl ??= discoveredHttpsUrl(discovered.jwks_uri);
+ resolved.issuerForVerification = discovered.issuer;
+ resolved.tokenEndpointAuthMethods = discovered.token_endpoint_auth_methods_supported ?? null;
+ }
+ const canResolveClaims = isTestProvider || Boolean(resolved.jwksUrl) || Boolean(resolved.userInfoUrl);
+ resolved.ready =
+ (isTestProvider || Boolean(stored.issuer)) &&
+ Boolean(resolved.authorizationUrl) &&
+ Boolean(resolved.tokenUrl) &&
+ Boolean(stored.clientId) &&
+ canResolveClaims;
+ return resolved;
}
- private async assertPublicOutboundUrl(rawUrl: string, fieldName: string): Promise<string> {
- return validateSsoPublicOutboundUrl(rawUrl, fieldName);
+ private async discoverProvider(issuer: string): Promise<DiscoveredOidcProviderMetadata | null> {
+ const cacheKey = ssoDiscoveryCacheKey(issuer);
+ const cached = await this.apiContext.services.cache.get<DiscoveryCacheEntry>(cacheKey);
+ if (cached && isDiscoveryFresh(cached)) {
+ return cached.metadata;
+ }
+ let refresh = discoveryRefreshes.get(cacheKey);
+ if (!refresh) {
+ refresh = this.refreshDiscovery(issuer, cacheKey, cached?.metadata ?? null).finally(() =>
+ discoveryRefreshes.delete(cacheKey),
+ );
+ discoveryRefreshes.set(cacheKey, refresh);
+ }
+ return refresh;
}
- private async validateOptionalPublicOutboundUrl(rawUrl: string | null, fieldName: string): Promise<string | null> {
- if (!rawUrl) {
- return null;
- }
- try {
- return await this.assertPublicOutboundUrl(rawUrl, fieldName);
- } catch (error) {
+ private async refreshDiscovery(
+ issuer: string,
+ cacheKey: string,
+ lastGood: DiscoveredOidcProviderMetadata | null,
+ ): Promise<DiscoveredOidcProviderMetadata | null> {
+ const metadata = await tryDiscoverOidcProviderMetadata(issuer);
+ if (!metadata && lastGood) {
getLogger().warn(
- {fieldName, rawUrl: formatUrlForDiagnostics(rawUrl), error},
- 'Ignoring SSO URL that failed outbound policy validation',
+ {issuer: formatUrlForDiagnostics(issuer)},
+ 'SSO provider discovery failed and the last discovered endpoints stay in use',
);
- return null;
}
+ const entry: DiscoveryCacheEntry = {metadata: metadata ?? lastGood, fetchedAt: Date.now(), failed: !metadata};
+ await this.apiContext.services.cache.set(cacheKey, entry, DISCOVERY_CACHE_TTL_SECONDS);
+ return entry.metadata;
}
private async requireReadyConfig(): Promise<ResolvedSsoConfig> {
const config = await this.getResolvedConfig();
if (!config.ready) {
- throw new FeatureTemporarilyDisabledError();
+ throw config.discoveryFailed ? new SsoProviderUnavailableError() : new FeatureTemporarilyDisabledError();
}
return config;
}
diff --git a/fluxer_api/src/api/auth/services/SsoUtils.test.ts b/fluxer_api/src/api/auth/services/SsoUtils.test.ts
index c6e3149a0..88e070c00 100644
--- a/fluxer_api/src/api/auth/services/SsoUtils.test.ts
+++ b/fluxer_api/src/api/auth/services/SsoUtils.test.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {tryDiscoverOidcProviderMetadata} from '@app/api/auth/services/SsoUtils';
+import {sanitizeSsoRedirectTo, tryDiscoverOidcProviderMetadata} from '@app/api/auth/services/SsoUtils';
import {Config} from '@app/api/Config';
import {resetSsoRequestUrlPolicyForTesting} from '@app/api/instance/SsoConfigValidation';
import {server} from '@app/api/test/msw/server';
@@ -54,3 +54,29 @@ describe('tryDiscoverOidcProviderMetadata', () => {
expect(discoveryRequests).toBe(0);
});
});
+
+describe('sanitizeSsoRedirectTo', () => {
+ it.each([
+ ['/\\evil.example'],
+ ['/\t/evil.example'],
+ ['//evil.example'],
+ ['/..//evil.example'],
+ ['/.//evil.example'],
+ ['/%2e%2e//evil.example'],
+ ['/a/..//evil.example'],
+ ['https://evil.example/'],
+ ['/\u0000x'],
+ [''],
+ [`/${'a'.repeat(2048)}`],
+ ])('refuses %j', (value) => {
+ expect(sanitizeSsoRedirectTo(value)).toBeUndefined();
+ });
+
+ it('keeps a path with a query and fragment', () => {
+ expect(sanitizeSsoRedirectTo('/channels/@me?x=1#y')).toBe('/channels/@me?x=1#y');
+ });
+
+ it('trims the value', () => {
+ expect(sanitizeSsoRedirectTo(' /channels/@me ')).toBe('/channels/@me');
+ });
+});
diff --git a/fluxer_api/src/api/auth/services/SsoUtils.ts b/fluxer_api/src/api/auth/services/SsoUtils.ts
index 4af6d383f..8b091ad64 100644
--- a/fluxer_api/src/api/auth/services/SsoUtils.ts
+++ b/fluxer_api/src/api/auth/services/SsoUtils.ts
@@ -8,23 +8,27 @@ import {parseJsonRecord} from '@app/api/utils/JsonBoundaryUtils';
import {formatUrlForDiagnostics} from '@pkgs/http_client/src/HttpClientDiagnostics';
import {ms} from 'itty-time';
-interface DiscoveredOidcProviderMetadata {
+export interface DiscoveredOidcProviderMetadata {
issuer: string;
authorization_endpoint?: string;
token_endpoint?: string;
userinfo_endpoint?: string;
jwks_uri?: string;
+ token_endpoint_auth_methods_supported?: Array<string>;
}
+const SSO_REDIRECT_BASE = 'https://sso-redirect.invalid';
+const SSO_REDIRECT_MAX_LENGTH = 2048;
+const SSO_REDIRECT_FORBIDDEN_CHARACTERS = /[\\\p{Cc}]/u;
+
export function sanitizeSsoRedirectTo(redirectTo?: string): string | undefined {
- if (!redirectTo) return undefined;
- const trimmed = redirectTo.trim();
- if (!trimmed) return undefined;
- if (!trimmed.startsWith('/')) return undefined;
- if (trimmed.startsWith('//')) return undefined;
- if (trimmed.length > 2048) return undefined;
- if (trimmed.includes('\r') || trimmed.includes('\n')) return undefined;
- return trimmed;
+ const trimmed = redirectTo?.trim();
+ if (!trimmed || trimmed.length > SSO_REDIRECT_MAX_LENGTH || !trimmed.startsWith('/')) return undefined;
+ if (SSO_REDIRECT_FORBIDDEN_CHARACTERS.test(trimmed)) return undefined;
+ const url = URL.parse(trimmed, SSO_REDIRECT_BASE);
+ if (url?.origin !== SSO_REDIRECT_BASE) return undefined;
+ const path = `${url.pathname}${url.search}${url.hash}`;
+ return path.startsWith('//') || path.startsWith('/\\') ? undefined : path;
}
export function parseTokenEndpointResponse(
@@ -36,7 +40,7 @@ export function parseTokenEndpointResponse(
} {
const contentType = contentTypeHeader?.toLowerCase() ?? '';
const raw = rawResponseBody;
- if (contentType.includes('application/json') || contentType.includes('application/jwt')) {
+ if (contentType.includes('application/json')) {
const parsed = parseJsonRecord(raw);
if (!parsed) {
return {id_token: undefined, access_token: undefined};
@@ -66,6 +70,23 @@ function normalizeIssuerForCompare(value: string): string {
return value.replace(/\/$/, '');
}
+export function acceptedIssuers(issuer: string): Array<string> {
+ const base = normalizeIssuerForCompare(issuer);
+ return [base, `${base}/`];
+}
+
+function discoveryFailed(issuer: string, reason: string, details: Record<string, unknown> = {}): null {
+ Logger.warn(
+ {issuer: formatUrlForDiagnostics(issuer), reason, ...details},
+ 'Failed to discover OIDC provider metadata',
+ );
+ return null;
+}
+
+function readStringList(value: unknown): Array<string> | undefined {
+ return Array.isArray(value) ? value.filter((item): item is string => typeof item === 'string') : undefined;
+}
+
export async function tryDiscoverOidcProviderMetadata(issuer: string): Promise<DiscoveredOidcProviderMetadata | null> {
try {
const url = buildDiscoveryUrl(issuer);
@@ -77,11 +98,11 @@ export async function tryDiscoverOidcProviderMetadata(issuer: string): Promise<D
timeout: ms('10 seconds'),
serviceName: 'sso_oidc_discovery',
},
- {requestUrlPolicy: getSsoRequestUrlPolicy()},
+ {requestUrlPolicy: getSsoRequestUrlPolicy(), maxRedirects: 0},
);
if (resp.status < 200 || resp.status >= 300) {
FetchUtils.discardResponseBody(resp.stream, resp.status);
- return null;
+ return discoveryFailed(issuer, 'unexpected HTTP status', {status: resp.status});
}
const rawBody = await FetchUtils.streamToStringWithLimit(resp.stream, {
maxBytes: EXTERNAL_RESPONSE_LIMITS.ssoDiscoveryBytes,
@@ -90,11 +111,13 @@ export async function tryDiscoverOidcProviderMetadata(issuer: string): Promise<D
description: 'OIDC discovery response',
});
const json = parseJsonRecord(rawBody);
- if (!json) return null;
+ if (!json) return discoveryFailed(issuer, 'response is not a JSON object');
const discoveredIssuer = typeof json['issuer'] === 'string' ? json['issuer'] : null;
- if (!discoveredIssuer) return null;
+ if (!discoveredIssuer) return discoveryFailed(issuer, 'response has no issuer');
if (normalizeIssuerForCompare(discoveredIssuer) !== normalizeIssuerForCompare(issuer)) {
- return null;
+ return discoveryFailed(issuer, 'response issuer does not match', {
+ discovered_issuer: formatUrlForDiagnostics(discoveredIssuer),
+ });
}
return {
issuer: discoveredIssuer,
@@ -103,9 +126,9 @@ export async function tryDiscoverOidcProviderMetadata(issuer: string): Promise<D
token_endpoint: typeof json['token_endpoint'] === 'string' ? json['token_endpoint'] : undefined,
userinfo_endpoint: typeof json['userinfo_endpoint'] === 'string' ? json['userinfo_endpoint'] : undefined,
jwks_uri: typeof json['jwks_uri'] === 'string' ? json['jwks_uri'] : undefined,
+ token_endpoint_auth_methods_supported: readStringList(json['token_endpoint_auth_methods_supported']),
};
} catch (error) {
- Logger.debug({issuer: formatUrlForDiagnostics(issuer), error}, 'Failed to discover OIDC provider metadata');
- return null;
+ return discoveryFailed(issuer, 'request failed', {error});
}
}
diff --git a/fluxer_api/src/api/auth/services/SudoMethods.ts b/fluxer_api/src/api/auth/services/SudoMethods.ts
index 23ad0af44..53f284637 100644
--- a/fluxer_api/src/api/auth/services/SudoMethods.ts
+++ b/fluxer_api/src/api/auth/services/SudoMethods.ts
@@ -3,7 +3,9 @@
import type {ApiContext} from '@app/api/ApiContext';
import * as AuthMfa from '@app/api/auth/AuthMfa';
import {hasOwnedEmail} from '@app/api/auth/services/SudoEmailCode';
+import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
import type {User} from '@app/api/models/User';
+import {isSsoLinkedUser} from '@app/api/user/UserHelpers';
import {UserAuthenticatorTypes} from '@fluxer/constants/src/UserConstants';
import {type SudoModeMethods, SudoModeRequiredError} from '@fluxer/errors/src/domains/auth/SudoModeRequiredError';
@@ -42,10 +44,22 @@ export function emailCodeSudoAvailable(user: SudoMethodsUser, hasPasskeyCredenti
);
}
+export function hasNoVerifiableCredential(
+ user: {passwordHash: string | null; isBot: boolean; email: string | null; emailVerified: boolean},
+ hasMfa: boolean,
+ hasPasskeyCredentials: boolean,
+): boolean {
+ if (user.isBot || hasMfa || hasPasskeyCredentials || hasOwnedEmail(user)) {
+ return false;
+ }
+ return user.passwordHash === null;
+}
+
export function deriveSudoMethods(
- user: SudoMethodsUser,
+ user: User,
hasPasskeyCredentials: boolean,
hasBackupCodes: boolean,
+ ssoEnabled: boolean,
): SudoModeMethods {
return {
totp: hasTotpEnrolled(user),
@@ -53,6 +67,10 @@ export function deriveSudoMethods(
backup_codes: hasBackupCodes,
email_code: emailCodeSudoAvailable(user, hasPasskeyCredentials),
password: (user.passwordHash ?? null) !== null && !userHasUsableMfa(user, hasPasskeyCredentials),
+ sso_reauth:
+ ssoEnabled &&
+ isSsoLinkedUser(user) &&
+ hasNoVerifiableCredential(user, userHasUsableMfa(user, hasPasskeyCredentials), hasPasskeyCredentials),
};
}
@@ -63,8 +81,9 @@ export async function createSudoModeRequiredError(
): Promise<SudoModeRequiredError> {
const hasPasskeys = hasPasskeyCredentials ?? (await ctx.services.users.listWebAuthnCredentials(user.id)).length > 0;
const hasBackupCodes = await AuthMfa.hasUnconsumedBackupCodes(ctx, user.id);
+ const ssoEnabled = (await getInstanceConfigRepository().getSsoConfig()).enabled;
return new SudoModeRequiredError(
userHasSudoCapability(user, hasPasskeys),
- deriveSudoMethods(user, hasPasskeys, hasBackupCodes),
+ deriveSudoMethods(user, hasPasskeys, hasBackupCodes, ssoEnabled),
);
}
diff --git a/fluxer_api/src/api/auth/services/SudoVerificationService.ts b/fluxer_api/src/api/auth/services/SudoVerificationService.ts
index 3800b7cb9..86ecc7c1a 100644
--- a/fluxer_api/src/api/auth/services/SudoVerificationService.ts
+++ b/fluxer_api/src/api/auth/services/SudoVerificationService.ts
@@ -1,17 +1,20 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import * as AuthMfa from '@app/api/auth/AuthMfa';
-import {hasOwnedEmail, verifySudoEmailCode} from '@app/api/auth/services/SudoEmailCode';
+import {verifySudoEmailCode} from '@app/api/auth/services/SudoEmailCode';
import {
createSudoModeRequiredError,
emailCodeSudoAvailable,
+ hasNoVerifiableCredential,
userHasMfa,
userHasSudoCapability,
} from '@app/api/auth/services/SudoMethods';
import {getSudoModeService} from '@app/api/auth/services/SudoModeService';
import {SUDO_MODE_HEADER} from '@app/api/middleware/SudoModeMiddleware';
+import type {AuthSession} from '@app/api/models/AuthSession';
import type {User} from '@app/api/models/User';
import type {HonoEnv} from '@app/api/types/HonoEnv';
+import {isSsoLinkedUser} from '@app/api/user/UserHelpers';
import {verifyPassword} from '@app/api/utils/PasswordUtils';
import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
@@ -30,15 +33,10 @@ export interface SudoVerificationBody {
type SudoVerificationMethod = 'password' | 'mfa' | 'sudo_token' | 'email_code';
-export function hasNoVerifiableCredential(
- user: {passwordHash: string | null; isBot: boolean; email: string | null; emailVerified: boolean},
- hasMfa: boolean,
- hasPasskeyCredentials: boolean,
-): boolean {
- if (user.isBot || hasMfa || hasPasskeyCredentials || hasOwnedEmail(user)) {
- return false;
- }
- return user.passwordHash === null;
+const SSO_SIGN_IN_SUDO_WINDOW_MS = 10 * 60 * 1000;
+
+function isRecentSsoSignIn(session: AuthSession | undefined): boolean {
+ return session?.authMethod === 'sso' && Date.now() - session.createdAt.getTime() < SSO_SIGN_IN_SUDO_WINDOW_MS;
}
export interface SudoVerificationResult {
@@ -100,7 +98,10 @@ async function verifySudoMode(
const sudoToken = issueSudoToken ? await sudoModeService.generateSudoToken(user.id) : undefined;
return {verified: true, sudoToken, method: 'mfa'};
}
- if (hasNoVerifiableCredential(user, hasUsableMfa, hasPasskeyCredentials)) {
+ if (
+ hasNoVerifiableCredential(user, hasUsableMfa, hasPasskeyCredentials) &&
+ (!isSsoLinkedUser(user) || isRecentSsoSignIn(ctx.get('authSession')))
+ ) {
return {verified: true, method: 'password'};
}
if (body.password && !hasUsableMfa) {
diff --git a/fluxer_api/src/api/auth/tests/AuthTestUtils.ts b/fluxer_api/src/api/auth/tests/AuthTestUtils.ts
index 35c24ae4f..6406dd7fb 100644
--- a/fluxer_api/src/api/auth/tests/AuthTestUtils.ts
+++ b/fluxer_api/src/api/auth/tests/AuthTestUtils.ts
@@ -260,6 +260,15 @@ export function totpCodeNow(secret: string): string {
return generateTotpCode(secret, Date.now());
}
+export async function enableTotp(harness: ApiTestHarness, account: TestAccount): Promise<Array<string>> {
+ const secret = createTotpSecret();
+ const enabled = await createBuilder<BackupCodesResponse>(harness, account.token)
+ .post('/users/@me/mfa/totp/enable')
+ .body({secret, code: totpCodeNow(secret), password: account.password})
+ .execute();
+ return enabled.backup_codes.map(({code}) => code);
+}
+
export async function loginWithTotp(
harness: ApiTestHarness,
account: TestAccount,
@@ -328,6 +337,7 @@ export async function unclaimAccount(harness: ApiTestHarness, userId: string): P
interface SsoConfig {
enabled: boolean;
enforced: boolean;
+ issuer?: string;
authorization_url: string;
token_url: string;
client_id: string;
diff --git a/fluxer_api/src/api/auth/tests/EmailChangeFlow.test.ts b/fluxer_api/src/api/auth/tests/EmailChangeFlow.test.ts
index 6df2388be..76e309548 100644
--- a/fluxer_api/src/api/auth/tests/EmailChangeFlow.test.ts
+++ b/fluxer_api/src/api/auth/tests/EmailChangeFlow.test.ts
@@ -488,6 +488,7 @@ describe('Email change flow', () => {
backup_codes: true,
email_code: false,
password: false,
+ sso_reauth: false,
});
const passwordOnlyResp = await createBuilder<{
code: string;
@@ -509,6 +510,7 @@ describe('Email change flow', () => {
backup_codes: true,
email_code: false,
password: false,
+ sso_reauth: false,
});
const updated = await createBuilder<UserPrivateResponse>(harness, mfaAccount.token)
.patch('/users/@me')
@@ -587,6 +589,7 @@ describe('Email change flow', () => {
backup_codes: true,
email_code: false,
password: false,
+ sso_reauth: false,
});
const passwordOnlyResp = await createBuilder<{
code: string;
@@ -608,6 +611,7 @@ describe('Email change flow', () => {
backup_codes: true,
email_code: false,
password: false,
+ sso_reauth: false,
});
const updated = await createBuilder<UserPrivateResponse>(harness, mfaAccount.token)
.post('/users/@me/email-change/apply')
@@ -689,6 +693,7 @@ describe('Email change flow', () => {
backup_codes: true,
email_code: false,
password: false,
+ sso_reauth: false,
});
const applied = await createBuilder<UserPrivateResponse>(harness, mfaAccount.token)
.post('/users/@me/email-change/apply')
diff --git a/fluxer_api/src/api/auth/tests/MfaConsistency.test.ts b/fluxer_api/src/api/auth/tests/MfaConsistency.test.ts
index 7a7c6f6c9..cd505f72b 100644
--- a/fluxer_api/src/api/auth/tests/MfaConsistency.test.ts
+++ b/fluxer_api/src/api/auth/tests/MfaConsistency.test.ts
@@ -67,6 +67,7 @@ describe('MFA Consistency Tests', () => {
backup_codes: methods.backup_codes,
email_code: methods.email_code,
password: methods.password,
+ sso_reauth: false,
});
});
test('mfa-methods agrees with the SUDO_MODE_REQUIRED body for an enrolled TOTP user', async () => {
@@ -104,6 +105,7 @@ describe('MFA Consistency Tests', () => {
backup_codes: methods.backup_codes,
email_code: methods.email_code,
password: methods.password,
+ sso_reauth: false,
});
});
});
diff --git a/fluxer_api/src/api/auth/tests/RegistrationSignupRaces.test.ts b/fluxer_api/src/api/auth/tests/RegistrationSignupRaces.test.ts
index 3824ed21d..820fb563a 100644
--- a/fluxer_api/src/api/auth/tests/RegistrationSignupRaces.test.ts
+++ b/fluxer_api/src/api/auth/tests/RegistrationSignupRaces.test.ts
@@ -174,13 +174,13 @@ describe('signups racing on registration URLs and pending approvals', () => {
failureEmail = email;
}
const operation = (async () => {
- const start = await createBuilderWithoutAuth<{state: string}>(harness)
+ const start = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
.post('/auth/sso/start')
.body({redirect_to: '/me'})
.execute();
return createBuilderWithoutAuth(harness)
.post('/auth/sso/complete')
- .body({code: email, state: start.state})
+ .body({code: email, state: start.state, client_binding: start.client_binding})
.executeRaw();
})();
requests.add(operation);
diff --git a/fluxer_api/src/api/auth/tests/SetupTokenAccountPaths.test.ts b/fluxer_api/src/api/auth/tests/SetupTokenAccountPaths.test.ts
index db445d6fc..00203322f 100644
--- a/fluxer_api/src/api/auth/tests/SetupTokenAccountPaths.test.ts
+++ b/fluxer_api/src/api/auth/tests/SetupTokenAccountPaths.test.ts
@@ -139,8 +139,8 @@ describe('Setup token on every way to create an account', () => {
async function completeSso(prefix: string): Promise<{status: number; json: GateResponse}> {
const started = await post('/auth/sso/start', {});
expect(started.status).toBe(HTTP_STATUS.OK);
- const state = (started.json as GateResponse & {state?: string}).state;
- return post('/auth/sso/complete', {code: `${prefix}-${Date.now()}@example.com`, state});
+ const {state, client_binding} = started.json as GateResponse & {state?: string; client_binding?: string};
+ return post('/auth/sso/complete', {code: `${prefix}-${Date.now()}@example.com`, state, client_binding});
}
it('sends no sign-up code before the first admin exists', async () => {
diff --git a/fluxer_api/src/api/auth/tests/SsoClientBinding.test.ts b/fluxer_api/src/api/auth/tests/SsoClientBinding.test.ts
new file mode 100644
index 000000000..01823f4f4
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoClientBinding.test.ts
@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ enableSso,
+ setUserACLs,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {SSO_MOBILE_CALLBACK_URI} from '@fluxer/constants/src/SsoConstants';
+import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'vitest';
+
+interface SsoStartResponse {
+ state: string;
+ client_binding: string;
+}
+
+interface SsoCompleteResponse {
+ token: string;
+}
+
+interface ValidationErrorBody {
+ errors?: Array<{path: string; code: string}>;
+}
+
+describe('SSO client binding', () => {
+ let harness: ApiTestHarness;
+ let admin: TestAccount;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ 'admin:authenticate',
+ 'instance:config:update',
+ 'instance:config:view',
+ ]);
+ await enableSso(harness, admin.token);
+ });
+ afterEach(async () => {
+ await disableSso(harness, admin.token);
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ async function start(body: Record<string, unknown> = {}): Promise<SsoStartResponse> {
+ return createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body(body).execute();
+ }
+
+ async function completeError(body: Record<string, unknown>): Promise<string | undefined> {
+ const {json} = await createBuilderWithoutAuth<ValidationErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code: createUniqueEmail('sso-binding'), ...body})
+ .expect(400)
+ .executeWithResponse();
+ return json.errors?.find((error) => error.path === 'state')?.code;
+ }
+
+ function complete(body: Record<string, unknown>): Promise<SsoCompleteResponse> {
+ return createBuilderWithoutAuth<SsoCompleteResponse>(harness)
+ .post('/auth/sso/complete')
+ .body({code: createUniqueEmail('sso-binding'), ...body})
+ .execute();
+ }
+
+ it('returns a different client binding on each start', async () => {
+ const first = await start();
+ const second = await start();
+ expect(first.client_binding).toMatch(/^[A-Za-z0-9_-]{43}$/);
+ expect(first.client_binding).not.toBe(second.client_binding);
+ });
+
+ it('signs in when the client sends the binding it was given', async () => {
+ const {state, client_binding} = await start();
+ expect((await complete({state, client_binding})).token).toBeTruthy();
+ });
+
+ it('rejects a web sign-in without the client binding', async () => {
+ const {state} = await start();
+ expect(await completeError({state})).toBe(ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE);
+ });
+
+ it('rejects a web sign-in with the client binding of another start', async () => {
+ const {state} = await start();
+ const other = await start();
+ expect(await completeError({state, client_binding: other.client_binding})).toBe(
+ ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE,
+ );
+ });
+
+ it('burns the state after a wrong client binding', async () => {
+ const {state, client_binding} = await start();
+ const other = await start();
+ await completeError({state, client_binding: other.client_binding});
+ expect(await completeError({state, client_binding})).toBe(ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE);
+ });
+
+ it('still lets mobile sign in without the client binding', async () => {
+ const {state} = await start({redirect_uri: SSO_MOBILE_CALLBACK_URI});
+ expect((await complete({state})).token).toBeTruthy();
+ });
+
+ it('rejects a mobile sign-in with the wrong client binding', async () => {
+ const {state} = await start({redirect_uri: SSO_MOBILE_CALLBACK_URI});
+ const other = await start({redirect_uri: SSO_MOBILE_CALLBACK_URI});
+ expect(await completeError({state, client_binding: other.client_binding})).toBe(
+ ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE,
+ );
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SsoEnforcedCredentials.test.ts b/fluxer_api/src/api/auth/tests/SsoEnforcedCredentials.test.ts
index 19e82d39b..3aa8aceba 100644
--- a/fluxer_api/src/api/auth/tests/SsoEnforcedCredentials.test.ts
+++ b/fluxer_api/src/api/auth/tests/SsoEnforcedCredentials.test.ts
@@ -15,6 +15,7 @@ import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from '
interface SsoStartResponse {
state: string;
+ client_binding: string;
}
interface SsoCompleteResponse {
@@ -84,7 +85,7 @@ describe('Credentials of SSO accounts while SSO is enforced', () => {
const start = await createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
const login = await createBuilderWithoutAuth<SsoCompleteResponse>(harness)
.post('/auth/sso/complete')
- .body({code: createUniqueEmail('sso-credentials'), state: start.state})
+ .body({code: createUniqueEmail('sso-credentials'), state: start.state, client_binding: start.client_binding})
.execute();
await createBuilder(harness, login.token)
.put('/users/@me/date-of-birth')
diff --git a/fluxer_api/src/api/auth/tests/SsoEnforcement.test.ts b/fluxer_api/src/api/auth/tests/SsoEnforcement.test.ts
index 517532298..b24f064ae 100644
--- a/fluxer_api/src/api/auth/tests/SsoEnforcement.test.ts
+++ b/fluxer_api/src/api/auth/tests/SsoEnforcement.test.ts
@@ -45,10 +45,13 @@ describe('SSO after enforcement ends', () => {
}
async function ssoSignIn(claims: Record<string, unknown>) {
- const {state} = await createBuilderWithoutAuth<{state: string}>(harness).post('/auth/sso/start').body({}).execute();
+ const {state, client_binding} = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
return createBuilderWithoutAuth<SsoCompleteBody>(harness)
.post('/auth/sso/complete')
- .body({code: JSON.stringify(claims), state})
+ .body({code: JSON.stringify(claims), state, client_binding})
.executeRaw();
}
diff --git a/fluxer_api/src/api/auth/tests/SsoEntraEmailVerification.test.ts b/fluxer_api/src/api/auth/tests/SsoEntraEmailVerification.test.ts
new file mode 100644
index 000000000..23f5b2401
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoEntraEmailVerification.test.ts
@@ -0,0 +1,153 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ setUserACLs,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {server} from '@app/api/test/msw/server';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
+import {exportJWK, generateKeyPair, SignJWT} from 'jose';
+import {HttpResponse, http} from 'msw';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'vitest';
+
+const ISSUER = 'https://1.1.1.1/entra/v2.0';
+const CLIENT_ID = 'entra-client';
+const KEY_ID = 'entra-key';
+
+interface SsoStartResponse {
+ authorization_url: string;
+ state: string;
+ client_binding: string;
+}
+
+interface ErrorBody {
+ errors?: Array<{code: string}>;
+}
+
+interface Provider {
+ idToken: Record<string, unknown>;
+ userInfo?: Record<string, unknown>;
+}
+
+describe('SSO email verification from Entra', () => {
+ let harness: ApiTestHarness;
+ let admin: TestAccount;
+ let privateKey: CryptoKey;
+ let jwk: Record<string, unknown>;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ const keys = await generateKeyPair('RS256');
+ privateKey = keys.privateKey;
+ jwk = {...(await exportJWK(keys.publicKey)), kid: KEY_ID, alg: 'RS256'};
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ 'admin:authenticate',
+ 'instance:config:update',
+ 'instance:config:view',
+ ]);
+ });
+ afterEach(async () => {
+ await disableSso(harness, admin.token);
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ async function signIn({idToken, userInfo}: Provider, status: number): Promise<ErrorBody> {
+ server.use(
+ http.get(`${ISSUER}/.well-known/openid-configuration`, () =>
+ HttpResponse.json({
+ issuer: ISSUER,
+ authorization_endpoint: `${ISSUER}/authorize`,
+ token_endpoint: `${ISSUER}/token`,
+ jwks_uri: `${ISSUER}/keys`,
+ ...(userInfo ? {userinfo_endpoint: `${ISSUER}/userinfo`} : {}),
+ }),
+ ),
+ http.get(`${ISSUER}/keys`, () => HttpResponse.json({keys: [jwk]})),
+ http.get(`${ISSUER}/userinfo`, () => HttpResponse.json(userInfo ?? {})),
+ );
+ await createBuilder(harness, admin.token)
+ .patch('/admin/instance/config')
+ .body({
+ sso: {
+ enabled: true,
+ enforced: false,
+ issuer: ISSUER,
+ authorization_url: null,
+ token_url: null,
+ userinfo_url: null,
+ jwks_url: null,
+ client_id: CLIENT_ID,
+ allowed_domains: [],
+ auto_provision: true,
+ },
+ })
+ .execute();
+ const start = await createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
+ const nonce = new URL(start.authorization_url).searchParams.get('nonce');
+ const signed = await new SignJWT({nonce, ...idToken})
+ .setProtectedHeader({alg: 'RS256', kid: KEY_ID})
+ .setIssuer(ISSUER)
+ .setAudience(CLIENT_ID)
+ .setSubject(String(idToken['sub']))
+ .setIssuedAt()
+ .setExpirationTime('5m')
+ .sign(privateKey);
+ server.use(
+ http.post(`${ISSUER}/token`, () =>
+ HttpResponse.json({id_token: signed, access_token: 'entra-access', token_type: 'Bearer'}),
+ ),
+ );
+ return createBuilderWithoutAuth<ErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code: 'entra-code', state: start.state, client_binding: start.client_binding})
+ .expect(status)
+ .execute();
+ }
+
+ function subject(): string {
+ return `itest-entra-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+ }
+
+ function expectUnverified(body: ErrorBody): void {
+ expect(body.errors?.map((error) => error.code)).toEqual([ValidationErrorCodes.SSO_EMAIL_NOT_VERIFIED]);
+ }
+
+ it('accepts xms_edov in the id_token as a verified email', async () => {
+ await signIn({idToken: {sub: subject(), email: createUniqueEmail('entra'), xms_edov: true}}, 200);
+ });
+
+ it('lets email_verified false win over xms_edov', async () => {
+ const body = await signIn(
+ {idToken: {sub: subject(), email: createUniqueEmail('entra'), email_verified: false, xms_edov: true}},
+ 400,
+ );
+ expectUnverified(body);
+ });
+
+ it('ignores xms_edov from userinfo', async () => {
+ const sub = subject();
+ const email = createUniqueEmail('entra');
+ const body = await signIn({idToken: {sub, email}, userInfo: {sub, email, xms_edov: true}}, 400);
+ expectUnverified(body);
+ });
+
+ it('ignores xms_edov when the id_token has no email that matches the one in use', async () => {
+ const sub = subject();
+ const body = await signIn(
+ {idToken: {sub, xms_edov: true}, userInfo: {sub, email: createUniqueEmail('entra')}},
+ 400,
+ );
+ expectUnverified(body);
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SsoFlow.test.ts b/fluxer_api/src/api/auth/tests/SsoFlow.test.ts
index b0efeebd3..cf272f269 100644
--- a/fluxer_api/src/api/auth/tests/SsoFlow.test.ts
+++ b/fluxer_api/src/api/auth/tests/SsoFlow.test.ts
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
+import {SsoIdentityRepository} from '@app/api/auth/services/SsoIdentityRepository';
import {
createAuthHarness,
createTestAccount,
@@ -7,23 +8,32 @@ import {
createUniqueEmail,
disableSso,
enableSso,
+ enableTotp,
setUserACLs,
type TestAccount,
totpCodeNow,
} from '@app/api/auth/tests/AuthTestUtils';
+import {createUserID} from '@app/api/BrandedTypes';
import {Config} from '@app/api/Config';
import {createChannelInvite, setupTestGuildWithMembers} from '@app/api/guild/tests/GuildTestUtils';
+import {getKVClient} from '@app/api/middleware/ServiceRegistry';
import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {server} from '@app/api/test/msw/server';
import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {EmailDeliveryModes} from '@fluxer/constants/src/AccountConfigConstants';
import {AdminACLs} from '@fluxer/constants/src/AdminACLs';
+import {SSO_MOBILE_CALLBACK_URI} from '@fluxer/constants/src/SsoConstants';
+import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import type {PendingRegistrationListResponse} from '@fluxer/schema/src/domains/admin/AdminSchemas';
+import {HttpResponse, http} from 'msw';
import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'vitest';
interface SsoStartResponse {
authorization_url: string;
state: string;
redirect_uri: string;
+ client_binding: string;
}
interface SsoCompleteResponse {
@@ -171,6 +181,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
expect(completeData.token).toBeTruthy();
@@ -252,6 +263,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
expect(completeData.redirect_to).toBe('');
@@ -267,6 +279,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
expect(completeData.redirect_to).toBe('');
@@ -282,6 +295,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
expect(completeData.redirect_to).toBe('');
@@ -320,6 +334,7 @@ describe('Auth SSO flow', () => {
.body({
code: email1,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
const email2 = `sso-singleuse-2-${Date.now()}@example.com`;
@@ -328,6 +343,7 @@ describe('Auth SSO flow', () => {
.body({
code: email2,
state: startData.state,
+ client_binding: startData.client_binding,
})
.expect(400)
.execute();
@@ -371,6 +387,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.expect(400)
.execute();
@@ -389,6 +406,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
});
@@ -406,6 +424,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
});
@@ -489,6 +508,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData.state,
+ client_binding: startData.client_binding,
})
.expect(403)
.execute();
@@ -509,6 +529,7 @@ describe('Auth SSO flow', () => {
.body({
code: `sso-single-community-${Date.now()}@example.com`,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
await createBuilder(harness, owner.token)
@@ -532,6 +553,7 @@ describe('Auth SSO flow', () => {
.body({
code: `sso-auto-join-${Date.now()}@example.com`,
state: startData.state,
+ client_binding: startData.client_binding,
})
.execute();
await createBuilder(harness, owner.token)
@@ -563,6 +585,7 @@ describe('Auth SSO flow', () => {
.body({
code: `sso-auto-join-approval-${Date.now()}@example.com`,
state: startData.state,
+ client_binding: startData.client_binding,
})
.expect(403, 'REGISTRATION_PENDING_APPROVAL')
.execute();
@@ -615,6 +638,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData1.state,
+ client_binding: startData1.client_binding,
})
.execute();
const startData2 = await createBuilderWithoutAuth<SsoStartResponse>(harness)
@@ -626,6 +650,7 @@ describe('Auth SSO flow', () => {
.body({
code: email,
state: startData2.state,
+ client_binding: startData2.client_binding,
})
.execute();
expect(secondLogin.user_id).toBe(firstLogin.user_id);
@@ -643,6 +668,7 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email: firstEmail, sub: subject, email_verified: true}),
state: startData1.state,
+ client_binding: startData1.client_binding,
})
.execute();
const startData2 = await createBuilderWithoutAuth<SsoStartResponse>(harness)
@@ -654,6 +680,7 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email: secondEmail, sub: subject, email_verified: true}),
state: startData2.state,
+ client_binding: startData2.client_binding,
})
.execute();
expect(secondLogin.user_id).toBe(firstLogin.user_id);
@@ -669,6 +696,7 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email, sub: `itest-sso-subject-conflict-a-${Date.now()}`, email_verified: true}),
state: startData1.state,
+ client_binding: startData1.client_binding,
})
.execute();
expect(firstLogin.user_id).toBeTruthy();
@@ -681,6 +709,7 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email, sub: `itest-sso-subject-conflict-b-${Date.now()}`, email_verified: true}),
state: startData2.state,
+ client_binding: startData2.client_binding,
})
.expect(400)
.execute();
@@ -698,6 +727,7 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email: firstEmail, sub: subject, email_verified: true}),
state: startData1.state,
+ client_binding: startData1.client_binding,
})
.execute();
const startData2 = await createBuilderWithoutAuth<SsoStartResponse>(harness)
@@ -709,6 +739,7 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email: secondEmail, sub: ` ${subject}`, email_verified: true}),
state: startData2.state,
+ client_binding: startData2.client_binding,
})
.execute();
expect(secondLogin.user_id).not.toBe(firstLogin.user_id);
@@ -720,7 +751,7 @@ describe('Auth SSO flow', () => {
.execute();
return createBuilderWithoutAuth<SsoCompleteResponse>(harness)
.post('/auth/sso/complete')
- .body({code, state: startData.state})
+ .body({code, state: startData.state, client_binding: startData.client_binding})
.execute();
}
it('joins an existing account to the single community when it signs in', async () => {
@@ -779,7 +810,7 @@ describe('Auth SSO flow', () => {
.execute();
const challenge = await createBuilderWithoutAuth<SsoMfaChallengeResponse>(harness)
.post('/auth/sso/complete')
- .body({code: account.email, state: startData.state})
+ .body({code: account.email, state: startData.state, client_binding: startData.client_binding})
.execute();
expect(challenge).toMatchObject({mfa: true, backup_codes: true, redirect_to: '/channels/@me'});
expect(challenge).not.toHaveProperty('token');
@@ -788,9 +819,6 @@ describe('Auth SSO flow', () => {
.body({ticket: challenge.ticket, code: enabled.backup_codes[0]!.code})
.execute();
expect(linked.user_id).toBe(account.userId);
- const again = await signInWithSso(account.email);
- expect(again.user_id).toBe(account.userId);
- expect(again.token).toBeTruthy();
});
it('rejects unverified provider email claims', async () => {
const email = createUniqueEmail('sso-unverified');
@@ -803,11 +831,225 @@ describe('Auth SSO flow', () => {
.body({
code: JSON.stringify({email, sub: `itest-sso-unverified-${Date.now()}`, email_verified: false}),
state: startData.state,
+ client_binding: startData.client_binding,
})
.expect(400)
.execute();
});
});
+ describe('linking existing accounts', () => {
+ let admin: TestAccount;
+ beforeEach(async () => {
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ 'admin:authenticate',
+ 'instance:config:update',
+ 'instance:config:view',
+ ]);
+ });
+ afterEach(async () => {
+ await disableSso(harness, admin.token);
+ });
+ async function accountThenSso(params?: {skipEmailVerification: boolean}): Promise<TestAccount> {
+ const account = await createTestAccount(harness, params);
+ await enableSso(harness, admin.token);
+ return account;
+ }
+ function providerCode(email: string, sub: string): string {
+ return JSON.stringify({email, sub, email_verified: true});
+ }
+ function startSignIn(): Promise<SsoStartResponse> {
+ return createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
+ }
+ function startLink(account: TestAccount): Promise<SsoStartResponse> {
+ return createBuilder<SsoStartResponse>(harness, account.token)
+ .post('/users/@me/sso/link/start')
+ .body({password: account.password})
+ .execute();
+ }
+ function complete<T>(start: SsoStartResponse, code: string): Promise<T> {
+ return createBuilderWithoutAuth<T>(harness)
+ .post('/auth/sso/complete')
+ .body({code, state: start.state, client_binding: start.client_binding})
+ .execute();
+ }
+ async function completeError(start: SsoStartResponse, code: string): Promise<string | undefined> {
+ const body = await createBuilderWithoutAuth<{errors?: Array<{code: string}>}>(harness)
+ .post('/auth/sso/complete')
+ .body({code, state: start.state, client_binding: start.client_binding})
+ .expect(400)
+ .execute();
+ return body.errors?.[0]?.code;
+ }
+ async function traitsOf(account: TestAccount): Promise<Array<string>> {
+ return (await createBuilder<{traits: Array<string>}>(harness, account.token).get('/users/@me').execute()).traits;
+ }
+
+ it('does not sign in to an account whose email is not confirmed', async () => {
+ const account = await accountThenSso({skipEmailVerification: true});
+ expect(await completeError(await startSignIn(), account.email)).toBe(
+ ValidationErrorCodes.SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN,
+ );
+ expect(await traitsOf(account)).not.toContain('sso');
+ });
+
+ it('does not sign in to an existing account by email when the instance sends no email', async () => {
+ const account = await accountThenSso();
+ await getInstanceConfigRepository().setInstanceIntegrationsConfig({email: {delivery: EmailDeliveryModes.OFF}});
+ expect(await completeError(await startSignIn(), account.email)).toBe(
+ ValidationErrorCodes.SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN,
+ );
+ });
+
+ it('signs in to an account with a confirmed email on an instance that sends email', async () => {
+ const account = await accountThenSso();
+ expect(await getInstanceConfigRepository().isEmailEnabled()).toBe(true);
+ const signedIn = await complete<SsoCompleteResponse>(await startSignIn(), account.email);
+ expect(signedIn.user_id).toBe(account.userId);
+ });
+
+ it('asks a connected account for its second factor when it signs in with SSO', async () => {
+ const account = await accountThenSso();
+ const code = providerCode(account.email, `itest-sso-mfa-${Date.now()}`);
+ await complete(await startSignIn(), code);
+ await enableTotp(harness, account);
+ const signIn = await complete<SsoMfaChallengeResponse>(await startSignIn(), code);
+ expect(signIn).toMatchObject({mfa: true, backup_codes: true});
+ expect(signIn).not.toHaveProperty('token');
+ });
+
+ function completeMobile<T>(state: string, code: string): Promise<T> {
+ return createBuilderWithoutAuth<T>(harness).post('/auth/sso/complete').body({code, state}).execute();
+ }
+ async function startMobileSignIn(): Promise<string> {
+ const {state} = await createBuilderWithoutAuth<SsoStartResponse>(harness)
+ .post('/auth/sso/start')
+ .body({redirect_uri: SSO_MOBILE_CALLBACK_URI})
+ .execute();
+ return state;
+ }
+
+ it('signs a linked account with a second factor in from the mobile app without asking for it', async () => {
+ const account = await accountThenSso();
+ const code = providerCode(account.email, `itest-sso-mfa-mobile-${Date.now()}`);
+ await complete(await startSignIn(), code);
+ await enableTotp(harness, account);
+ const signIn = await completeMobile<SsoCompleteResponse>(await startMobileSignIn(), code);
+ expect(signIn).toMatchObject({token: expect.any(String), user_id: account.userId});
+ const webSignIn = await complete<SsoMfaChallengeResponse>(await startSignIn(), code);
+ expect(webSignIn).toMatchObject({mfa: true});
+ expect(webSignIn).not.toHaveProperty('token');
+ });
+
+ it('still asks the mobile app for the second factor before linking an account by email', async () => {
+ const account = await accountThenSso();
+ await enableTotp(harness, account);
+ const code = providerCode(account.email, `itest-sso-mfa-mobile-first-${Date.now()}`);
+ const signIn = await completeMobile<SsoMfaChallengeResponse>(await startMobileSignIn(), code);
+ expect(signIn).toMatchObject({mfa: true});
+ expect(signIn).not.toHaveProperty('token');
+ });
+
+ it('asks for the second factor when the account has lost its SSO link record', async () => {
+ const account = await accountThenSso();
+ const code = providerCode(account.email, `itest-sso-mfa-unmapped-${Date.now()}`);
+ await complete(await startSignIn(), code);
+ await enableTotp(harness, account);
+ await new SsoIdentityRepository().releaseIdentitiesForUser(createUserID(BigInt(account.userId)));
+ const signIn = await complete<SsoMfaChallengeResponse>(await startSignIn(), code);
+ expect(signIn).toMatchObject({mfa: true});
+ expect(signIn).not.toHaveProperty('token');
+ });
+
+ it('finishes a second factor sign-in that was waiting when the server was upgraded', async () => {
+ const account = await accountThenSso();
+ const sub = `itest-sso-mfa-legacy-${Date.now()}`;
+ const code = providerCode(account.email, sub);
+ await complete(await startSignIn(), code);
+ const [backupCode] = await enableTotp(harness, account);
+ const challenge = await complete<SsoMfaChallengeResponse>(await startSignIn(), code);
+ const key = `sso:pending-link:${challenge.ticket}`;
+ const stored = JSON.parse((await getKVClient().get(key)) ?? '{}');
+ await getKVClient().set(
+ key,
+ JSON.stringify({userId: stored.userId, providerId: stored.providerId, subject: sub, groups: null}),
+ );
+ const login = await createBuilderWithoutAuth<{token: string}>(harness)
+ .post('/auth/login/mfa/totp')
+ .body({ticket: challenge.ticket, code: backupCode})
+ .execute();
+ expect(login.token).toEqual(expect.any(String));
+ expect((await new SsoIdentityRepository().findUserId(stored.providerId, sub))?.toString()).toBe(account.userId);
+ });
+
+ it('stores the subject and groups an older server needs to finish a second factor sign-in', async () => {
+ const account = await accountThenSso();
+ const sub = `itest-sso-mfa-older-${Date.now()}`;
+ const code = providerCode(account.email, sub);
+ await complete(await startSignIn(), code);
+ const [backupCode] = await enableTotp(harness, account);
+ const challenge = await complete<SsoMfaChallengeResponse>(await startSignIn(), code);
+ const key = `sso:pending-link:${challenge.ticket}`;
+ const stored = JSON.parse((await getKVClient().get(key)) ?? '{}');
+ expect(stored).toMatchObject({subject: sub, groups: null});
+ const {claims: _claims, ...olderServerView} = stored;
+ await getKVClient().set(key, JSON.stringify(olderServerView));
+ const login = await createBuilderWithoutAuth<{token: string}>(harness)
+ .post('/auth/login/mfa/totp')
+ .body({ticket: challenge.ticket, code: backupCode})
+ .execute();
+ expect(login.token).toEqual(expect.any(String));
+ });
+
+ it('keeps the connect state under a key that older servers never read', async () => {
+ const account = await accountThenSso();
+ const {state} = await startLink(account);
+ expect(await getKVClient().get(`sso:state:${state}`)).toBeNull();
+ expect(await getKVClient().get(`sso:link-state:${state}`)).not.toBeNull();
+ });
+
+ it('connects the signed-in account from settings while SSO is required', async () => {
+ const account = await accountThenSso();
+ const sub = `itest-sso-link-${Date.now()}`;
+ const linked = await complete<Record<string, unknown>>(
+ await startLink(account),
+ providerCode(createUniqueEmail('sso-link'), sub),
+ );
+ expect(linked).toEqual({linked: true, redirect_to: ''});
+ const signedIn = await complete<SsoCompleteResponse>(
+ await startSignIn(),
+ providerCode(createUniqueEmail('sso-link-again'), sub),
+ );
+ expect(signedIn.user_id).toBe(account.userId);
+ });
+
+ it('refuses to connect an identity another account already uses', async () => {
+ const account = await accountThenSso();
+ const sub = `itest-sso-link-taken-${Date.now()}`;
+ await complete(await startSignIn(), providerCode(createUniqueEmail('sso-link-holder'), sub));
+ expect(await completeError(await startLink(account), providerCode(createUniqueEmail('sso-link'), sub))).toBe(
+ ValidationErrorCodes.SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT,
+ );
+ expect(await traitsOf(account)).not.toContain('sso');
+ });
+
+ it('asks for sudo before starting to connect', async () => {
+ const account = await accountThenSso();
+ await createBuilder(harness, account.token)
+ .post('/users/@me/sso/link/start')
+ .body({})
+ .expect(403, 'SUDO_MODE_REQUIRED')
+ .execute();
+ });
+
+ it('does not connect once the session that started it has signed out', async () => {
+ const account = await accountThenSso();
+ const start = await startLink(account);
+ await createBuilder(harness, account.token).post('/auth/logout').expect(204).execute();
+ expect(
+ await completeError(start, providerCode(createUniqueEmail('sso-link'), `itest-sso-out-${Date.now()}`)),
+ ).toBe(ValidationErrorCodes.INVALID_OR_EXPIRED_SSO_STATE);
+ });
+ });
describe('status endpoint', () => {
let admin: TestAccount;
beforeEach(async () => {
@@ -841,12 +1083,23 @@ describe('Auth SSO flow', () => {
await disableSso(harness, admin.token);
});
it('does not advertise enabled SSO when optional SSO cannot resolve claims', async () => {
+ const issuer = 'https://1.1.1.1/realms/no-claims';
+ server.use(
+ http.get(`${issuer}/.well-known/openid-configuration`, () =>
+ HttpResponse.json({
+ issuer,
+ authorization_endpoint: `${issuer}/auth`,
+ token_endpoint: `${issuer}/token`,
+ }),
+ ),
+ );
await createBuilder(harness, admin.token)
.patch('/admin/instance/config')
.body({
sso: {
enabled: true,
enforced: false,
+ issuer,
authorization_url: 'https://1.1.1.1/oauth2/authorize',
token_url: 'https://1.1.1.1/oauth2/token',
userinfo_url: null,
diff --git a/fluxer_api/src/api/auth/tests/SsoGroupRoles.test.ts b/fluxer_api/src/api/auth/tests/SsoGroupRoles.test.ts
index 142d9c454..4175ef31c 100644
--- a/fluxer_api/src/api/auth/tests/SsoGroupRoles.test.ts
+++ b/fluxer_api/src/api/auth/tests/SsoGroupRoles.test.ts
@@ -75,10 +75,13 @@ describe('SSO groups to community roles', () => {
}
async function signIn(claims: Record<string, unknown>): Promise<string> {
- const {state} = await createBuilderWithoutAuth<{state: string}>(harness).post('/auth/sso/start').body({}).execute();
+ const {state, client_binding} = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
const login = await createBuilderWithoutAuth<{user_id: string}>(harness)
.post('/auth/sso/complete')
- .body({code: JSON.stringify(claims), state})
+ .body({code: JSON.stringify(claims), state, client_binding})
.expect(200)
.execute();
return login.user_id;
@@ -106,10 +109,31 @@ describe('SSO groups to community roles', () => {
expect(await rolesOf(userId)).toEqual([handRole]);
});
- it('leaves the roles alone when the provider sends no groups claim', async () => {
+ it('removes the mapped roles when the provider sends no groups claim', async () => {
await enableWithMappings();
const claims = {sub: subject('absent'), email: createUniqueEmail('sso-groups-absent')};
const userId = await signIn({...claims, groups: ['staff']});
+ await addMemberRole(harness, owner.token, guildId, userId, handRole);
+ await signIn(claims);
+ expect(await rolesOf(userId)).toEqual([handRole]);
+ });
+
+ it('removes the mapped roles when the provider has too many groups to send', async () => {
+ await enableWithMappings();
+ const claims = {sub: subject('overage'), email: createUniqueEmail('sso-groups-overage')};
+ const userId = await signIn({...claims, groups: ['staff']});
+ await signIn({...claims, _claim_names: {groups: 'src1'}, _claim_sources: {src1: {endpoint: 'https://graph'}}});
+ expect(await rolesOf(userId)).toEqual([]);
+ });
+
+ it('leaves the roles alone when no groups are mapped', async () => {
+ await enableWithMappings();
+ const claims = {sub: subject('unmapped'), email: createUniqueEmail('sso-groups-unmapped')};
+ const userId = await signIn({...claims, groups: ['staff']});
+ await createBuilder(harness, admin.token)
+ .patch('/admin/instance/config')
+ .body({sso: {group_role_mappings: []}})
+ .execute();
await signIn(claims);
expect(await rolesOf(userId)).toEqual([staffRole]);
});
diff --git a/fluxer_api/src/api/auth/tests/SsoIssuer.test.ts b/fluxer_api/src/api/auth/tests/SsoIssuer.test.ts
new file mode 100644
index 000000000..3baf1744e
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoIssuer.test.ts
@@ -0,0 +1,353 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {SsoIdentityRepository} from '@app/api/auth/services/SsoIdentityRepository';
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ enableSso,
+ setUserACLs,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import {createUserID} from '@app/api/BrandedTypes';
+import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {server} from '@app/api/test/msw/server';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
+import {exportJWK, generateKeyPair, SignJWT} from 'jose';
+import {HttpResponse, http} from 'msw';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'vitest';
+
+const ISSUER = 'https://1.1.1.1/realms/issuer';
+const CLIENT_ID = 'issuer-client';
+
+interface SsoStartResponse {
+ authorization_url: string;
+ state: string;
+ client_binding: string;
+}
+
+interface ErrorBody {
+ code: string;
+ errors?: Array<{path: string; code: string}>;
+}
+
+describe('SSO issuer', () => {
+ let harness: ApiTestHarness;
+ let admin: TestAccount;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ 'admin:authenticate',
+ 'instance:config:update',
+ 'instance:config:view',
+ ]);
+ });
+ afterEach(async () => {
+ await disableSso(harness, admin.token);
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ function saveSso(sso: Record<string, unknown>) {
+ return createBuilder<ErrorBody>(harness, admin.token).patch('/admin/instance/config').body({sso});
+ }
+
+ async function signInWithTestProvider(sub: string): Promise<string> {
+ const start = await createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
+ const login = await createBuilderWithoutAuth<{user_id: string}>(harness)
+ .post('/auth/sso/complete')
+ .body({
+ code: JSON.stringify({sub, email: createUniqueEmail('sso-issuer')}),
+ state: start.state,
+ client_binding: start.client_binding,
+ })
+ .execute();
+ return login.user_id;
+ }
+
+ async function holderOf(providerId: string, sub: string): Promise<string | undefined> {
+ return (await new SsoIdentityRepository().findUserId(providerId, sub))?.toString();
+ }
+
+ function subject(label: string): string {
+ return `itest-issuer-${label}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+ }
+
+ describe('at runtime', () => {
+ async function useIdTokenProvider(): Promise<CryptoKey> {
+ const {publicKey, privateKey} = await generateKeyPair('RS256');
+ const jwk = {...(await exportJWK(publicKey)), kid: 'issuer-key', alg: 'RS256'};
+ server.use(
+ http.get(`${ISSUER}/.well-known/openid-configuration`, () =>
+ HttpResponse.json({
+ issuer: ISSUER,
+ authorization_endpoint: `${ISSUER}/auth`,
+ token_endpoint: `${ISSUER}/token`,
+ jwks_uri: `${ISSUER}/certs`,
+ }),
+ ),
+ http.get(`${ISSUER}/certs`, () => HttpResponse.json({keys: [jwk]})),
+ );
+ await saveSso({
+ enabled: true,
+ enforced: false,
+ issuer: ISSUER,
+ authorization_url: null,
+ token_url: null,
+ userinfo_url: null,
+ jwks_url: null,
+ client_id: CLIENT_ID,
+ allowed_domains: [],
+ auto_provision: true,
+ }).execute();
+ return privateKey;
+ }
+
+ function completeWithIdTokenFrom(privateKey: CryptoKey, iss: string) {
+ return {
+ async expect(status: number) {
+ const start = await createBuilderWithoutAuth<SsoStartResponse>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ const nonce = new URL(start.authorization_url).searchParams.get('nonce');
+ const idToken = await new SignJWT({nonce, email: createUniqueEmail('sso-iss'), email_verified: true})
+ .setProtectedHeader({alg: 'RS256', kid: 'issuer-key'})
+ .setIssuer(iss)
+ .setAudience(CLIENT_ID)
+ .setSubject(subject('iss'))
+ .setIssuedAt()
+ .setExpirationTime('5m')
+ .sign(privateKey);
+ server.use(
+ http.post(`${ISSUER}/token`, () =>
+ HttpResponse.json({id_token: idToken, access_token: 'issuer-access', token_type: 'Bearer'}),
+ ),
+ );
+ return createBuilderWithoutAuth<ErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code: 'issuer-code', state: start.state, client_binding: start.client_binding})
+ .expect(status)
+ .execute();
+ },
+ };
+ }
+
+ it('signs in with an id_token from the configured issuer', async () => {
+ const privateKey = await useIdTokenProvider();
+ await completeWithIdTokenFrom(privateKey, ISSUER).expect(200);
+ });
+
+ it('rejects an id_token from another issuer', async () => {
+ const privateKey = await useIdTokenProvider();
+ const body = await completeWithIdTokenFrom(privateKey, 'https://1.1.1.1/realms/other').expect(400);
+ expect(body.errors).toEqual([expect.objectContaining({code: ValidationErrorCodes.INVALID_SSO_TOKEN})]);
+ });
+
+ describe('with every endpoint filled in', () => {
+ const MANUAL_ISSUER = 'https://1.1.1.1/application/o/fluxer';
+
+ async function useManualProvider(savedIssuer: string): Promise<CryptoKey> {
+ const {publicKey, privateKey} = await generateKeyPair('RS256');
+ const jwk = {...(await exportJWK(publicKey)), kid: 'issuer-key', alg: 'RS256'};
+ server.use(http.get(`${MANUAL_ISSUER}/certs`, () => HttpResponse.json({keys: [jwk]})));
+ await saveSso({
+ enabled: true,
+ enforced: false,
+ issuer: savedIssuer,
+ authorization_url: `${MANUAL_ISSUER}/authorize`,
+ token_url: `${ISSUER}/token`,
+ userinfo_url: null,
+ jwks_url: `${MANUAL_ISSUER}/certs`,
+ client_id: CLIENT_ID,
+ allowed_domains: [],
+ auto_provision: true,
+ })
+ .expect(200)
+ .execute();
+ return privateKey;
+ }
+
+ it('accepts an id_token whose issuer ends in a slash the saved issuer lacks', async () => {
+ const privateKey = await useManualProvider(MANUAL_ISSUER);
+ await completeWithIdTokenFrom(privateKey, `${MANUAL_ISSUER}/`).expect(200);
+ });
+
+ it('accepts an id_token whose issuer lacks the slash the saved issuer ends in', async () => {
+ const privateKey = await useManualProvider(`${MANUAL_ISSUER}/`);
+ await completeWithIdTokenFrom(privateKey, MANUAL_ISSUER).expect(200);
+ });
+
+ it('still rejects an id_token from another issuer', async () => {
+ const privateKey = await useManualProvider(MANUAL_ISSUER);
+ await completeWithIdTokenFrom(privateKey, `${MANUAL_ISSUER}-other`).expect(400);
+ });
+ });
+
+ it('reports a stored config without an issuer as not ready', async () => {
+ await getInstanceConfigRepository().setSsoConfig({
+ enabled: true,
+ issuer: null,
+ authorizationUrl: 'https://1.1.1.1/auth',
+ tokenUrl: 'https://1.1.1.1/token',
+ userInfoUrl: 'https://1.1.1.1/userinfo',
+ jwksUrl: 'https://1.1.1.1/certs',
+ clientId: CLIENT_ID,
+ });
+ const status = await createBuilderWithoutAuth<{enabled: boolean}>(harness).get('/auth/sso/status').execute();
+ expect(status.enabled).toBe(false);
+ });
+ });
+
+ describe('when it changes', () => {
+ const OLD_AUTHORIZATION_URL = 'https://1.1.1.1/legacy/auth';
+ const NEW_ISSUER = 'https://1.1.1.1/realms/added';
+
+ async function linkWithoutIssuer(label: string): Promise<{sub: string; userId: string}> {
+ await getInstanceConfigRepository().setSsoConfig({
+ enabled: true,
+ enforced: false,
+ issuer: null,
+ authorizationUrl: OLD_AUTHORIZATION_URL,
+ tokenUrl: 'https://1.1.1.1/legacy/token',
+ userInfoUrl: 'https://1.1.1.1/legacy/userinfo',
+ jwksUrl: null,
+ clientId: CLIENT_ID,
+ });
+ const account = await createTestAccount(harness);
+ const sub = subject(label);
+ await new SsoIdentityRepository().tryClaimIdentity({
+ providerId: OLD_AUTHORIZATION_URL,
+ subject: sub,
+ userId: createUserID(BigInt(account.userId)),
+ claimedAt: new Date(),
+ });
+ return {sub, userId: account.userId};
+ }
+
+ function discoverNewIssuerWith(authorizationEndpoint: string) {
+ server.use(
+ http.get(`${NEW_ISSUER}/.well-known/openid-configuration`, () =>
+ HttpResponse.json({
+ issuer: NEW_ISSUER,
+ authorization_endpoint: authorizationEndpoint,
+ token_endpoint: `${NEW_ISSUER}/token`,
+ jwks_uri: `${NEW_ISSUER}/certs`,
+ }),
+ ),
+ );
+ }
+
+ it('moves the links when the new issuer discovers the same authorization endpoint', async () => {
+ const {sub, userId} = await linkWithoutIssuer('added');
+ discoverNewIssuerWith(OLD_AUTHORIZATION_URL);
+ await saveSso({issuer: NEW_ISSUER}).expect(200).execute();
+ expect(await holderOf(NEW_ISSUER, sub)).toBe(userId);
+ expect(await holderOf(OLD_AUTHORIZATION_URL, sub)).toBeUndefined();
+ });
+
+ it('refuses an added issuer that discovers another authorization endpoint', async () => {
+ const {sub, userId} = await linkWithoutIssuer('other-endpoint');
+ discoverNewIssuerWith(`${NEW_ISSUER}/auth`);
+ const body = await saveSso({issuer: NEW_ISSUER}).expect(400).execute();
+ expect(body.errors).toEqual([
+ expect.objectContaining({path: 'issuer', code: ValidationErrorCodes.SSO_ISSUER_CHANGE_HAS_IDENTITIES}),
+ ]);
+ expect(await holderOf(OLD_AUTHORIZATION_URL, sub)).toBe(userId);
+ });
+
+ it('refuses an added issuer whose discovery fails', async () => {
+ const {sub, userId} = await linkWithoutIssuer('no-discovery');
+ server.use(
+ http.get(`${NEW_ISSUER}/.well-known/openid-configuration`, () => new HttpResponse(null, {status: 503})),
+ );
+ const body = await saveSso({issuer: NEW_ISSUER}).expect(400).execute();
+ expect(body.errors).toEqual([
+ expect.objectContaining({path: 'issuer', code: ValidationErrorCodes.SSO_ISSUER_CHANGE_HAS_IDENTITIES}),
+ ]);
+ expect(await holderOf(OLD_AUTHORIZATION_URL, sub)).toBe(userId);
+ });
+
+ it('moves the links when only a trailing slash changes', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-slash'});
+ const sub = subject('slash');
+ const userId = await signInWithTestProvider(sub);
+ await saveSso({issuer: 'test-slash/'}).expect(200).execute();
+ expect(await holderOf('test-slash/', sub)).toBe(userId);
+ });
+
+ it('refuses a new issuer while accounts are linked to the old one', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-old'});
+ await signInWithTestProvider(subject('refused'));
+ const body = await saveSso({issuer: 'test-new'}).expect(400).execute();
+ expect(body.errors).toEqual([
+ expect.objectContaining({path: 'issuer', code: ValidationErrorCodes.SSO_ISSUER_CHANGE_HAS_IDENTITIES}),
+ ]);
+ });
+
+ it('moves the links to the new issuer when asked', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-old'});
+ const sub = subject('moved');
+ const userId = await signInWithTestProvider(sub);
+ await saveSso({issuer: 'test-new', migrate_identities: true}).expect(200).execute();
+ expect(await holderOf('test-new', sub)).toBe(userId);
+ });
+
+ it('keeps the links when SSO is turned off and the issuer cleared', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-cleared'});
+ const sub = subject('cleared');
+ const userId = await signInWithTestProvider(sub);
+ await saveSso({enabled: false, issuer: null}).expect(200).execute();
+ expect(await holderOf('test-cleared', sub)).toBe(userId);
+ });
+
+ async function signInWithEmail(sub: string, email: string, status: number) {
+ const start = await createBuilderWithoutAuth<SsoStartResponse>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ return createBuilderWithoutAuth<{user_id?: string} & ErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code: JSON.stringify({sub, email}), state: start.state, client_binding: start.client_binding})
+ .expect(status)
+ .execute();
+ }
+
+ it('links an account to a different provider by email once the old links are left behind', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-first-provider'});
+ const email = createUniqueEmail('sso-switch');
+ const first = await signInWithEmail(subject('first'), email, 200);
+ await saveSso({issuer: 'test-second-provider', migrate_identities: false}).expect(200).execute();
+ const second = await signInWithEmail(subject('second'), email, 200);
+ expect(second.user_id).toBe(first.user_id);
+ });
+
+ it('refuses a sign-in from a different provider after its links were moved there by mistake', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-first-provider'});
+ const email = createUniqueEmail('sso-switch-moved');
+ await signInWithEmail(subject('first'), email, 200);
+ await saveSso({issuer: 'test-second-provider', migrate_identities: true}).expect(200).execute();
+ const body = await signInWithEmail(subject('second'), email, 400);
+ expect(body.errors).toEqual([
+ expect.objectContaining({code: ValidationErrorCodes.SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY}),
+ ]);
+ });
+
+ it('leaves the links on the old issuer when asked', async () => {
+ await enableSso(harness, admin.token, {enforced: false, issuer: 'test-old'});
+ const sub = subject('left');
+ const userId = await signInWithTestProvider(sub);
+ await saveSso({issuer: 'test-new', migrate_identities: false}).expect(200).execute();
+ expect(await holderOf('test-old', sub)).toBe(userId);
+ expect(await holderOf('test-new', sub)).toBeUndefined();
+ });
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SsoProviderOutage.test.ts b/fluxer_api/src/api/auth/tests/SsoProviderOutage.test.ts
new file mode 100644
index 000000000..95dd2a5f5
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoProviderOutage.test.ts
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {createHash} from 'node:crypto';
+import {ssoDiscoveryCacheKey} from '@app/api/auth/services/SsoService';
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ enableSso,
+ setUserACLs,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import {getCacheService} from '@app/api/middleware/ServiceSingletons';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {server} from '@app/api/test/msw/server';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {HttpResponse, http} from 'msw';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'vitest';
+
+const ISSUER = 'https://1.1.1.1/realms/outage';
+const DISCOVERY_URL = `${ISSUER}/.well-known/openid-configuration`;
+
+const DISCOVERY_DOCUMENT = {
+ issuer: ISSUER,
+ authorization_endpoint: `${ISSUER}/auth`,
+ token_endpoint: `${ISSUER}/token`,
+ userinfo_endpoint: `${ISSUER}/userinfo`,
+ jwks_uri: `${ISSUER}/certs`,
+};
+
+interface SsoStatusResponse {
+ enabled: boolean;
+ enforced: boolean;
+}
+
+interface ConfigSaveResponse {
+ warnings: Array<string>;
+ errors: Array<{path: string; code: string}>;
+}
+
+describe('SSO while the provider is unreachable', () => {
+ let harness: ApiTestHarness;
+ let admin: TestAccount;
+ let discoveryRequests = 0;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ discoveryRequests = 0;
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ 'admin:authenticate',
+ 'instance:config:update',
+ 'instance:config:view',
+ ]);
+ });
+ afterEach(async () => {
+ await disableSso(harness, admin.token);
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ function providerUp(): void {
+ server.use(
+ http.get(DISCOVERY_URL, () => {
+ discoveryRequests++;
+ return HttpResponse.json(DISCOVERY_DOCUMENT);
+ }),
+ );
+ }
+
+ function providerDown(): void {
+ server.use(
+ http.get(DISCOVERY_URL, () => {
+ discoveryRequests++;
+ return HttpResponse.error();
+ }),
+ );
+ }
+
+ function saveIssuerSso(enforced: boolean) {
+ return createBuilder<ConfigSaveResponse>(harness, admin.token)
+ .patch('/admin/instance/config')
+ .body({
+ sso: {
+ enabled: true,
+ enforced,
+ issuer: ISSUER,
+ authorization_url: null,
+ token_url: null,
+ userinfo_url: null,
+ jwks_url: null,
+ client_id: 'outage-client',
+ allowed_domains: [],
+ auto_provision: true,
+ migrate_identities: false,
+ },
+ });
+ }
+
+ async function requireSsoThenLoseProvider(): Promise<void> {
+ providerUp();
+ await saveIssuerSso(true).expect(200).execute();
+ providerDown();
+ discoveryRequests = 0;
+ }
+
+ async function getStatus(): Promise<SsoStatusResponse> {
+ return createBuilderWithoutAuth<SsoStatusResponse>(harness).get('/auth/sso/status').execute();
+ }
+
+ it('still refuses password sign-in', async () => {
+ const local = await createTestAccount(harness);
+ await requireSsoThenLoseProvider();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/login')
+ .body({email: local.email, password: local.password})
+ .expect(403, 'SSO_REQUIRED')
+ .execute();
+ });
+
+ it('still refuses an MFA ticket', async () => {
+ await requireSsoThenLoseProvider();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/login/mfa/totp')
+ .body({code: '123456', ticket: 'outage-ticket'})
+ .expect(403, 'SSO_REQUIRED')
+ .execute();
+ });
+
+ it('still treats the credentials of SSO accounts as managed by the provider', async () => {
+ await enableSso(harness, admin.token);
+ const start = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ const login = await createBuilderWithoutAuth<{token: string}>(harness)
+ .post('/auth/sso/complete')
+ .body({code: createUniqueEmail('sso-outage'), state: start.state, client_binding: start.client_binding})
+ .execute();
+ await createBuilder(harness, login.token)
+ .put('/users/@me/date-of-birth')
+ .body({date_of_birth: '1990-01-01'})
+ .execute();
+ await requireSsoThenLoseProvider();
+ await createBuilder(harness, login.token)
+ .post('/users/@me/password-change/start')
+ .body({})
+ .expect(403, 'SSO_REQUIRED')
+ .execute();
+ });
+
+ it('reports SSO as required but not available', async () => {
+ await requireSsoThenLoseProvider();
+ expect(await getStatus()).toMatchObject({enabled: false, enforced: true});
+ });
+
+ it('reports the provider as unavailable when a sign-in starts during the outage', async () => {
+ await requireSsoThenLoseProvider();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .expect(503, 'SSO_PROVIDER_UNAVAILABLE')
+ .execute();
+ });
+
+ it('still reports SSO that is turned off as disabled', async () => {
+ await disableSso(harness, admin.token);
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .expect(403, 'FEATURE_TEMPORARILY_DISABLED')
+ .execute();
+ });
+
+ it('asks the provider only once for two status checks in a row', async () => {
+ await requireSsoThenLoseProvider();
+ await getStatus();
+ await getStatus();
+ expect(discoveryRequests).toBe(1);
+ });
+
+ it('keeps using the last discovered endpoints when a refresh fails', async () => {
+ await requireSsoThenLoseProvider();
+ const twoHoursAgo = Date.now() - 2 * 60 * 60 * 1000;
+ await getCacheService().set(
+ ssoDiscoveryCacheKey(ISSUER),
+ {metadata: DISCOVERY_DOCUMENT, fetchedAt: twoHoursAgo, failed: false},
+ 3600,
+ );
+ expect(await getStatus()).toMatchObject({enabled: true, enforced: true});
+ expect(discoveryRequests).toBe(1);
+ });
+
+ it('leaves discovery entries from older servers alone and does not read them', async () => {
+ providerUp();
+ await saveIssuerSso(true).expect(200).execute();
+ const olderServerKey = `sso:oidc-discovery:${createHash('sha256').update(ISSUER).digest('hex').slice(0, 32)}`;
+ const olderServerEntry = {issuer: ISSUER};
+ await getCacheService().set(olderServerKey, olderServerEntry, 3600);
+ expect(await getStatus()).toMatchObject({enabled: true, enforced: true});
+ expect(await getCacheService().get(olderServerKey)).toEqual(olderServerEntry);
+ });
+
+ it('refuses to turn on Require SSO while the provider is unreachable', async () => {
+ providerDown();
+ const refused = await saveIssuerSso(true).expect(400).execute();
+ expect(refused.errors).toEqual([expect.objectContaining({path: 'sso', code: 'SSO_DISCOVERY_FAILED'})]);
+ });
+
+ it('saves optional SSO with a warning while the provider is unreachable', async () => {
+ providerDown();
+ const saved = await saveIssuerSso(false).expect(200).execute();
+ expect(saved.warnings).toHaveLength(1);
+ });
+
+ it('saves without a warning when the provider answers', async () => {
+ providerUp();
+ const saved = await saveIssuerSso(false).expect(200).execute();
+ expect(saved.warnings).toEqual([]);
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SsoProviderRequests.test.ts b/fluxer_api/src/api/auth/tests/SsoProviderRequests.test.ts
new file mode 100644
index 000000000..bcf8b2525
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoProviderRequests.test.ts
@@ -0,0 +1,392 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {randomUUID} from 'node:crypto';
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ setUserACLs,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {server} from '@app/api/test/msw/server';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
+import {exportJWK, generateKeyPair, SignJWT} from 'jose';
+import {HttpResponse, http} from 'msw';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from 'vitest';
+
+const ISSUER = 'https://1.1.1.1/realms/requests';
+const CLIENT_ID = 'requests-client';
+const SECRET = 'requests-secret';
+
+interface SsoStartResponse {
+ authorization_url: string;
+ state: string;
+ client_binding: string;
+}
+
+interface ErrorBody {
+ code: string;
+ errors?: Array<{path: string; code: string}>;
+}
+
+interface TokenRequest {
+ authorization: string | null;
+ body: URLSearchParams;
+}
+
+interface ProviderOptions {
+ authMethods?: Array<string>;
+ jwks?: boolean;
+ clientSecret?: string;
+}
+
+describe('SSO requests to the provider', () => {
+ let harness: ApiTestHarness;
+ let admin: TestAccount;
+ let tokenRequests: Array<TokenRequest>;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ tokenRequests = [];
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ 'admin:authenticate',
+ 'instance:config:update',
+ 'instance:config:view',
+ ]);
+ });
+ afterEach(async () => {
+ await disableSso(harness, admin.token);
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ async function useProvider({authMethods, jwks = false, clientSecret = SECRET}: ProviderOptions = {}): Promise<void> {
+ server.use(
+ http.get(`${ISSUER}/.well-known/openid-configuration`, () =>
+ HttpResponse.json({
+ issuer: ISSUER,
+ authorization_endpoint: `${ISSUER}/auth`,
+ token_endpoint: `${ISSUER}/token`,
+ userinfo_endpoint: `${ISSUER}/userinfo`,
+ ...(jwks ? {jwks_uri: `${ISSUER}/certs`} : {}),
+ ...(authMethods ? {token_endpoint_auth_methods_supported: authMethods} : {}),
+ }),
+ ),
+ http.get(`${ISSUER}/userinfo`, () =>
+ HttpResponse.json({
+ sub: `itest-requests-${randomUUID()}`,
+ email: createUniqueEmail('sso-requests'),
+ email_verified: true,
+ }),
+ ),
+ );
+ await createBuilder(harness, admin.token)
+ .patch('/admin/instance/config')
+ .body({
+ sso: {
+ enabled: true,
+ enforced: false,
+ issuer: ISSUER,
+ authorization_url: null,
+ token_url: null,
+ userinfo_url: null,
+ jwks_url: null,
+ client_id: CLIENT_ID,
+ client_secret: clientSecret,
+ allowed_domains: [],
+ auto_provision: true,
+ },
+ })
+ .execute();
+ }
+
+ function tokenEndpoint(respond: (request: TokenRequest) => Response | undefined = () => undefined): void {
+ server.use(
+ http.post(`${ISSUER}/token`, async ({request}) => {
+ const tokenRequest = {
+ authorization: request.headers.get('authorization'),
+ body: new URLSearchParams(await request.text()),
+ };
+ tokenRequests.push(tokenRequest);
+ return (
+ respond(tokenRequest) ??
+ HttpResponse.json({access_token: `access-${tokenRequests.length}`, token_type: 'Bearer'})
+ );
+ }),
+ );
+ }
+
+ async function start(): Promise<SsoStartResponse> {
+ return createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
+ }
+
+ async function complete(status: number, code = 'provider-code'): Promise<ErrorBody> {
+ const {state, client_binding} = await start();
+ return createBuilderWithoutAuth<ErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code, state, client_binding})
+ .expect(status)
+ .execute();
+ }
+
+ function decodeBasic(header: string | null): Array<string> {
+ const decoded = Buffer.from((header ?? '').replace(/^Basic /, ''), 'base64').toString();
+ return decoded.split(':').map((part) => decodeURIComponent(part.replace(/\+/g, ' ')));
+ }
+
+ function errorCodes(body: ErrorBody): Array<string> {
+ return (body.errors ?? []).map((error) => error.code);
+ }
+
+ describe('client authentication', () => {
+ it('sends the secret in the body when the provider lists both methods', async () => {
+ await useProvider({authMethods: ['client_secret_basic', 'client_secret_post']});
+ tokenEndpoint();
+ await complete(200);
+ expect(tokenRequests.map((request) => (request.authorization ? 'basic' : 'post'))).toEqual(['post']);
+ expect(tokenRequests[0]!.body.get('client_secret')).toBe(SECRET);
+ });
+
+ it('uses Basic auth when the provider lists only that', async () => {
+ await useProvider({authMethods: ['client_secret_basic']});
+ tokenEndpoint();
+ await complete(200);
+ expect(decodeBasic(tokenRequests[0]!.authorization)).toEqual([CLIENT_ID, SECRET]);
+ expect(tokenRequests[0]!.body.has('client_secret')).toBe(false);
+ });
+
+ it('sends the secret in the body when the provider only lists that', async () => {
+ await useProvider({authMethods: ['client_secret_post']});
+ tokenEndpoint();
+ await complete(200);
+ expect(tokenRequests[0]!.authorization).toBeNull();
+ expect(tokenRequests[0]!.body.get('client_secret')).toBe(SECRET);
+ });
+
+ it('form-encodes a secret with a colon and a percent sign for Basic auth', async () => {
+ await useProvider({authMethods: ['client_secret_basic'], clientSecret: 'a:b%c d'});
+ tokenEndpoint();
+ await complete(200);
+ const expected = Buffer.from(`${CLIENT_ID}:a%3Ab%25c+d`).toString('base64');
+ expect(tokenRequests[0]!.authorization).toBe(`Basic ${expected}`);
+ });
+
+ it('uses Basic auth first when the provider lists no methods', async () => {
+ await useProvider();
+ tokenEndpoint();
+ await complete(200);
+ expect(tokenRequests.map((request) => (request.authorization ? 'basic' : 'post'))).toEqual(['basic']);
+ expect(decodeBasic(tokenRequests[0]!.authorization)).toEqual([CLIENT_ID, SECRET]);
+ });
+
+ it('switches to the body once Basic auth is refused, and remembers it', async () => {
+ await useProvider();
+ tokenEndpoint(({authorization}) =>
+ authorization ? HttpResponse.json({error: 'invalid_client'}, {status: 401}) : undefined,
+ );
+ await complete(200);
+ await complete(200);
+ expect(tokenRequests.map((request) => (request.authorization ? 'basic' : 'post'))).toEqual([
+ 'basic',
+ 'post',
+ 'post',
+ ]);
+ });
+
+ it('switches to Basic auth when the provider lists both and turns the body down with another error', async () => {
+ await useProvider({authMethods: ['client_secret_post', 'client_secret_basic']});
+ tokenEndpoint(({authorization}) =>
+ authorization ? undefined : HttpResponse.json({error: 'unauthorized_client'}, {status: 400}),
+ );
+ await complete(200);
+ expect(tokenRequests.map((request) => (request.authorization ? 'basic' : 'post'))).toEqual(['post', 'basic']);
+ });
+
+ it('switches to the body when the provider lists only Basic auth and turns it down', async () => {
+ await useProvider({authMethods: ['client_secret_basic']});
+ tokenEndpoint(({authorization}) =>
+ authorization ? HttpResponse.json({error: 'invalid_request'}, {status: 400}) : undefined,
+ );
+ await complete(200);
+ expect(tokenRequests.map((request) => (request.authorization ? 'basic' : 'post'))).toEqual(['basic', 'post']);
+ });
+
+ it('keeps a public client id in the body', async () => {
+ await useProvider({authMethods: ['client_secret_basic'], clientSecret: ''});
+ tokenEndpoint();
+ await complete(200);
+ expect(tokenRequests[0]!.authorization).toBeNull();
+ expect(tokenRequests[0]!.body.get('client_id')).toBe(CLIENT_ID);
+ expect(tokenRequests[0]!.body.has('client_secret')).toBe(false);
+ });
+ });
+
+ describe('token errors', () => {
+ it('reports a refused client as misconfigured', async () => {
+ await useProvider({authMethods: ['client_secret_basic']});
+ tokenEndpoint(() => HttpResponse.json({error: 'invalid_client'}, {status: 401}));
+ expect(errorCodes(await complete(400))).toEqual([ValidationErrorCodes.SSO_MISCONFIGURED]);
+ });
+
+ it('reports a client the provider turns away with any 401 as misconfigured', async () => {
+ await useProvider();
+ tokenEndpoint(() => HttpResponse.json({error: 'access_denied'}, {status: 401}));
+ expect(errorCodes(await complete(400))).toEqual([ValidationErrorCodes.SSO_MISCONFIGURED]);
+ expect(tokenRequests).toHaveLength(2);
+ });
+
+ it('reports a server error from the token endpoint as unavailable', async () => {
+ await useProvider();
+ tokenEndpoint(() => HttpResponse.json({error: 'server_error'}, {status: 502}));
+ const {state, client_binding} = await start();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/complete')
+ .body({code: 'provider-code', state, client_binding})
+ .expect(503, 'SSO_PROVIDER_UNAVAILABLE')
+ .execute();
+ });
+
+ it('reports a refused code as an invalid code', async () => {
+ await useProvider({authMethods: ['client_secret_basic']});
+ tokenEndpoint(() => HttpResponse.json({error: 'invalid_grant'}, {status: 400}));
+ expect(errorCodes(await complete(400))).toEqual([ValidationErrorCodes.INVALID_SSO_AUTHORIZATION_CODE]);
+ expect(tokenRequests).toHaveLength(1);
+ });
+ });
+
+ it('does not follow a redirect from the token endpoint', async () => {
+ await useProvider({authMethods: ['client_secret_post']});
+ let redirectedRequests = 0;
+ server.use(
+ http.post(`${ISSUER}/token`, () => new HttpResponse(null, {status: 307, headers: {location: `${ISSUER}/moved`}})),
+ http.post(`${ISSUER}/moved`, () => {
+ redirectedRequests++;
+ return HttpResponse.json({access_token: 'moved-access', token_type: 'Bearer'});
+ }),
+ );
+ expect(errorCodes(await complete(400))).toEqual([ValidationErrorCodes.SSO_MISCONFIGURED]);
+ expect(redirectedRequests).toBe(0);
+ });
+
+ it('reports a redirecting userinfo URL as misconfigured', async () => {
+ await useProvider({authMethods: ['client_secret_basic']});
+ tokenEndpoint();
+ server.use(
+ http.get(
+ `${ISSUER}/userinfo`,
+ () => new HttpResponse(null, {status: 302, headers: {location: `${ISSUER}/userinfo/`}}),
+ ),
+ );
+ expect(errorCodes(await complete(400))).toEqual([ValidationErrorCodes.SSO_MISCONFIGURED]);
+ });
+
+ it('reports a token endpoint that does not answer as unavailable', async () => {
+ await useProvider({authMethods: ['client_secret_post']});
+ server.use(http.post(`${ISSUER}/token`, () => HttpResponse.error()));
+ const {state, client_binding} = await start();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/complete')
+ .body({code: 'provider-code', state, client_binding})
+ .expect(503, 'SSO_PROVIDER_UNAVAILABLE')
+ .execute();
+ });
+
+ it('reports a userinfo endpoint that does not answer as unavailable', async () => {
+ await useProvider({authMethods: ['client_secret_post']});
+ tokenEndpoint();
+ server.use(http.get(`${ISSUER}/userinfo`, () => HttpResponse.error()));
+ const {state, client_binding} = await start();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/complete')
+ .body({code: 'provider-code', state, client_binding})
+ .expect(503, 'SSO_PROVIDER_UNAVAILABLE')
+ .execute();
+ });
+
+ it('refuses a signed userinfo response', async () => {
+ await useProvider({authMethods: ['client_secret_basic']});
+ tokenEndpoint();
+ server.use(
+ http.get(
+ `${ISSUER}/userinfo`,
+ () => new HttpResponse('eyJhbGciOiJSUzI1NiJ9.e30.sig', {headers: {'content-type': 'application/jwt'}}),
+ ),
+ );
+ expect(errorCodes(await complete(400))).toEqual([ValidationErrorCodes.SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED]);
+ });
+
+ describe('provider keys', () => {
+ let jwksRequests: number;
+
+ async function useIdTokenProvider(): Promise<CryptoKey> {
+ jwksRequests = 0;
+ const {publicKey, privateKey} = await generateKeyPair('RS256');
+ const jwk = {...(await exportJWK(publicKey)), kid: 'requests-key', alg: 'RS256'};
+ server.use(
+ http.get(`${ISSUER}/certs`, () => {
+ jwksRequests++;
+ return HttpResponse.json({keys: [jwk]});
+ }),
+ );
+ await useProvider({authMethods: ['client_secret_basic'], jwks: true});
+ tokenEndpoint(({body}) => HttpResponse.json({id_token: body.get('code'), token_type: 'Bearer'}));
+ return privateKey;
+ }
+
+ async function signIn(privateKey: CryptoKey, status = 200): Promise<ErrorBody> {
+ const {authorization_url, state, client_binding} = await start();
+ const nonce = new URL(authorization_url).searchParams.get('nonce');
+ const idToken = await new SignJWT({nonce, email: createUniqueEmail('sso-keys'), email_verified: true})
+ .setProtectedHeader({alg: 'RS256', kid: 'requests-key'})
+ .setIssuer(ISSUER)
+ .setAudience(CLIENT_ID)
+ .setSubject(`itest-keys-${state}`)
+ .setIssuedAt()
+ .setExpirationTime('5m')
+ .sign(privateKey);
+ return createBuilderWithoutAuth<ErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code: idToken, state, client_binding})
+ .expect(status)
+ .execute();
+ }
+
+ it('reports keys that cannot be fetched as unavailable', async () => {
+ const privateKey = await useIdTokenProvider();
+ server.use(http.get(`${ISSUER}/certs`, () => HttpResponse.error()));
+ expect((await signIn(privateKey, 503)).code).toBe('SSO_PROVIDER_UNAVAILABLE');
+ });
+
+ it('reports a keys URL that answers with a server error as unavailable', async () => {
+ const privateKey = await useIdTokenProvider();
+ server.use(http.get(`${ISSUER}/certs`, () => new HttpResponse(null, {status: 503})));
+ expect((await signIn(privateKey, 503)).code).toBe('SSO_PROVIDER_UNAVAILABLE');
+ });
+
+ it('still reports an id_token signed with another key as invalid', async () => {
+ await useIdTokenProvider();
+ const {privateKey: otherKey} = await generateKeyPair('RS256');
+ expect(errorCodes(await signIn(otherKey, 400))).toEqual([ValidationErrorCodes.INVALID_SSO_TOKEN]);
+ });
+
+ it('fetches the keys once across sign-ins', async () => {
+ const privateKey = await useIdTokenProvider();
+ await signIn(privateKey);
+ await signIn(privateKey);
+ expect(jwksRequests).toBe(1);
+ });
+
+ it('fetches the keys once for sign-ins that arrive together', async () => {
+ const privateKey = await useIdTokenProvider();
+ await Promise.all([signIn(privateKey), signIn(privateKey)]);
+ expect(jwksRequests).toBe(1);
+ });
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SsoProviderUsernames.test.ts b/fluxer_api/src/api/auth/tests/SsoProviderUsernames.test.ts
index 50eab621f..c7823b6f2 100644
--- a/fluxer_api/src/api/auth/tests/SsoProviderUsernames.test.ts
+++ b/fluxer_api/src/api/auth/tests/SsoProviderUsernames.test.ts
@@ -5,12 +5,14 @@ import {
createTestAccount,
disableSso,
enableSso,
+ enableTotp,
setUserACLs,
type TestAccount,
} from '@app/api/auth/tests/AuthTestUtils';
+import {createUserID} from '@app/api/BrandedTypes';
import {getConfig} from '@app/api/Config';
import {profileSubstringBlocklistCache} from '@app/api/middleware/ProfileSubstringBlocklistCache';
-import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
+import {getInstanceConfigRepository, getUserRepository} from '@app/api/middleware/ServiceSingletons';
import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
import {AccountIdentityModes} from '@fluxer/constants/src/AccountIdentityConstants';
@@ -76,11 +78,18 @@ describe('Usernames from the SSO provider', () => {
return `itest-${label}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
}
- async function completeSso(sub: string, preferredUsername?: string): Promise<SsoCompleteResponse> {
- const start = await createBuilderWithoutAuth<{state: string}>(harness).post('/auth/sso/start').body({}).execute();
- return createBuilderWithoutAuth<SsoCompleteResponse>(harness)
+ async function completeSso<T = SsoCompleteResponse>(sub: string, preferredUsername?: string): Promise<T> {
+ const start = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ return createBuilderWithoutAuth<T>(harness)
.post('/auth/sso/complete')
- .body({code: JSON.stringify({sub, preferred_username: preferredUsername}), state: start.state})
+ .body({
+ code: JSON.stringify({sub, preferred_username: preferredUsername}),
+ state: start.state,
+ client_binding: start.client_binding,
+ })
.execute();
}
@@ -129,6 +138,54 @@ describe('Usernames from the SSO provider', () => {
expect(json.errors.map(({path}) => path)).toEqual(['sso.username_from_provider']);
});
+ async function linkWithSecondFactor(account: TestAccount, sub: string): Promise<string> {
+ const link = await createBuilder<{state: string; client_binding: string}>(harness, account.token)
+ .post('/users/@me/sso/link/start')
+ .body({password: account.password})
+ .execute();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/complete')
+ .body({
+ code: JSON.stringify({sub, preferred_username: 'before'}),
+ state: link.state,
+ client_binding: link.client_binding,
+ })
+ .execute();
+ const [backupCode] = await enableTotp(harness, account);
+ return backupCode!;
+ }
+
+ function finishSecondFactor(ticket: string, code: string) {
+ return createBuilderWithoutAuth<SsoCompleteResponse>(harness).post('/auth/login/mfa/totp').body({ticket, code});
+ }
+
+ it('takes a changed provider username once the second factor is done', async () => {
+ const account = await createTestAccount(harness);
+ await enableUsernameSso({enforced: false, username_from_provider: true});
+ const sub = subject('mfa');
+ const backupCode = await linkWithSecondFactor(account, sub);
+ const {ticket} = await completeSso<{ticket: string}>(sub, 'after');
+ const login = await finishSecondFactor(ticket, backupCode).execute();
+ expect((await createBuilder<CurrentUser>(harness, login.token).get('/users/@me').execute()).username).toBe('after');
+ });
+
+ it('keeps the username of a suspended account that finishes the second factor', async () => {
+ const account = await createTestAccount(harness);
+ await enableUsernameSso({enforced: false, username_from_provider: true});
+ const sub = subject('mfa-suspended');
+ const backupCode = await linkWithSecondFactor(account, sub);
+ const users = getUserRepository();
+ const user = (await users.findUnique(createUserID(BigInt(account.userId))))!;
+ await users.patchUpsert(
+ user.id,
+ {flags: user.flags | UserFlags.DISABLED, temp_banned_until: new Date(Date.now() + 3_600_000)},
+ user.toRow(),
+ );
+ const {ticket} = await completeSso<{ticket: string}>(sub, 'after');
+ await finishSecondFactor(ticket, backupCode).expect(403).execute();
+ expect((await users.findUnique(user.id))!.username).toBe(user.username);
+ });
+
describe('while the setting is on', () => {
beforeEach(async () => {
await enableUsernameSso({enforced: false, username_from_provider: true});
diff --git a/fluxer_api/src/api/auth/tests/SsoSelfHosting.test.ts b/fluxer_api/src/api/auth/tests/SsoSelfHosting.test.ts
index 91e9e2ba9..473d10a56 100644
--- a/fluxer_api/src/api/auth/tests/SsoSelfHosting.test.ts
+++ b/fluxer_api/src/api/auth/tests/SsoSelfHosting.test.ts
@@ -8,6 +8,7 @@ import {
createUniqueEmail,
disableSso,
enableSso,
+ enableTotp,
setUserACLs,
type TestAccount,
} from '@app/api/auth/tests/AuthTestUtils';
@@ -27,6 +28,7 @@ import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from '
interface SsoStartResponse {
state: string;
+ client_binding: string;
}
interface SsoCompleteResponse {
@@ -82,24 +84,23 @@ describe('SSO on self-hosted instances', () => {
await getInstanceConfigRepository().setAppPublicConfig({setup: {configured: true}});
}
- async function startState(): Promise<string> {
- const start = await createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
- return start.state;
+ async function startSso(): Promise<SsoStartResponse> {
+ return createBuilderWithoutAuth<SsoStartResponse>(harness).post('/auth/sso/start').body({}).execute();
}
- async function completeSso(claims: Record<string, unknown>): Promise<SsoCompleteResponse> {
- const state = await startState();
- return createBuilderWithoutAuth<SsoCompleteResponse>(harness)
+ async function completeSso<T = SsoCompleteResponse>(claims: Record<string, unknown>): Promise<T> {
+ const {state, client_binding} = await startSso();
+ return createBuilderWithoutAuth<T>(harness)
.post('/auth/sso/complete')
- .body({code: JSON.stringify(claims), state})
+ .body({code: JSON.stringify(claims), state, client_binding})
.execute();
}
async function completeSsoFailure(claims: Record<string, unknown>, status: number): Promise<ValidationErrorBody> {
- const state = await startState();
+ const {state, client_binding} = await startSso();
const {json} = await createBuilderWithoutAuth<ValidationErrorBody>(harness)
.post('/auth/sso/complete')
- .body({code: JSON.stringify(claims), state})
+ .body({code: JSON.stringify(claims), state, client_binding})
.expect(status)
.executeWithResponse();
return json;
@@ -275,6 +276,26 @@ describe('SSO on self-hosted instances', () => {
expect((await new SsoIdentityRepository().findUserId(ISSUER, sub))?.toString()).toBe(second.user_id);
});
+ it('refuses to connect a subject held by enforcement from settings on a username instance', async () => {
+ const other = await createTestAccount(harness);
+ await useUsernameMode();
+ await enableSso(harness, admin.token, {allowed_domains: []});
+ const sub = subject('deleted-link');
+ const email = createUniqueEmail('sso-deleted-link');
+ const first = await completeSso({sub, email, email_verified: true});
+ await deleteAccount(first.user_id, DeletionReasons.SPAM);
+ const {state, client_binding} = await createBuilder<SsoStartResponse>(harness, other.token)
+ .post('/users/@me/sso/link/start')
+ .body({password: other.password})
+ .execute();
+ const body = await createBuilderWithoutAuth<ValidationErrorBody>(harness)
+ .post('/auth/sso/complete')
+ .body({code: JSON.stringify({sub, email, email_verified: true}), state, client_binding})
+ .expect(400)
+ .execute();
+ expect(body.errors?.[0]?.code).toBe(ValidationErrorCodes.SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT);
+ });
+
it.each([
['bound now', false],
['bound before the per-account index', true],
@@ -318,6 +339,21 @@ describe('SSO on self-hosted instances', () => {
expect((await currentUser(second.token)).email).toBe(changed);
});
+ it('takes a changed provider email once the second factor is done', async () => {
+ const account = await createTestAccount(harness);
+ await enableSso(harness, admin.token);
+ const sub = subject('email-mfa');
+ await completeSso({sub, email: account.email});
+ const [backupCode] = await enableTotp(harness, account);
+ const changed = createUniqueEmail('sso-email-mfa');
+ const {ticket} = await completeSso<{ticket: string}>({sub, email: changed});
+ const login = await createBuilderWithoutAuth<SsoCompleteResponse>(harness)
+ .post('/auth/login/mfa/totp')
+ .body({ticket, code: backupCode})
+ .execute();
+ expect((await currentUser(login.token)).email).toBe(changed);
+ });
+
it('keeps the account email when SSO is optional', async () => {
await enableSso(harness, admin.token, {enforced: false});
const sub = subject('email-optional');
diff --git a/fluxer_api/src/api/auth/tests/SsoSessionLifetime.test.ts b/fluxer_api/src/api/auth/tests/SsoSessionLifetime.test.ts
new file mode 100644
index 000000000..81d623fe9
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoSessionLifetime.test.ts
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ enableSso,
+ enableTotp,
+ setUserACLs,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {AdminACLs} from '@fluxer/constants/src/AdminACLs';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from 'vitest';
+
+const DAY_MS = 24 * 60 * 60 * 1000;
+
+describe('SSO session lifetime', () => {
+ let harness: ApiTestHarness;
+ let admin: TestAccount;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ admin = await setUserACLs(harness, await createTestAccount(harness), [
+ AdminACLs.AUTHENTICATE,
+ AdminACLs.INSTANCE_CONFIG_UPDATE,
+ AdminACLs.INSTANCE_CONFIG_VIEW,
+ ]);
+ await enableSso(harness, admin.token, {enforced: false});
+ });
+ afterEach(async () => {
+ vi.useRealTimers();
+ await disableSso(harness, admin.token);
+ getInstanceConfigRepository().clearCacheForTesting();
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ async function signInWithSso(): Promise<{token: string; user_id: string}> {
+ const claims = {sub: `itest-lifetime-${Date.now()}-${Math.random()}`, email: createUniqueEmail('sso-lifetime')};
+ const {state, client_binding} = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ return createBuilderWithoutAuth<{token: string; user_id: string}>(harness)
+ .post('/auth/sso/complete')
+ .body({code: JSON.stringify(claims), state, client_binding})
+ .expect(200)
+ .execute();
+ }
+
+ async function handOff({token, user_id}: {token: string; user_id: string}): Promise<string> {
+ const {code, poll_secret} = await createBuilderWithoutAuth<{code: string; poll_secret: string}>(harness)
+ .post('/auth/handoff/initiate')
+ .body(null)
+ .execute();
+ await createBuilderWithoutAuth(harness).get(`/auth/handoff/${code}/info`).execute();
+ await createBuilder(harness, token).post('/auth/handoff/complete').body({code, user_id}).expect(204).execute();
+ const status = await createBuilderWithoutAuth<{token: string}>(harness)
+ .post(`/auth/handoff/${code}/status`)
+ .body({poll_secret})
+ .execute();
+ return status.token;
+ }
+
+ function travelDays(days: number): void {
+ vi.useFakeTimers({toFake: ['Date']});
+ vi.setSystemTime(Date.now() + days * DAY_MS);
+ }
+
+ it('keeps an SSO session working for 30 days', async () => {
+ const {token} = await signInWithSso();
+ travelDays(29);
+ await createBuilder(harness, token).get('/users/@me').expect(200).execute();
+ });
+
+ it('ends an SSO session after 30 days', async () => {
+ const {token} = await signInWithSso();
+ travelDays(31);
+ await createBuilder(harness, token).get('/users/@me').expect(401).execute();
+ });
+
+ it('ends an SSO session that asked for a second factor after 30 days', async () => {
+ const account = await createTestAccount(harness);
+ const [backupCode] = await enableTotp(harness, account);
+ const {state, client_binding} = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ const {ticket} = await createBuilderWithoutAuth<{ticket: string}>(harness)
+ .post('/auth/sso/complete')
+ .body({code: account.email, state, client_binding})
+ .execute();
+ const {token} = await createBuilderWithoutAuth<{token: string}>(harness)
+ .post('/auth/login/mfa/totp')
+ .body({ticket, code: backupCode})
+ .execute();
+ travelDays(31);
+ await createBuilder(harness, token).get('/users/@me').expect(401).execute();
+ });
+
+ it('ends a session handed to the desktop app at the same time as the SSO session it came from', async () => {
+ const login = await signInWithSso();
+ travelDays(20);
+ const handedToken = await handOff(login);
+ travelDays(11);
+ await createBuilder(harness, handedToken).get('/users/@me').expect(401).execute();
+ });
+
+ it('leaves an SSO session out of the session list after 30 days', async () => {
+ const account = await createTestAccount(harness);
+ const {state, client_binding} = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ await createBuilderWithoutAuth(harness)
+ .post('/auth/sso/complete')
+ .body({code: account.email, state, client_binding})
+ .expect(200)
+ .execute();
+ const listed = () => createBuilder<Array<unknown>>(harness, account.token).get('/auth/sessions').execute();
+ expect(await listed()).toHaveLength(2);
+ travelDays(31);
+ expect(await listed()).toHaveLength(1);
+ });
+
+ it('leaves password sessions alone', async () => {
+ const account = await createTestAccount(harness);
+ travelDays(31);
+ await createBuilder(harness, account.token).get('/users/@me').expect(200).execute();
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SsoSudo.test.ts b/fluxer_api/src/api/auth/tests/SsoSudo.test.ts
new file mode 100644
index 000000000..634096312
--- /dev/null
+++ b/fluxer_api/src/api/auth/tests/SsoSudo.test.ts
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {
+ createAuthHarness,
+ createTestAccount,
+ createUniqueEmail,
+ disableSso,
+ enableSso,
+ setUserACLs,
+ unclaimAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
+import type {ApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {EmailDeliveryModes} from '@fluxer/constants/src/AccountConfigConstants';
+import {AdminACLs} from '@fluxer/constants/src/AdminACLs';
+import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from 'vitest';
+
+interface SudoModeRequiredBody {
+ methods: {sso_reauth: boolean};
+}
+
+describe('sudo mode for SSO accounts without credentials', () => {
+ let harness: ApiTestHarness;
+ let adminToken: string;
+
+ beforeAll(async () => {
+ harness = await createAuthHarness();
+ });
+ beforeEach(async () => {
+ await harness.reset();
+ const admin = await setUserACLs(harness, await createTestAccount(harness), [
+ AdminACLs.AUTHENTICATE,
+ AdminACLs.INSTANCE_CONFIG_UPDATE,
+ AdminACLs.INSTANCE_CONFIG_VIEW,
+ ]);
+ adminToken = admin.token;
+ await enableSso(harness, adminToken, {enforced: false});
+ await getInstanceConfigRepository().setInstanceIntegrationsConfig({email: {delivery: EmailDeliveryModes.OFF}});
+ });
+ afterEach(async () => {
+ vi.useRealTimers();
+ await disableSso(harness, adminToken);
+ getInstanceConfigRepository().clearCacheForTesting();
+ });
+ afterAll(async () => {
+ await harness?.shutdown();
+ });
+
+ async function signInWithSso(): Promise<string> {
+ const claims = {sub: `itest-sso-sudo-${Date.now()}-${Math.random()}`, email: createUniqueEmail('sso-sudo')};
+ const {state, client_binding} = await createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({})
+ .execute();
+ const {token} = await createBuilderWithoutAuth<{token: string}>(harness)
+ .post('/auth/sso/complete')
+ .body({code: JSON.stringify(claims), state, client_binding})
+ .expect(200)
+ .execute();
+ return token;
+ }
+
+ function travelMinutes(minutes: number): void {
+ vi.useFakeTimers({toFake: ['Date']});
+ vi.setSystemTime(Date.now() + minutes * 60 * 1000);
+ }
+
+ it('lets a fresh SSO sign-in through without a proof', async () => {
+ const token = await signInWithSso();
+ await createBuilder(harness, token).post('/users/@me/disable').body({}).expect(204).execute();
+ });
+
+ it('asks an older SSO session to sign in again', async () => {
+ const token = await signInWithSso();
+ travelMinutes(11);
+ const body = await createBuilder<SudoModeRequiredBody>(harness, token)
+ .post('/users/@me/disable')
+ .body({})
+ .expect(403, 'SUDO_MODE_REQUIRED')
+ .execute();
+ expect(body.methods.sso_reauth).toBe(true);
+ });
+
+ it('does not offer signing in again with SSO once SSO is turned off', async () => {
+ const token = await signInWithSso();
+ await disableSso(harness, adminToken);
+ travelMinutes(11);
+ const body = await createBuilder<SudoModeRequiredBody>(harness, token)
+ .post('/users/@me/disable')
+ .body({})
+ .expect(403, 'SUDO_MODE_REQUIRED')
+ .execute();
+ expect(body.methods.sso_reauth).toBe(false);
+ });
+
+ it('still lets an unclaimed account without SSO through without a proof', async () => {
+ const account = await createTestAccount(harness);
+ await unclaimAccount(harness, account.userId);
+ travelMinutes(11);
+ await createBuilder(harness, account.token).post('/users/@me/disable').body({}).expect(204).execute();
+ });
+});
diff --git a/fluxer_api/src/api/auth/tests/SudoVerificationCredentials.test.ts b/fluxer_api/src/api/auth/tests/SudoVerificationCredentials.test.ts
index df2f6aeb5..c0981444c 100644
--- a/fluxer_api/src/api/auth/tests/SudoVerificationCredentials.test.ts
+++ b/fluxer_api/src/api/auth/tests/SudoVerificationCredentials.test.ts
@@ -1,7 +1,11 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {userHasMfa, userHasSudoCapability} from '@app/api/auth/services/SudoMethods';
-import {hasNoVerifiableCredential} from '@app/api/auth/services/SudoVerificationService';
+import {
+ deriveSudoMethods,
+ hasNoVerifiableCredential,
+ userHasMfa,
+ userHasSudoCapability,
+} from '@app/api/auth/services/SudoMethods';
import {createUserID} from '@app/api/BrandedTypes';
import {EMPTY_USER_ROW, type UserRow} from '@app/api/database/types/UserTypes';
import {User} from '@app/api/models/User';
@@ -23,12 +27,32 @@ function createUser(overrides: Partial<UserRow> = {}): User {
}
describe('sudo verification credential capability', () => {
- it('lets an SSO provisioned account without a password satisfy sudo mode', () => {
+ it('finds no verifiable credential on an SSO provisioned account without a password', () => {
const user = createUser({password_hash: null, traits: new Set<string>(['sso'])});
expect(getAccountTier(user)).toBe('verified');
expect(hasNoVerifiableCredential(user, userHasMfa(user), false)).toBe(true);
});
+ it('offers signing in again with SSO to an SSO account without credentials', () => {
+ const user = createUser({password_hash: null, traits: new Set<string>(['sso'])});
+ expect(deriveSudoMethods(user, false, false, true).sso_reauth).toBe(true);
+ });
+
+ it('does not offer signing in again with SSO while SSO is off', () => {
+ const user = createUser({password_hash: null, traits: new Set<string>(['sso'])});
+ expect(deriveSudoMethods(user, false, false, false).sso_reauth).toBe(false);
+ });
+
+ it('does not offer signing in again with SSO to an SSO account with a password', () => {
+ const user = createUser({password_hash: 'hash', traits: new Set<string>(['sso'])});
+ expect(deriveSudoMethods(user, false, false, true).sso_reauth).toBe(false);
+ });
+
+ it('does not offer signing in again with SSO to an unclaimed account', () => {
+ const user = createUser({password_hash: null});
+ expect(deriveSudoMethods(user, false, false, true).sso_reauth).toBe(false);
+ });
+
it('still lets an unclaimed account satisfy sudo mode', () => {
const user = createUser({password_hash: null});
expect(hasNoVerifiableCredential(user, userHasMfa(user), false)).toBe(true);
diff --git a/fluxer_api/src/api/auth/tests/WebAuthnTwoFactorSudoRecovery.test.ts b/fluxer_api/src/api/auth/tests/WebAuthnTwoFactorSudoRecovery.test.ts
index 14bbd72c4..06e10b8b5 100644
--- a/fluxer_api/src/api/auth/tests/WebAuthnTwoFactorSudoRecovery.test.ts
+++ b/fluxer_api/src/api/auth/tests/WebAuthnTwoFactorSudoRecovery.test.ts
@@ -134,6 +134,7 @@ describe('Sudo mode recovery for passkey two-factor accounts without TOTP', () =
backup_codes: methods.backup_codes,
email_code: methods.email_code,
password: methods.password,
+ sso_reauth: false,
});
});
it('spends a backup code accepted as a sudo proof and refuses the same code afterwards', async () => {
diff --git a/fluxer_api/src/api/database/types/AuthTypes.ts b/fluxer_api/src/api/database/types/AuthTypes.ts
index 107fa47b4..1210c5b03 100644
--- a/fluxer_api/src/api/database/types/AuthTypes.ts
+++ b/fluxer_api/src/api/database/types/AuthTypes.ts
@@ -23,6 +23,7 @@ export interface AuthSessionRow {
app_release_channel: string | null;
app_build_number: number | null;
app_beta_number: number | null;
+ auth_method: string | null;
version: number;
}
@@ -154,6 +155,7 @@ export const AUTH_SESSION_COLUMNS = [
'app_release_channel',
'app_build_number',
'app_beta_number',
+ 'auth_method',
'version',
] as const satisfies ReadonlyArray<keyof AuthSessionRow>;
export const AUTH_SESSION_BY_APP_CHANNEL_COLUMNS = [
diff --git a/fluxer_api/src/api/enforcement/tests/EnforcementSignIn.test.ts b/fluxer_api/src/api/enforcement/tests/EnforcementSignIn.test.ts
index e7aee866a..2d4dd65a5 100644
--- a/fluxer_api/src/api/enforcement/tests/EnforcementSignIn.test.ts
+++ b/fluxer_api/src/api/enforcement/tests/EnforcementSignIn.test.ts
@@ -519,12 +519,14 @@ describe('Enforcement sign-in', () => {
}
async function ssoSignIn(email: string, ip?: string) {
- const start = createBuilderWithoutAuth<{state: string}>(harness).post('/auth/sso/start').body({});
+ const start = createBuilderWithoutAuth<{state: string; client_binding: string}>(harness)
+ .post('/auth/sso/start')
+ .body({});
if (ip) start.header('x-forwarded-for', ip);
- const {state} = await start.execute();
+ const {state, client_binding} = await start.execute();
const complete = createBuilderWithoutAuth<SignInBody & {user_id?: string}>(harness)
.post('/auth/sso/complete')
- .body({code: email, state});
+ .body({code: email, state, client_binding});
if (ip) complete.header('x-forwarded-for', ip);
return complete.executeRaw();
}
diff --git a/fluxer_api/src/api/instance/SsoConfigValidation.test.ts b/fluxer_api/src/api/instance/SsoConfigValidation.test.ts
index 2d18e8748..4fc4db945 100644
--- a/fluxer_api/src/api/instance/SsoConfigValidation.test.ts
+++ b/fluxer_api/src/api/instance/SsoConfigValidation.test.ts
@@ -115,3 +115,38 @@ describe('normalizeAndValidateSsoConfig URL scheme', () => {
).rejects.toMatchObject({localizedErrors: [{path: 'issuer', code: ValidationErrorCodes.INVALID_URL_FORMAT}]});
});
});
+
+describe('normalizeAndValidateSsoConfig issuer', () => {
+ it('requires an issuer for a real provider', async () => {
+ await expect(
+ normalizeAndValidateSsoConfig(
+ ssoConfig({authorizationUrl: 'https://1.1.1.1/auth', tokenUrl: 'https://1.1.1.1/token'}),
+ {testModeEnabled: false},
+ ),
+ ).rejects.toMatchObject({localizedErrors: [{path: 'issuer', code: ValidationErrorCodes.SSO_ISSUER_REQUIRED}]});
+ });
+});
+
+describe('normalizeAndValidateSsoConfig provider address', () => {
+ it('points at the hostname when it does not resolve', async () => {
+ await expect(
+ normalizeAndValidateSsoConfig(
+ {...ssoConfig({authorizationUrl: null, tokenUrl: null}), issuer: 'https://sso.example.invalid'},
+ {testModeEnabled: false},
+ ),
+ ).rejects.toMatchObject({
+ localizedErrors: [{path: 'issuer', code: ValidationErrorCodes.URL_HOSTNAME_NOT_RESOLVABLE}],
+ });
+ });
+
+ it('points at the private address rule for a private address', async () => {
+ await expect(
+ normalizeAndValidateSsoConfig(
+ {...ssoConfig({authorizationUrl: null, tokenUrl: null}), issuer: 'https://10.0.0.1'},
+ {testModeEnabled: false},
+ ),
+ ).rejects.toMatchObject({
+ localizedErrors: [{path: 'issuer', code: ValidationErrorCodes.URL_NOT_PUBLICLY_ROUTABLE}],
+ });
+ });
+});
diff --git a/fluxer_api/src/api/instance/SsoConfigValidation.ts b/fluxer_api/src/api/instance/SsoConfigValidation.ts
index 2e3a0c354..f2f898728 100644
--- a/fluxer_api/src/api/instance/SsoConfigValidation.ts
+++ b/fluxer_api/src/api/instance/SsoConfigValidation.ts
@@ -1,11 +1,13 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {domainToASCII} from 'node:url';
+import {tryDiscoverOidcProviderMetadata} from '@app/api/auth/services/SsoUtils';
import {Config} from '@app/api/Config';
import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
import {InstanceConfigResponse} from '@fluxer/schema/src/domains/admin/AdminSchemas';
import type {RequestUrlPolicy} from '@pkgs/http_client/src/HttpClientTypes';
+import {HttpError} from '@pkgs/http_client/src/HttpError';
import {createPublicInternetRequestUrlPolicy} from '@pkgs/http_client/src/PublicInternetRequestUrlPolicy';
interface SsoConfigValidationInput {
@@ -22,6 +24,7 @@ interface SsoConfigValidationInput {
interface NormalizedSsoConfigValidationResult extends SsoConfigValidationInput {
ready: boolean;
+ providerUnreachable: boolean;
}
let ssoRequestUrlPolicy: RequestUrlPolicy | null = null;
@@ -141,7 +144,12 @@ function normalizeDomainList(
return Array.from(normalized);
}
-export async function validateSsoPublicOutboundUrl(rawUrl: string, fieldName: string): Promise<string> {
+export function isHttpsSsoUrl(rawUrl: string): boolean {
+ const url = URL.parse(rawUrl);
+ return url?.protocol === 'https:' && !url.username && !url.password && !url.hash;
+}
+
+async function validateSsoPublicOutboundUrl(rawUrl: string, fieldName: string): Promise<string> {
let parsedUrl: URL;
try {
parsedUrl = new URL(rawUrl);
@@ -159,8 +167,12 @@ export async function validateSsoPublicOutboundUrl(rawUrl: string, fieldName: st
phase: 'initial',
redirectCount: 0,
});
- } catch {
- throw InputValidationError.fromCode(fieldName, ValidationErrorCodes.URL_NOT_PUBLICLY_ROUTABLE);
+ } catch (error) {
+ const unresolvable = error instanceof HttpError && error.errorType === 'unresolvable_host';
+ throw InputValidationError.fromCode(
+ fieldName,
+ unresolvable ? ValidationErrorCodes.URL_HOSTNAME_NOT_RESOLVABLE : ValidationErrorCodes.URL_NOT_PUBLICLY_ROUTABLE,
+ );
}
// Return the caller's exact input rather than parsedUrl.toString(), which would normalize
// the URL (e.g. appending a trailing slash) and break exact-match comparisons such as the
@@ -184,14 +196,22 @@ function resolveSsoReadiness(config: SsoConfigValidationInput, isTestProvider: b
if (!config.enabled) {
return false;
}
- if (isTestProvider) {
- return Boolean(config.clientId);
+ return Boolean(config.clientId) && (isTestProvider || Boolean(config.issuer));
+}
+
+async function providerUnreachable(config: SsoConfigValidationInput): Promise<boolean> {
+ const reliesOnIssuer = !config.authorizationUrl || !config.tokenUrl || (!config.jwksUrl && !config.userInfoUrl);
+ if (!config.issuer || !reliesOnIssuer) {
+ return false;
}
- const canUseIssuerDiscovery = Boolean(config.issuer);
- const hasAuthorizationEndpoint = Boolean(config.authorizationUrl) || canUseIssuerDiscovery;
- const hasTokenEndpoint = Boolean(config.tokenUrl) || canUseIssuerDiscovery;
- const canResolveClaims = Boolean(config.jwksUrl || config.userInfoUrl || canUseIssuerDiscovery);
- return Boolean(hasAuthorizationEndpoint && hasTokenEndpoint && config.clientId && canResolveClaims);
+ const discovered = await tryDiscoverOidcProviderMetadata(config.issuer);
+ const found = (explicit: string | null, ...discoveredUrls: Array<string | undefined>) =>
+ Boolean(explicit) || discoveredUrls.some((url) => url !== undefined && isHttpsSsoUrl(url));
+ return !(
+ found(config.authorizationUrl, discovered?.authorization_endpoint) &&
+ found(config.tokenUrl, discovered?.token_endpoint) &&
+ found(config.jwksUrl ?? config.userInfoUrl, discovered?.jwks_uri, discovered?.userinfo_endpoint)
+ );
}
export async function normalizeAndValidateSsoConfig(
@@ -222,9 +242,16 @@ export async function normalizeAndValidateSsoConfig(
userInfoUrl: await normalizeOptionalSsoUrl(baseConfig.userInfoUrl, 'userinfo_url', skipUrlValidation),
jwksUrl: await normalizeOptionalSsoUrl(baseConfig.jwksUrl, 'jwks_url', skipUrlValidation),
};
+ if (normalized.enabled && !isTestProvider && !normalized.issuer) {
+ throw InputValidationError.fromCode('issuer', ValidationErrorCodes.SSO_ISSUER_REQUIRED);
+ }
const ready = resolveSsoReadiness(normalized, isTestProvider);
if (normalized.enabled && normalized.enforced && !ready) {
throw InputValidationError.fromCode('sso', ValidationErrorCodes.SSO_MISCONFIGURED);
}
- return {...normalized, ready};
+ const unreachable = ready && !isTestProvider && (await providerUnreachable(normalized));
+ if (unreachable && normalized.enforced) {
+ throw InputValidationError.fromCode('sso', ValidationErrorCodes.SSO_DISCOVERY_FAILED);
+ }
+ return {...normalized, ready, providerUnreachable: unreachable};
}
diff --git a/fluxer_api/src/api/middleware/RequestBodyLimitMiddleware.ts b/fluxer_api/src/api/middleware/RequestBodyLimitMiddleware.ts
index 1fb18d97d..47c329851 100644
--- a/fluxer_api/src/api/middleware/RequestBodyLimitMiddleware.ts
+++ b/fluxer_api/src/api/middleware/RequestBodyLimitMiddleware.ts
@@ -61,8 +61,10 @@ function limiterFor(maxSize: number): MiddlewareHandler {
return limiter;
}
+const limitedRequests = new WeakSet<Request>();
+
export const RequestBodyLimitMiddleware = createMiddleware<HonoEnv>(async (ctx, next) => {
- if (!ctx.req.raw.body) {
+ if (!ctx.req.raw.body || limitedRequests.has(ctx.req.raw)) {
await next();
return;
}
@@ -70,5 +72,9 @@ export const RequestBodyLimitMiddleware = createMiddleware<HonoEnv>(async (ctx,
await next();
return;
}
- await limiterFor(resolveRouteBodyLimit(ctx))(ctx, next);
+ limitedRequests.add(ctx.req.raw);
+ await limiterFor(resolveRouteBodyLimit(ctx))(ctx, async () => {
+ limitedRequests.add(ctx.req.raw);
+ await next();
+ });
});
diff --git a/fluxer_api/src/api/middleware/tests/RequestBodyLimitMiddleware.test.ts b/fluxer_api/src/api/middleware/tests/RequestBodyLimitMiddleware.test.ts
index 5a6c57958..05181d941 100644
--- a/fluxer_api/src/api/middleware/tests/RequestBodyLimitMiddleware.test.ts
+++ b/fluxer_api/src/api/middleware/tests/RequestBodyLimitMiddleware.test.ts
@@ -47,6 +47,20 @@ describe('request body size limit', () => {
return harness.requestJson({path, method, body, headers: {Authorization: owner.token, ...headers}});
}
+ it('answers an unknown route with a JSON body with 404', async () => {
+ const response = await send('/v1/this-route-does-not-exist', 'POST', JSON.stringify({hello: 'world'}), {
+ 'Content-Type': 'application/json',
+ });
+
+ expect(response.status).toBe(404);
+ });
+
+ it('answers an unknown route with a body and no content type with 404', async () => {
+ const response = await send('/this-route-does-not-exist', 'POST', 'plain body');
+
+ expect(response.status).toBe(404);
+ });
+
it('accepts a maximum-size avatar under the default limit', async () => {
const body = JSON.stringify({name: 'Avatar Hook', avatar: maxSizeAvatarDataUrl()});
expect(body.length).toBeLessThanOrEqual(DEFAULT_REQUEST_BODY_LIMIT);
diff --git a/fluxer_api/src/api/middleware/tests/SessionWithMissingUserRow.test.ts b/fluxer_api/src/api/middleware/tests/SessionWithMissingUserRow.test.ts
index 900563ba0..71ddaa7be 100644
--- a/fluxer_api/src/api/middleware/tests/SessionWithMissingUserRow.test.ts
+++ b/fluxer_api/src/api/middleware/tests/SessionWithMissingUserRow.test.ts
@@ -45,6 +45,7 @@ describe('Session token whose account row is gone', () => {
app_release_channel: null,
app_build_number: null,
app_beta_number: null,
+ auth_method: null,
version: 1,
});
const result = await createBuilder<UnauthorizedErrorResponse>(harness, SESSION_TOKEN)
diff --git a/fluxer_api/src/api/models/AuthSession.ts b/fluxer_api/src/api/models/AuthSession.ts
index 15cadfdfe..fb2294a6e 100644
--- a/fluxer_api/src/api/models/AuthSession.ts
+++ b/fluxer_api/src/api/models/AuthSession.ts
@@ -3,6 +3,8 @@
import type {UserID} from '@app/api/BrandedTypes';
import type {AuthSessionRow, AuthSessionTombstoneRow} from '@app/api/database/types/AuthTypes';
+const SSO_SESSION_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
+
export class AuthSession {
readonly userId: UserID;
readonly sessionIdHash: Buffer;
@@ -17,6 +19,7 @@ export class AuthSession {
readonly appReleaseChannel: string | null;
readonly appBuildNumber: number | null;
readonly appBetaNumber: number | null;
+ readonly authMethod: string | null;
readonly version: number;
constructor(row: AuthSessionRow) {
@@ -33,9 +36,14 @@ export class AuthSession {
this.appReleaseChannel = row.app_release_channel ?? null;
this.appBuildNumber = row.app_build_number ?? null;
this.appBetaNumber = row.app_beta_number ?? null;
+ this.authMethod = row.auth_method ?? null;
this.version = row.version;
}
+ isExpiredSsoSession(now: number = Date.now()): boolean {
+ return this.authMethod === 'sso' && now - this.createdAt.getTime() > SSO_SESSION_MAX_AGE_MS;
+ }
+
toRow(): AuthSessionRow {
return {
user_id: this.userId,
@@ -51,6 +59,7 @@ export class AuthSession {
app_release_channel: this.appReleaseChannel,
app_build_number: this.appBuildNumber,
app_beta_number: this.appBetaNumber,
+ auth_method: this.authMethod,
version: this.version,
};
}
diff --git a/fluxer_api/src/api/openapi/openapi.json b/fluxer_api/src/api/openapi/openapi.json
index 98464babb..e63b113a1 100644
--- a/fluxer_api/src/api/openapi/openapi.json
+++ b/fluxer_api/src/api/openapi/openapi.json
@@ -2082,7 +2082,7 @@
"content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
}
},
- "description": "Complete the SSO authentication flow with the authorization code from the SSO provider. Returns authentication token and user information.",
+ "description": "Complete the SSO authentication flow with the authorization code from the SSO provider. Returns authentication token and user information, or linked when the flow was started from account settings.",
"requestBody": {
"required": true,
"content": {"application/json": {"schema": {"$ref": "#/components/schemas/SsoCompleteRequest"}}}
@@ -23863,6 +23863,63 @@
}
}
},
+ "/users/@me/sso/link/start": {
+ "post": {
+ "operationId": "start_sso_link",
+ "summary": "Start connecting SSO",
+ "tags": ["Users"],
+ "responses": {
+ "200": {
+ "description": "Success",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/SsoStartResponse"}}}
+ },
+ "400": {
+ "description": "Bad Request - The request was malformed or contained invalid data",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ },
+ "401": {
+ "description": "Unauthorized - Authentication is required or the token is invalid",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ },
+ "403": {
+ "description": "Forbidden - You do not have permission to perform this action",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ },
+ "429": {
+ "description": "Too Many Requests - You are being rate limited",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/ThrottledError"}}},
+ "headers": {
+ "Retry-After": {
+ "description": "Number of seconds to wait before retrying (only on 429)",
+ "schema": {"type": "integer"}
+ },
+ "X-RateLimit-Limit": {
+ "description": "The number of requests that can be made in the current window",
+ "schema": {"type": "integer"}
+ },
+ "X-RateLimit-Remaining": {
+ "description": "The number of remaining requests that can be made",
+ "schema": {"type": "integer"}
+ },
+ "X-RateLimit-Reset": {
+ "description": "Unix timestamp when the rate limit resets",
+ "schema": {"type": "integer"}
+ }
+ }
+ },
+ "500": {
+ "description": "Internal Server Error - An unexpected error occurred",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ }
+ },
+ "description": "Start connecting the instance SSO provider to the current account. Send the user to authorization_url, then finish with complete_sso, which returns linked and creates no new session. Works while SSO is required. Requires sudo mode verification.",
+ "security": [{"sessionToken": []}],
+ "requestBody": {
+ "required": false,
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/SudoVerificationSchema"}}}
+ }
+ }
+ },
"/users/@me/sudo/email-code": {
"post": {
"operationId": "send_sudo_email_code",
@@ -27461,6 +27518,54 @@
"required": ["ticket", "code_expires_at", "resend_available_at"],
"additionalProperties": false
},
+ "SudoVerificationSchema": {
+ "type": "object",
+ "properties": {
+ "password": {
+ "description": "Account password for sudo verification",
+ "$ref": "#/components/schemas/PasswordType"
+ },
+ "mfa_method": {
+ "description": "MFA method to use for verification",
+ "x-enumNames": ["TOTP", "WebAuthn", "Email code"],
+ "x-enumDescriptions": [
+ "Time-based one-time password authentication via authenticator app",
+ "Security key or biometric authentication",
+ "A 6-digit code sent to the account email address"
+ ],
+ "enum": ["totp", "webauthn", "email_code"],
+ "type": "string"
+ },
+ "mfa_code": {"description": "MFA verification code from an authenticator app", "type": "string"},
+ "email_code_ticket": {
+ "description": "Ticket from POST /users/@me/sudo/email-code, sent with mfa_method email_code",
+ "type": "string"
+ },
+ "email_code": {
+ "description": "The 6-digit code from the email, sent with mfa_method email_code",
+ "type": "string"
+ },
+ "webauthn_response": {
+ "description": "WebAuthn authentication response",
+ "$ref": "#/components/schemas/WebAuthnAuthenticationResponse"
+ },
+ "webauthn_challenge": {"description": "WebAuthn challenge string", "type": "string"}
+ }
+ },
+ "SsoStartResponse": {
+ "type": "object",
+ "properties": {
+ "authorization_url": {"type": "string", "description": "URL to redirect user to for SSO authentication"},
+ "state": {"type": "string", "description": "State parameter for CSRF protection"},
+ "redirect_uri": {"type": "string", "description": "OAuth redirect URI used for the SSO provider callback"},
+ "client_binding": {
+ "type": "string",
+ "description": "Secret the client keeps and sends back with the code and state to complete this sign-in"
+ }
+ },
+ "required": ["authorization_url", "state", "redirect_uri", "client_binding"],
+ "additionalProperties": false
+ },
"VoiceActivitySharingUpdateRequest": {
"type": "object",
"properties": {
@@ -27962,40 +28067,6 @@
"required": ["username"]
},
"RelationshipListResponse": {"type": "array", "items": {"$ref": "#/components/schemas/RelationshipResponse"}},
- "SudoVerificationSchema": {
- "type": "object",
- "properties": {
- "password": {
- "description": "Account password for sudo verification",
- "$ref": "#/components/schemas/PasswordType"
- },
- "mfa_method": {
- "description": "MFA method to use for verification",
- "x-enumNames": ["TOTP", "WebAuthn", "Email code"],
- "x-enumDescriptions": [
- "Time-based one-time password authentication via authenticator app",
- "Security key or biometric authentication",
- "A 6-digit code sent to the account email address"
- ],
- "enum": ["totp", "webauthn", "email_code"],
- "type": "string"
- },
- "mfa_code": {"description": "MFA verification code from an authenticator app", "type": "string"},
- "email_code_ticket": {
- "description": "Ticket from POST /users/@me/sudo/email-code, sent with mfa_method email_code",
- "type": "string"
- },
- "email_code": {
- "description": "The 6-digit code from the email, sent with mfa_method email_code",
- "type": "string"
- },
- "webauthn_response": {
- "description": "WebAuthn authentication response",
- "$ref": "#/components/schemas/WebAuthnAuthenticationResponse"
- },
- "webauthn_challenge": {"description": "WebAuthn challenge string", "type": "string"}
- }
- },
"RecoveryKitCreateResponse": {
"type": "object",
"properties": {
@@ -36236,21 +36307,15 @@
}
}
},
- "SsoStartResponse": {
- "type": "object",
- "properties": {
- "authorization_url": {"type": "string", "description": "URL to redirect user to for SSO authentication"},
- "state": {"type": "string", "description": "State parameter for CSRF protection"},
- "redirect_uri": {"type": "string", "description": "OAuth redirect URI used for the SSO provider callback"}
- },
- "required": ["authorization_url", "state", "redirect_uri"],
- "additionalProperties": false
- },
"SsoCompleteRequest": {
"type": "object",
"properties": {
"code": {"description": "Authorization code from the SSO provider", "type": "string"},
- "state": {"description": "State parameter for CSRF protection", "type": "string"}
+ "state": {"description": "State parameter for CSRF protection", "type": "string"},
+ "client_binding": {
+ "description": "The client_binding returned by SSO start. Required except for the mobile app callback",
+ "type": ["string", "null"]
+ }
},
"required": ["code", "state"]
},
@@ -36302,6 +36367,19 @@
},
"required": ["mfa", "ticket", "allowed_methods", "totp", "webauthn", "backup_codes", "redirect_to"],
"additionalProperties": false
+ },
+ {
+ "type": "object",
+ "properties": {
+ "linked": {
+ "type": "boolean",
+ "const": true,
+ "description": "The SSO identity is now connected to the account that started the link"
+ },
+ "redirect_to": {"type": "string", "description": "URL to redirect the user to after completion"}
+ },
+ "required": ["linked", "redirect_to"],
+ "additionalProperties": false
}
]
},
@@ -44892,6 +44970,7 @@
"INSTANCE_POLICY_TRANSITION_NOT_ALLOWED",
"SLOWMODE_RATE_LIMITED",
"SEARCH_INDEX_NOT_READY",
+ "SSO_PROVIDER_UNAVAILABLE",
"SSO_REQUIRED",
"STORE_BILLING_UNAVAILABLE",
"STORE_NOTIFICATION_UNAUTHORIZED",
@@ -45256,6 +45335,7 @@
"This instance policy change is not allowed.",
"Slowmode rate limited.",
"The search index isn't ready yet. Try again in a moment.",
+ "Your sign-in provider didn't answer. Try again in a moment.",
"{reason, select, managed_credentials {This instance requires single sign-on, so your SSO provider manages your email and password.} no_account {This instance only lets existing accounts sign in with SSO, and there's no account for you yet. Ask an admin of this instance for access.} managed_username {This instance requires single sign-on, so your username comes from your SSO provider.} other {This instance requires single sign-on. Sign in with the SSO button on the sign-in page.}}",
"In-app purchases are unavailable right now. Try again later.",
"The notification signature is invalid.",
diff --git a/fluxer_api/src/api/test/ApiTestHarness.ts b/fluxer_api/src/api/test/ApiTestHarness.ts
index ecffe6615..3ddb8065f 100644
--- a/fluxer_api/src/api/test/ApiTestHarness.ts
+++ b/fluxer_api/src/api/test/ApiTestHarness.ts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {createAPIApp} from '@app/api/App';
+import {resetSsoProviderCachesForTests} from '@app/api/auth/services/SsoService';
import {Config} from '@app/api/Config';
import {resetApiServicesForTesting} from '@app/api/CreateApiContext';
import {
@@ -110,6 +111,7 @@ export async function createApiTestHarness(options: CreateApiTestHarnessOptions
kvProvider.reset();
setInjectedUnfurlerService(undefined);
resetSharedListsForTests();
+ resetSsoProviderCachesForTests();
}
async function resetData(): Promise<void> {
resetGuildVisitorCachesForTesting();
diff --git a/fluxer_api/src/api/user/controllers/UserAuthController.ts b/fluxer_api/src/api/user/controllers/UserAuthController.ts
index d429a11b8..05dedab3d 100644
--- a/fluxer_api/src/api/user/controllers/UserAuthController.ts
+++ b/fluxer_api/src/api/user/controllers/UserAuthController.ts
@@ -24,6 +24,7 @@ import {isSsoUserWithoutPassword} from '@app/api/user/UserHelpers';
import {Validator} from '@app/api/Validator';
import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
+import {UnauthorizedError} from '@fluxer/errors/src/domains/core/UnauthorizedError';
import {
DisableTotpRequest,
EnableMfaTotpRequest,
@@ -34,6 +35,7 @@ import {
MfaBackupCodesChallengeVerifyResponse,
MfaBackupCodesRequest,
MfaBackupCodesResponse,
+ SsoStartResponse,
SudoMfaMethodsResponse,
SudoVerificationSchema,
WebAuthnChallengeResponse,
@@ -187,6 +189,33 @@ export function UserAuthController(app: HonoApp) {
return ctx.json(await createRecoveryKit(user.id));
},
);
+ app.post(
+ '/users/@me/sso/link/start',
+ RateLimitMiddleware(RateLimitConfigs.AUTH_SSO_START),
+ LoginRequired,
+ DefaultUserOnly,
+ SudoModeMiddleware,
+ Validator('json', SudoVerificationSchema),
+ OpenAPI({
+ operationId: 'start_sso_link',
+ summary: 'Start connecting SSO',
+ responseSchema: SsoStartResponse,
+ statusCode: 200,
+ security: ['sessionToken'],
+ tags: ['Users'],
+ description:
+ 'Start connecting the instance SSO provider to the current account. Send the user to authorization_url, then finish with complete_sso, which returns linked and creates no new session. Works while SSO is required. Requires sudo mode verification.',
+ }),
+ async (ctx) => {
+ const user = ctx.get('user');
+ const authSession = ctx.get('authSession');
+ if (!authSession) {
+ throw new UnauthorizedError();
+ }
+ await requireSudoMode(ctx, user, ctx.req.valid('json'));
+ return ctx.json(await ctx.get('ssoService').startLink(user, authSession.sessionIdHash));
+ },
+ );
app.post(
'/users/@me/mfa/backup-codes/challenge',
RateLimitMiddleware(RateLimitConfigs.USER_MFA_BACKUP_CODES_CHALLENGE_START),
diff --git a/fluxer_api/src/api/user/repositories/auth/AuthSessionRepository.ts b/fluxer_api/src/api/user/repositories/auth/AuthSessionRepository.ts
index 6235c3380..738fc4829 100644
--- a/fluxer_api/src/api/user/repositories/auth/AuthSessionRepository.ts
+++ b/fluxer_api/src/api/user/repositories/auth/AuthSessionRepository.ts
@@ -33,6 +33,7 @@ interface CachedAuthSession {
app_release_channel?: string | null;
app_build_number?: number | null;
app_beta_number?: number | null;
+ auth_method?: string | null;
version: number;
}
@@ -52,6 +53,7 @@ const CachedAuthSessionSchema = z.object({
app_release_channel: z.string().nullish(),
app_build_number: z.int().nullish(),
app_beta_number: z.int().nullish(),
+ auth_method: z.string().nullish(),
version: z.int().nonnegative(),
}) satisfies z.ZodType<CachedAuthSession>;
@@ -74,6 +76,7 @@ function encodeCachedAuthSession(row: AuthSessionRow): CachedAuthSession {
app_release_channel: row.app_release_channel,
app_build_number: row.app_build_number,
app_beta_number: row.app_beta_number,
+ auth_method: row.auth_method,
version: row.version,
};
}
@@ -101,6 +104,7 @@ function decodeCachedAuthSession(value: unknown, sessionIdHash: Buffer): AuthSes
app_release_channel: cached.app_release_channel ?? null,
app_build_number: cached.app_build_number ?? null,
app_beta_number: cached.app_beta_number ?? null,
+ auth_method: cached.auth_method ?? null,
version: cached.version,
};
}
diff --git a/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts b/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts
index 37886bf4c..d23e1823c 100644
--- a/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts
+++ b/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts
@@ -52,6 +52,7 @@ function sessionRow(userId: UserID): AuthSessionRow {
app_release_channel: null,
app_build_number: null,
app_beta_number: null,
+ auth_method: null,
version: 1,
};
}
diff --git a/fluxer_app/src/features/app/constants/Endpoints.ts b/fluxer_app/src/features/app/constants/Endpoints.ts
index e862b1fca..42324f54e 100644
--- a/fluxer_app/src/features/app/constants/Endpoints.ts
+++ b/fluxer_app/src/features/app/constants/Endpoints.ts
@@ -231,6 +231,7 @@ export const Endpoints = {
USER_PASSWORD_CHANGE_COMPLETE: '/users/@me/password-change/complete',
USER_PASSWORD: '/users/@me/password',
USER_RECOVERY_KIT: '/users/@me/recovery-kit',
+ USER_SSO_LINK_START: '/users/@me/sso/link/start',
USER_DISABLE: '/users/@me/disable',
USER_DELETE: '/users/@me/delete',
USER_BULK_DELETE_MY_MESSAGES: '/users/@me/messages/bulk-delete-mine',
diff --git a/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts b/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts
index 174b368cb..3df52d969 100644
--- a/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts
+++ b/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts
@@ -19,6 +19,7 @@ import type {
AuthRegistrationPendingApprovalResponse,
DesktopHandoffReturnMethod,
RegisterRequest,
+ SsoCompleteRequest,
SsoCompleteResponse,
SsoStartRequest,
SsoStartResponse,
@@ -853,17 +854,20 @@ export async function startSso({
export async function completeSso({
code,
state,
+ clientBinding,
target,
}: {
code: string;
state: string;
+ clientBinding: string | null;
target: InstanceHTTPTarget;
}): Promise<SsoCompleteResponse> {
+ const body: SsoCompleteRequest = {code, state, client_binding: clientBinding};
const response = await instanceRequest<SsoCompleteResponse>({
method: 'POST',
path: Endpoints.AUTH_SSO_COMPLETE,
target,
- body: {code, state},
+ body,
headers: withAuthLocaleHeader(),
});
return response.body;
diff --git a/fluxer_app/src/features/auth/components/modals/SudoSsoReauth.tsx b/fluxer_app/src/features/auth/components/modals/SudoSsoReauth.tsx
new file mode 100644
index 000000000..5d88152b3
--- /dev/null
+++ b/fluxer_app/src/features/auth/components/modals/SudoSsoReauth.tsx
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import * as Modal from '@app/features/app/components/dialogs/Modal';
+import {finishSsoReauthInThisWindow} from '@app/features/auth/components/modals/SudoSsoReauthCompletion';
+import {AuthSsoPanel} from '@app/features/auth/flow/AuthSsoPanel';
+import Authentication from '@app/features/auth/state/Authentication';
+import type {LoginSuccessPayload} from '@app/features/auth/state/AuthFlow';
+import * as RouterUtils from '@app/features/navigation/utils/RouterUtils';
+import {Trans} from '@lingui/react/macro';
+import {useCallback, useState} from 'react';
+
+export function SudoSsoReauth() {
+ const [wrongAccount, setWrongAccount] = useState(false);
+ const handleBrowserLoginSuccess = useCallback(async (payload: LoginSuccessPayload) => {
+ setWrongAccount(!(await finishSsoReauthInThisWindow(payload, Authentication.currentUserId)));
+ }, []);
+ return (
+ <>
+ <Modal.Description data-flx="auth.sudo-sso-reauth.hint">
+ <Trans comment="Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.">
+ After you sign in, try the action again.
+ </Trans>
+ </Modal.Description>
+ {wrongAccount && (
+ <Modal.Description role="alert" data-flx="auth.sudo-sso-reauth.wrong-account">
+ <Trans comment="Error shown when the person confirmed it's them by signing in to a different account than the one they are using.">
+ You signed in to a different account. Sign in with the account you're using here.
+ </Trans>
+ </Modal.Description>
+ )}
+ <AuthSsoPanel
+ redirectPath={RouterUtils.getCurrentPath()}
+ showTitle={false}
+ onBrowserLoginSuccess={handleBrowserLoginSuccess}
+ dataFlx="auth.sudo-verification-modal.sso-reauth"
+ data-flx="auth.sudo-sso-reauth.auth-sso-panel"
+ />
+ </>
+ );
+}
diff --git a/fluxer_app/src/features/auth/components/modals/SudoSsoReauthCompletion.ts b/fluxer_app/src/features/auth/components/modals/SudoSsoReauthCompletion.ts
new file mode 100644
index 000000000..28b9b3be6
--- /dev/null
+++ b/fluxer_app/src/features/auth/components/modals/SudoSsoReauthCompletion.ts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
+import * as AuthenticationCommands from '@app/features/auth/commands/AuthenticationCommands';
+import type {LoginSuccessPayload} from '@app/features/auth/state/AuthFlow';
+import SudoPrompt from '@app/features/auth/state/SudoPrompt';
+
+export async function finishSsoReauthInThisWindow(
+ payload: LoginSuccessPayload,
+ currentUserId: string | null,
+): Promise<boolean> {
+ if (currentUserId == null || payload.userId !== currentUserId) {
+ return false;
+ }
+ await AuthenticationCommands.completeLogin(
+ {...payload, runtimeSnapshot: RuntimeConfig.getSnapshot()},
+ {redirectPath: null},
+ );
+ SudoPrompt.submit({});
+ return true;
+}
diff --git a/fluxer_app/src/features/auth/components/modals/SudoVerificationModal.tsx b/fluxer_app/src/features/auth/components/modals/SudoVerificationModal.tsx
index e7f9e6926..57fe363cf 100644
--- a/fluxer_app/src/features/auth/components/modals/SudoVerificationModal.tsx
+++ b/fluxer_app/src/features/auth/components/modals/SudoVerificationModal.tsx
@@ -3,6 +3,7 @@
import * as Modal from '@app/features/app/components/dialogs/Modal';
import {Endpoints} from '@app/features/app/constants/Endpoints';
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
+import {SudoSsoReauth} from '@app/features/auth/components/modals/SudoSsoReauth';
import styles from '@app/features/auth/components/modals/SudoVerificationModal.module.css';
import {EmailCodeField} from '@app/features/auth/flow/EmailCodeField';
import {isCompleteEmailCode} from '@app/features/auth/flow/identifier_first/IdentifierFirstState';
@@ -147,7 +148,8 @@ const SudoVerificationModal: React.FC = observer(() => {
const showCode = showTotp || availableMethods.backupCodes;
const showPassword = availableMethods.password;
const showEmailCode = availableMethods.emailCode && !showCode;
- const noMethodsAvailable = !showPasskey && !showCode && !showPassword && !showEmailCode;
+ const showSsoReauth = availableMethods.ssoReauth;
+ const noMethodsAvailable = !showPasskey && !showCode && !showPassword && !showEmailCode && !showSsoReauth;
const [emailTicket, setEmailTicket] = useState<string | null>(null);
const [emailCode, setEmailCode] = useState('');
const [emailCodeError, setEmailCodeError] = useState<string | null>(null);
@@ -427,6 +429,8 @@ const SudoVerificationModal: React.FC = observer(() => {
</div>
) : (
<>
+ {showSsoReauth && <SudoSsoReauth data-flx="auth.sudo-verification-modal.sudo-sso-reauth" />}
+
{showCode && (
<Input
id="totp"
diff --git a/fluxer_app/src/features/auth/components/pages/SsoCallbackPage.tsx b/fluxer_app/src/features/auth/components/pages/SsoCallbackPage.tsx
index 6d6b3d614..16be97bd8 100644
--- a/fluxer_app/src/features/auth/components/pages/SsoCallbackPage.tsx
+++ b/fluxer_app/src/features/auth/components/pages/SsoCallbackPage.tsx
@@ -19,6 +19,7 @@ import {type AuthRuntimeTarget, useAuthRuntimeTarget} from '@app/features/auth/s
import {
consumeSsoPendingContext,
getSsoPendingContext,
+ isValidOAuthState,
type SsoPendingContext,
} from '@app/features/auth/state/SsoPendingContext';
import {safeRedirectTarget} from '@app/features/auth/utils/SafeRedirect';
@@ -28,7 +29,9 @@ import {
TRY_AGAIN_DESCRIPTOR,
} from '@app/features/i18n/utils/CommonMessageDescriptors';
import * as RouterUtils from '@app/features/navigation/utils/RouterUtils';
+import {Logger} from '@app/features/platform/utils/AppLogger';
import {failureCode} from '@app/features/platform/utils/ResponseInspection';
+import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
import {Spinner} from '@app/features/ui/components/Spinner';
import {navigateToExternalURL} from '@app/features/ui/utils/NativeUtils';
import {useFluxerDocumentTitle} from '@app/features/window/hooks/useFluxerDocumentTitle';
@@ -36,7 +39,7 @@ import * as FormUtils from '@app/lib/forms';
import {flxElementClassName} from '@app/lib/react';
import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
import {SSO_MOBILE_CALLBACK_URI, SSO_MOBILE_STATE_PREFIX} from '@fluxer/constants/src/SsoConstants';
-import type {I18n} from '@lingui/core';
+import type {I18n, MessageDescriptor} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -69,7 +72,25 @@ const OPEN_PRODUCT_DESCRIPTOR = msg({
message: 'Open {productName}',
comment: 'Button that hands SSO sign-in back to the mobile app. productName is the app name.',
});
+const SSO_SIGN_IN_CANCELLED_DESCRIPTOR = msg({
+ message: 'Sign-in was cancelled.',
+ comment: 'SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.',
+});
+const SSO_PROVIDER_NEEDS_SIGN_IN_DESCRIPTOR = msg({
+ message: 'Your provider needs you to sign in again.',
+ comment: 'SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.',
+});
+const SSO_PROVIDER_REPORTED_ERROR_DESCRIPTOR = msg({
+ message: 'Your provider reported an error.',
+ comment: 'SSO callback page error shown when the sign-in provider sent back any other error.',
+});
+const SSO_PROVIDER_SIGN_IN_AGAIN_ERRORS = new Set(['login_required', 'consent_required', 'interaction_required']);
+const SSO_CONNECTED_DESCRIPTOR = msg({
+ message: 'Your account is connected to single sign-on.',
+ comment: 'Toast shown after the account was connected to single sign-on from account settings.',
+});
const SSO_TIMEOUT_MS = 30_000;
+const logger = new Logger('SsoCallbackPage');
interface SsoCallbackParameters {
code: string;
@@ -79,6 +100,7 @@ interface SsoCallbackParameters {
interface SsoCallbackAttemptDependencies {
callbackContext: SsoPendingContext | null;
callbackParameters: SsoCallbackParameters | null;
+ callbackState: string | null;
i18n: I18n;
isCurrent: () => boolean;
onError: (error: SsoCallbackError) => void;
@@ -127,9 +149,9 @@ class SsoCallbackAttempt {
}
private async run(): Promise<void> {
- const providerErrorMessage = this.providerErrorMessage();
- if (providerErrorMessage != null) {
- this.finishWithError(providerErrorMessage);
+ const {providerError, callbackContext, i18n} = this.dependencies;
+ if (providerError != null && providerError.length > 0) {
+ this.finishWithError(i18n._(this.providerErrorDescriptor(providerError, callbackContext)));
return;
}
const callbackParameters = this.dependencies.callbackParameters;
@@ -145,6 +167,7 @@ class SsoCallbackAttempt {
const result = await completeSsoLogin({
code: callbackParameters.code,
state: callbackParameters.state,
+ clientBinding: this.dependencies.callbackContext?.clientBinding ?? null,
runtimeSnapshot,
});
consumeSsoPendingContext(callbackParameters.state);
@@ -162,6 +185,14 @@ class SsoCallbackAttempt {
});
return;
}
+ if (result.type === 'linked') {
+ this.settled = true;
+ ToastCommands.success(this.dependencies.i18n._(SSO_CONNECTED_DESCRIPTOR));
+ RouterUtils.replaceWith(
+ resolveSsoRedirectTarget(result.redirectTo, this.dependencies.callbackContext, runtimeSnapshot),
+ );
+ return;
+ }
const redirectTo = resolveSsoRedirectTarget(
result.payload.redirect_to,
this.dependencies.callbackContext,
@@ -209,15 +240,20 @@ class SsoCallbackAttempt {
this.dependencies.onProcessingChange(false);
}
- private providerErrorMessage(): string | null {
- const {providerError, providerErrorDescription} = this.dependencies;
- if (providerError == null || providerError.length === 0) {
- return null;
+ private providerErrorDescriptor(providerError: string, callbackContext: SsoPendingContext | null): MessageDescriptor {
+ const {callbackState, providerErrorDescription} = this.dependencies;
+ if (callbackContext == null || callbackState == null) {
+ return FAILED_TO_COMPLETE_SSO_SIGN_IN_DESCRIPTOR;
+ }
+ consumeSsoPendingContext(callbackState);
+ logger.warn('SSO provider returned an error', {error: providerError, description: providerErrorDescription});
+ if (providerError === 'access_denied') {
+ return SSO_SIGN_IN_CANCELLED_DESCRIPTOR;
}
- if (providerErrorDescription != null && providerErrorDescription.length > 0) {
- return `${providerError}: ${providerErrorDescription}`;
+ if (SSO_PROVIDER_SIGN_IN_AGAIN_ERRORS.has(providerError)) {
+ return SSO_PROVIDER_NEEDS_SIGN_IN_DESCRIPTOR;
}
- return providerError;
+ return SSO_PROVIDER_REPORTED_ERROR_DESCRIPTOR;
}
private stopTimeout(): void {
@@ -300,11 +336,12 @@ const SsoCallbackPage = observer(function SsoCallbackPage() {
window.location.replace(mobileCallbackUrl);
return;
}
- const callbackContext = state == null ? null : getSsoPendingContext(state);
+ const callbackContext = state == null || !isValidOAuthState(state) ? null : getSsoPendingContext(state);
setPendingContext(callbackContext);
const attempt = new SsoCallbackAttempt({
callbackContext,
callbackParameters: resolveCallbackParameters(code, state),
+ callbackState: state,
i18n,
isCurrent: () => request.isCurrent(),
onError: setError,
@@ -317,6 +354,7 @@ const SsoCallbackPage = observer(function SsoCallbackPage() {
attempt.start();
});
if (mobileCallbackUrl != null) {
+ const productName = RuntimeConfig.productName;
return (
<flx-auth-sso-callback-page
className={flxElementClassName(styles.loginContainer)}
@@ -326,7 +364,9 @@ const SsoCallbackPage = observer(function SsoCallbackPage() {
<Trans>Completing sign-in…</Trans>
</h1>
<p className={styles.ssoProcessingHint} data-flx="auth.sso-callback-page.sso-processing-hint--mobile">
- <Trans>Continue in the desktop app.</Trans>
+ <Trans comment="Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.">
+ Continue in the {productName} app.
+ </Trans>
</p>
<flx-auth-sso-callback-page-actions
className={flxElementClassName(styles.ssoCallbackActions)}
diff --git a/fluxer_app/src/features/auth/flow/AuthLoginLayout.tsx b/fluxer_app/src/features/auth/flow/AuthLoginLayout.tsx
index 530bf1b7b..aaf442556 100644
--- a/fluxer_app/src/features/auth/flow/AuthLoginLayout.tsx
+++ b/fluxer_app/src/features/auth/flow/AuthLoginLayout.tsx
@@ -55,7 +55,12 @@ import DesktopHandoffAccountSelector from '@app/features/auth/flow/DesktopHandof
import {HandoffApprovalFlow} from '@app/features/auth/flow/HandoffApprovalFlow';
import IpAuthorizationScreen from '@app/features/auth/flow/IpAuthorizationScreen';
import {AuthIdentifierFirstStep} from '@app/features/auth/flow/identifier_first/AuthIdentifierFirstStep';
-import {markSsoAutoStartSpent, useSsoAutoStart, withoutSsoStartRequest} from '@app/features/auth/flow/SsoAutoStart';
+import {
+ isSsoStartRequested,
+ markSsoAutoStartSpent,
+ useSsoAutoStart,
+ withoutSsoStartRequest,
+} from '@app/features/auth/flow/SsoAutoStart';
import {useAuthPresentation} from '@app/features/auth/flow/useAuthPresentation';
import {type StepTitleChangeHandler, useReportStepTitle} from '@app/features/auth/flow/useReportStepTitle';
import {getAuthErrorMessage} from '@app/features/auth/hooks/useAuthForm';
@@ -458,11 +463,13 @@ export const AuthLoginLayout = observer(function AuthLoginLayout({
desktopHandoff,
excludeCurrentUser,
});
+ const [handoffStartsSso] = useState(() => desktopHandoff && isSsoStartRequested(location.search));
const hasHandoffAccounts = handoffAccounts.length > 0;
+ const offersHandoffAccounts = hasHandoffAccounts && !handoffStartsSso;
const handoff = useDesktopHandoffFlow({
enabled: desktopHandoff,
- hasStoredAccounts: hasHandoffAccounts,
- initialMode: resolveHandoffInitialMode(desktopHandoff, hasHandoffAccounts),
+ hasStoredAccounts: offersHandoffAccounts,
+ initialMode: resolveHandoffInitialMode(desktopHandoff, offersHandoffAccounts),
});
const [ipAuthChallenge, setIpAuthChallenge] = useState<IpAuthorizationChallenge | null>(null);
const flow = useAuthLoginFlow({
diff --git a/fluxer_app/src/features/auth/flow/AuthSsoPanel.tsx b/fluxer_app/src/features/auth/flow/AuthSsoPanel.tsx
index ac5c4c9f7..45d62b49e 100644
--- a/fluxer_app/src/features/auth/flow/AuthSsoPanel.tsx
+++ b/fluxer_app/src/features/auth/flow/AuthSsoPanel.tsx
@@ -13,7 +13,7 @@ import {type LoginSuccessPayload, startSsoLogin} from '@app/features/auth/state/
import {isolateBidi} from '@app/features/i18n/utils/BidiIsolate';
import {Button} from '@app/features/ui/button/Button';
import {isDesktop, navigateToExternalURL} from '@app/features/ui/utils/NativeUtils';
-import type {I18n} from '@lingui/core';
+import type {I18n, MessageDescriptor} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -34,7 +34,12 @@ const CONTINUE_WITH_PROVIDER_DESCRIPTOR = msg({
});
const SINGLE_SIGN_ON_TITLE_DESCRIPTOR = msg({
message: 'Single sign-on',
- comment: 'Heading of the single sign-on panel when the admin has not named the sign-in provider.',
+ comment: 'Heading of the single sign-on panel when the admin has not given the sign-in provider a name.',
+});
+const SSO_PROVIDER_UNAVAILABLE_DESCRIPTOR = msg({
+ message: 'Your sign-in provider is unavailable. Try again later.',
+ comment:
+ 'Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.',
});
const SSO_NOT_CONFIGURED_DESCRIPTOR = msg({
message: 'This instance has not finished setting up single sign-on. Ask an administrator to enable it.',
@@ -70,6 +75,11 @@ export function isInstanceSsoAvailable(ssoConfig: InstanceSsoConfig | null): boo
return ssoConfig?.enabled === true;
}
+function resolveSsoSubtitle(ssoConfig: InstanceSsoConfig | null): MessageDescriptor {
+ if (isInstanceSsoAvailable(ssoConfig)) return ORGANIZATION_SSO_PROVIDER_DESCRIPTOR;
+ return isSsoLoginEnforced(ssoConfig) ? SSO_PROVIDER_UNAVAILABLE_DESCRIPTOR : SSO_NOT_CONFIGURED_DESCRIPTOR;
+}
+
export function resolveAuthPanelSso(runtimeSnapshot: RuntimeConfigSnapshot): InstanceSsoConfig | null {
return runtimeSnapshot.sso ?? null;
}
@@ -168,7 +178,7 @@ export const AuthSsoPanel = observer(function AuthSsoPanel({
</h1>
) : null}
<p className={styles.ssoSubtitle} data-flx={`${dataFlx}.subtitle`}>
- {isAvailable ? i18n._(ORGANIZATION_SSO_PROVIDER_DESCRIPTOR) : i18n._(SSO_NOT_CONFIGURED_DESCRIPTOR)}
+ {i18n._(resolveSsoSubtitle(ssoConfig))}
</p>
<Button
fitContainer
@@ -190,5 +200,5 @@ export const AuthSsoPanel = observer(function AuthSsoPanel({
});
export function isSsoLoginEnforced(ssoConfig: InstanceSsoConfig | null): boolean {
- return isInstanceSsoAvailable(ssoConfig) && ssoConfig?.enforced === true;
+ return ssoConfig?.enforced === true;
}
diff --git a/fluxer_app/src/features/auth/flow/ResourceAuthPages.tsx b/fluxer_app/src/features/auth/flow/ResourceAuthPages.tsx
index 5687101fe..c11d8829f 100644
--- a/fluxer_app/src/features/auth/flow/ResourceAuthPages.tsx
+++ b/fluxer_app/src/features/auth/flow/ResourceAuthPages.tsx
@@ -14,7 +14,7 @@ import {AuthRegisterFormCore} from '@app/features/auth/flow/AuthRegisterFormCore
import {AuthRouterLink} from '@app/features/auth/flow/AuthRouterLink';
import {AuthRuntimeTargetGate} from '@app/features/auth/flow/AuthRuntimeTargetGate';
import {AuthRuntimeTargetResetAction} from '@app/features/auth/flow/AuthRuntimeTargetResetAction';
-import {AuthSsoPanel, resolveAuthPanelSso} from '@app/features/auth/flow/AuthSsoPanel';
+import {AuthSsoPanel, isSsoLoginEnforced, resolveAuthPanelSso} from '@app/features/auth/flow/AuthSsoPanel';
import {isHandoffRequest} from '@app/features/auth/flow/auth_login_core/useDesktopHandoffFlow';
import {DesktopDeepLinkPrompt} from '@app/features/auth/flow/DesktopDeepLinkPrompt';
import {linkRegisterFields, readRegistrationUrlCode} from '@app/features/auth/flow/RegisterFormFields';
@@ -165,7 +165,7 @@ const ResourceAuthContent = observer(function ResourceAuthContent<T>({
</AuthLoginStepCarousel>
);
const runtimeSso = resolveAuthPanelSso(runtimeSnapshot);
- const sso = runtimeSso?.enabled === true && runtimeSso.enforced === true;
+ const sso = isSsoLoginEnforced(runtimeSso);
const usernameSignIn = usesUsernameSignIn(runtimeSnapshot.features);
const header = (
<>
diff --git a/fluxer_app/src/features/auth/flow/SsoAutoStart.ts b/fluxer_app/src/features/auth/flow/SsoAutoStart.ts
index 36298d20b..31971069c 100644
--- a/fluxer_app/src/features/auth/flow/SsoAutoStart.ts
+++ b/fluxer_app/src/features/auth/flow/SsoAutoStart.ts
@@ -21,7 +21,7 @@ interface SsoAutoStartRequest {
readonly spent: boolean;
}
-function isSsoStartRequested(search: string): boolean {
+export function isSsoStartRequested(search: string): boolean {
return new URLSearchParams(search).get(SSO_START_QUERY_PARAM) === '1';
}
diff --git a/fluxer_app/src/features/auth/state/AuthFlow.ts b/fluxer_app/src/features/auth/state/AuthFlow.ts
index 8adda8750..6d57bdba4 100644
--- a/fluxer_app/src/features/auth/state/AuthFlow.ts
+++ b/fluxer_app/src/features/auth/state/AuthFlow.ts
@@ -6,11 +6,8 @@ import type {UserData} from '@app/features/auth/state/AccountStorageContract';
import {isValidOAuthState, storeSsoPendingContext} from '@app/features/auth/state/SsoPendingContext';
import {safeRedirectTarget} from '@app/features/auth/utils/SafeRedirect';
import {type InstanceHTTPTarget, instanceTargetFromSnapshot} from '@app/features/platform/transport/InstanceHTTP';
-import {Logger} from '@app/features/platform/utils/AppLogger';
import type {AuthenticationResponseJSON, PublicKeyCredentialRequestOptionsJSON} from '@simplewebauthn/browser';
-const logger = new Logger('AuthFlow');
-
export interface LoginSuccessPayload {
token: string;
userId: string;
@@ -197,39 +194,43 @@ export async function startSsoLogin({
});
const state = result.state ?? ssoStateFromAuthorizationUrl(result.authorization_url);
if (state != null && isValidOAuthState(state)) {
- try {
- await storeSsoPendingContext(state, {
- redirectTo: safeRedirectTo,
- runtimeSnapshot,
- });
- } catch (error) {
- logger.warn('Failed to persist the SSO pending context, continuing without it', error);
- }
+ await storeSsoPendingContext(state, {
+ redirectTo: safeRedirectTo,
+ runtimeSnapshot,
+ clientBinding: result.client_binding ?? null,
+ });
}
return {authorizationUrl: result.authorization_url, redirectUri: result.redirect_uri, state};
}
export type SsoLoginResult =
| {type: 'success'; payload: LoginSuccessPayload}
- | {type: 'mfa'; challenge: MfaChallenge; redirectTo: string};
+ | {type: 'mfa'; challenge: MfaChallenge; redirectTo: string}
+ | {type: 'linked'; redirectTo: string};
export async function completeSsoLogin({
code,
state,
+ clientBinding,
runtimeSnapshot,
}: {
code: string;
state: string;
+ clientBinding: string | null;
runtimeSnapshot: RuntimeConfigSnapshot;
}): Promise<SsoLoginResult> {
const result = await AuthenticationCommands.completeSso({
code,
state,
+ clientBinding,
target: instanceTargetFromSnapshot(runtimeSnapshot),
});
if ('mfa' in result) {
return {type: 'mfa', challenge: mfaChallengeFromResponse(result), redirectTo: result.redirect_to};
}
+ if ('linked' in result) {
+ return {type: 'linked', redirectTo: result.redirect_to};
+ }
return {
type: 'success',
payload: {
diff --git a/fluxer_app/src/features/auth/state/SsoPendingContext.ts b/fluxer_app/src/features/auth/state/SsoPendingContext.ts
index 104c5c91f..081780340 100644
--- a/fluxer_app/src/features/auth/state/SsoPendingContext.ts
+++ b/fluxer_app/src/features/auth/state/SsoPendingContext.ts
@@ -12,7 +12,16 @@ const PENDING_SSO_CONTEXT_TTL_MS = 30 * 60 * 1000;
const PENDING_SSO_CONTEXT_MAX_ENTRIES = 16;
const PENDING_SSO_CONTEXT_JSON_MAX_LENGTH = 262_144;
const OAUTH_STATE_MAX_LENGTH = 512;
-const STORED_SSO_PENDING_CONTEXT_KEYS: ReadonlyArray<string> = ['createdAtMs', 'expiresAtMs', 'instance', 'redirectTo'];
+const PRE_BINDING_SSO_PENDING_CONTEXT_KEYS: ReadonlyArray<string> = [
+ 'createdAtMs',
+ 'expiresAtMs',
+ 'instance',
+ 'redirectTo',
+];
+const STORED_SSO_PENDING_CONTEXT_KEYS: ReadonlyArray<string> = [
+ ...PRE_BINDING_SSO_PENDING_CONTEXT_KEYS,
+ 'clientBinding',
+];
const LEGACY_SSO_REDIRECT_TO_STORAGE_KEY = 'fluxer:sso:redirect_to';
@@ -21,6 +30,7 @@ const logger = new Logger('SsoPendingContext');
export interface SsoPendingContext {
readonly redirectTo: string | null;
readonly runtimeSnapshot: RuntimeConfigSnapshot | null;
+ readonly clientBinding: string | null;
}
interface StoredSsoPendingContext extends SsoPendingContext {
@@ -118,7 +128,10 @@ function parseStoredContext(raw: string, nowMs: number): StoredSsoPendingContext
} catch {
return null;
}
- if (!isExactRecord(value, STORED_SSO_PENDING_CONTEXT_KEYS)) {
+ if (
+ !isExactRecord(value, STORED_SSO_PENDING_CONTEXT_KEYS) &&
+ !isExactRecord(value, PRE_BINDING_SSO_PENDING_CONTEXT_KEYS)
+ ) {
return null;
}
const createdAtMs = value['createdAtMs'];
@@ -140,7 +153,11 @@ function parseStoredContext(raw: string, nowMs: number): StoredSsoPendingContext
if (redirectTo === undefined) {
return null;
}
- return {createdAtMs, redirectTo, runtimeSnapshot};
+ const clientBinding = value['clientBinding'] ?? null;
+ if (clientBinding !== null && typeof clientBinding !== 'string') {
+ return null;
+ }
+ return {createdAtMs, redirectTo, runtimeSnapshot, clientBinding};
}
function removeStoredContext(key: string): void {
@@ -178,12 +195,14 @@ function pruneStoredContexts(retainedEntries: number, excludedKey: string | null
removeStoredContext(entry.key);
}
return new Map(
- entries
- .slice(0, retainedEntries)
- .map((entry) => [
- entry.key,
- {redirectTo: entry.context.redirectTo, runtimeSnapshot: entry.context.runtimeSnapshot},
- ]),
+ entries.slice(0, retainedEntries).map((entry) => [
+ entry.key,
+ {
+ redirectTo: entry.context.redirectTo,
+ runtimeSnapshot: entry.context.runtimeSnapshot,
+ clientBinding: entry.context.clientBinding,
+ },
+ ]),
);
}
@@ -196,6 +215,7 @@ function serializeStoredContext(createdAtMs: number, context: SsoPendingContext)
}
}
const serialized = JSON.stringify({
+ clientBinding: context.clientBinding,
createdAtMs,
expiresAtMs: createdAtMs + PENDING_SSO_CONTEXT_TTL_MS,
instance: context.runtimeSnapshot,
@@ -221,7 +241,7 @@ export async function storeSsoPendingContext(state: string, context: SsoPendingC
export function getSsoPendingContext(state: string): SsoPendingContext | null {
const legacyRedirectTo = safeRedirectTarget(readLegacySsoRedirectTo());
if (!isValidOAuthState(state)) {
- return legacyRedirectTo == null ? null : {redirectTo: legacyRedirectTo, runtimeSnapshot: null};
+ return legacyRedirectTo == null ? null : {redirectTo: legacyRedirectTo, runtimeSnapshot: null, clientBinding: null};
}
const context = pruneStoredContexts(PENDING_SSO_CONTEXT_MAX_ENTRIES, null).get(ssoPendingContextKey(state));
if (context != null) {
@@ -230,7 +250,7 @@ export function getSsoPendingContext(state: string): SsoPendingContext | null {
if (legacyRedirectTo == null) {
return null;
}
- return {redirectTo: legacyRedirectTo, runtimeSnapshot: null};
+ return {redirectTo: legacyRedirectTo, runtimeSnapshot: null, clientBinding: null};
}
export function consumeSsoPendingContext(state: string): SsoPendingContext | null {
diff --git a/fluxer_app/src/features/auth/state/SudoPrompt.tsx b/fluxer_app/src/features/auth/state/SudoPrompt.tsx
index 788a2250b..933eb866a 100644
--- a/fluxer_app/src/features/auth/state/SudoPrompt.tsx
+++ b/fluxer_app/src/features/auth/state/SudoPrompt.tsx
@@ -26,6 +26,7 @@ interface SudoErrorPayload {
backup_codes?: boolean;
email_code?: boolean;
password?: boolean;
+ sso_reauth?: boolean;
};
}
@@ -55,6 +56,7 @@ interface AvailableMethods {
totp: boolean;
webauthn: boolean;
backupCodes: boolean;
+ ssoReauth: boolean;
hasMfa: boolean;
}
@@ -75,6 +77,7 @@ const EMPTY_METHODS: AvailableMethods = {
totp: false,
webauthn: false,
backupCodes: false,
+ ssoReauth: false,
hasMfa: false,
};
@@ -95,6 +98,7 @@ function deriveMethodsFromCurrentUser(): AvailableMethods {
totp,
webauthn,
backupCodes: false,
+ ssoReauth: false,
hasMfa,
};
}
@@ -195,6 +199,7 @@ class SudoPrompt {
totp,
webauthn,
backupCodes,
+ ssoReauth: methods.sso_reauth === true,
hasMfa,
};
}
diff --git a/fluxer_app/src/features/i18n/locales/ar/messages.po b/fluxer_app/src/features/i18n/locales/ar/messages.po
index 33cf27af4..a483dcb88 100644
--- a/fluxer_app/src/features/i18n/locales/ar/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ar/messages.po
@@ -4075,6 +4075,11 @@ msgstr "بعد 14 يومًا، سيتم حذف حسابك نهائيًا"
msgid "After date"
msgstr "بعد تاريخ"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "بعد تسجيل الدخول، حاول تنفيذ الإجراء مرة أخرى."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "بعد حذف حسابك، لن تتمكن من حذف الرسائل التي أرسلتها"
@@ -9899,6 +9904,11 @@ msgstr "التأكيد أو النقر المزدوج للانضمام إلى ا
msgid "Conflicts with {conflictLabel}"
msgstr "يتعارض مع {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "ربط"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "وصّل كاميرا وحاول مرة أخرى."
@@ -10152,7 +10162,11 @@ msgstr "يمكن فتح قوائم السياق بالنقر بزر الفأرة
msgid "Continue"
msgstr "متابعة"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "تابع في تطبيق {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "متابعة في تطبيق سطح المكتب."
@@ -10831,6 +10845,11 @@ msgstr "تعذّر إغلاق الرسالة المباشرة"
msgid "Couldn't complete sign-in. Try again."
msgstr "تعذّر إكمال تسجيل الدخول. حاول مرة أخرى."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "تعذّر ربط تسجيل الدخول الموحد"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "يتيح لك إعادة تعيين كلمة المرور الخاصة
msgid "Lets you share your screen or a window."
msgstr "يتيح لك مشاركة شاشتك أو نافذة."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "يتيح لك تسجيل الدخول إلى هذا الحساب باستخدام {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "الأحرف (a-z وA-Z) والأرقام (0-9) والشرطات السفلية (_) فقط"
@@ -33613,6 +33637,11 @@ msgstr "طرق تسجيل الدخول"
msgid "Sign-in page"
msgstr "صفحة تسجيل الدخول"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "تم إلغاء تسجيل الدخول."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "طبقة واحدة"
msgid "Single line"
msgstr "سطر واحد"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "تسجيل الدخول الموحد"
@@ -43200,6 +43231,11 @@ msgstr "تسجل الدخول باستخدام رمز يتم إرساله إلى
msgid "You sign in with this username. Pick one you will remember."
msgstr "تسجل الدخول باستخدام اسم المستخدم هذا. اختر اسمًا تتذكره."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "سجّلت الدخول إلى حساب مختلف. سجّل الدخول بالحساب الذي تستخدمه هنا."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "تم ربط حسابك بنجاح. يمكنك الآن إغلاق علا
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "ليس لحسابك عنوان بريد إلكتروني. إذا نسيت كلمة مرورك، فإن مجموعة الاسترداد هي الطريقة الوحيدة للعودة. يستغرق الأمر دقيقة واحدة فقط."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "حسابك مرتبط بتسجيل الدخول الموحد."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "مساحتك الخاصة للأفكار والتذكيرات"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "إعدادات الخصوصية في ملفك الشخصي محدودة، لذلك لن يتمكن بعض الأشخاص من رؤية هذا الاتصال حتى عند تفعيل خيار \"الجميع\"."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "يطلب منك مزوّد تسجيل الدخول أن تسجّل الدخول مرة أخرى."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "أبلغ مزوّد تسجيل الدخول عن خطأ."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "تعذّر نشر مشاركة شاشتك باستخدام برنامج
msgid "Your setup token stopped working. Enter it again."
msgstr "توقف رمز الإعداد عن العمل. أدخله مرة أخرى."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "مزوّد تسجيل الدخول الخاص بك غير متاح. حاول مرة أخرى لاحقًا."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "يدير مزوّد تسجيل الدخول بريدك الإلكتروني وكلمة المرور."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/bg/messages.po b/fluxer_app/src/features/i18n/locales/bg/messages.po
index cefca45c6..5ffb2c000 100644
--- a/fluxer_app/src/features/i18n/locales/bg/messages.po
+++ b/fluxer_app/src/features/i18n/locales/bg/messages.po
@@ -4075,6 +4075,11 @@ msgstr "След 14 дни акаунтът ти ще бъде изтрит за
msgid "After date"
msgstr "След дата"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "След като влезеш, опитай действието отново."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "След като акаунтът ти бъде изтрит, няма да можеш да изтриеш изпратените от теб съобщения"
@@ -9899,6 +9904,11 @@ msgstr "Потвърждение или двойно щракване при п
msgid "Conflicts with {conflictLabel}"
msgstr "В конфликт с {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Свързване"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Свържи камера и опитай отново."
@@ -10152,7 +10162,11 @@ msgstr "Контекстните менюта могат да се отваря
msgid "Continue"
msgstr "Продължи"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Продължи в приложението {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Продължи в десктоп приложението."
@@ -10831,6 +10845,11 @@ msgstr "Неуспешно затваряне на DM"
msgid "Couldn't complete sign-in. Try again."
msgstr "Влизането не можа да бъде завършено. Опитай отново."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Единният вход не можа да бъде свързан"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Позволява ви да нулирате паролата си, а
msgid "Lets you share your screen or a window."
msgstr "Позволява ви да споделяте екрана си или прозорец."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Позволява ти да влизаш в този акаунт с {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Само букви (a-z, A-Z), цифри (0-9) и долни черти (_)"
@@ -33613,6 +33637,11 @@ msgstr "Начини за влизане"
msgid "Sign-in page"
msgstr "Страница за вход"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Влизането беше отменено."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Един слой"
msgid "Single line"
msgstr "Един ред"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Единен вход"
@@ -43200,6 +43231,11 @@ msgstr "Влизаш с код, изпратен на имейла ти. Пар
msgid "You sign in with this username. Pick one you will remember."
msgstr "Влизате с това потребителско име. Изберете такова, което ще запомните."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Влезе в различен акаунт. Влез с акаунта, който използваш тук."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Акаунтът ти е свързан успешно. Вече мож
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "В профила ви няма имейл адрес. Ако забравите паролата си, комплектът за възстановяване е единственият начин да влезете отново. Отнема само минута."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Акаунтът ти е свързан с единния вход."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Твоето лично пространство за мисли и на
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Поверителността на профила ти е ограничена, така че някои хора няма да виждат тази връзка дори когато е избрано „Всички“."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Доставчикът ти иска да влезеш отново."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Доставчикът ти съобщи за грешка."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Споделянето на екрана ти не можа да бъд
msgid "Your setup token stopped working. Enter it again."
msgstr "Токенът ти за настройка спря да работи. Въведи го отново."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Доставчикът ти за вход не е достъпен. Опитай отново по-късно."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Доставчикът ти за вход управлява имейла и паролата ти."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/cs/messages.po b/fluxer_app/src/features/i18n/locales/cs/messages.po
index 334895a66..6d0df1782 100644
--- a/fluxer_app/src/features/i18n/locales/cs/messages.po
+++ b/fluxer_app/src/features/i18n/locales/cs/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Po 14 dnech bude váš účet trvale smazán"
msgid "After date"
msgstr "Po datu"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Po přihlášení zkus akci znovu."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Po smazání účtu už nebudete moci smazat zprávy, které jste odeslali"
@@ -9899,6 +9904,11 @@ msgstr "Potvrzení nebo dvojité kliknutí pro připojení k hlasovým kanálům
msgid "Conflicts with {conflictLabel}"
msgstr "V konfliktu s {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Propojit"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Připojte kameru a zkuste to znovu."
@@ -10152,7 +10162,11 @@ msgstr "Kontextové nabídky lze otevřít levým kliknutím (na tlačítka) neb
msgid "Continue"
msgstr "Pokračovat"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Pokračuj v aplikaci {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Pokračovat v desktopové aplikaci."
@@ -10831,6 +10845,11 @@ msgstr "Nepodařilo se zavřít soukromou konverzaci"
msgid "Couldn't complete sign-in. Try again."
msgstr "Přihlášení se nepodařilo dokončit. Zkuste to znovu."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Jednotné přihlášení se nepodařilo propojit"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Umožňuje resetovat heslo, pokud ho zapomenete."
msgid "Lets you share your screen or a window."
msgstr "Umožňuje sdílet obrazovku nebo okno."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Umožní ti přihlásit se k tomuto účtu přes {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Pouze písmena (a-z, A-Z), čísla (0-9) a podtržítka (_)"
@@ -33613,6 +33637,11 @@ msgstr "Metody přihlášení"
msgid "Sign-in page"
msgstr "Přihlašovací stránka"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Přihlášení bylo zrušeno."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Jedna vrstva"
msgid "Single line"
msgstr "Jeden řádek"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Jednotné přihlášení"
@@ -43200,6 +43231,11 @@ msgstr "Přihlašujete se kódem zaslaným na váš e-mail. Heslo je volitelné.
msgid "You sign in with this username. Pick one you will remember."
msgstr "Přihlašujete se tímto uživatelským jménem. Vyberte si takové, které si zapamatujete."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Přihlásil ses k jinému účtu. Přihlas se účtem, který tu používáš."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Váš účet byl úspěšně propojen. Nyní můžete zavřít tuto kart
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Váš účet nemá zadanou e-mailovou adresu. Pokud zapomenete heslo, jediná cesta zpět je záchranná sada. Zabere to jen chvilku."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tvůj účet je propojený s jednotným přihlášením."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Váš soukromý prostor pro myšlenky a připomenutí"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Viditelnost vašeho profilu je omezená, takže někteří lidé toto propojení neuvidí ani při zapnuté možnosti „Všichni“."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Tvůj poskytovatel chce, aby ses znovu přihlásil."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Tvůj poskytovatel nahlásil chybu."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Sdílení obrazovky se nepodařilo publikovat s kompatibilním video kod
msgid "Your setup token stopped working. Enter it again."
msgstr "Váš nastavovací token přestal fungovat. Zadejte ho znovu."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Váš poskytovatel přihlášení není dostupný. Zkuste to prosím později."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Váš e-mail a heslo spravuje váš poskytovatel přihlášení."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/da/messages.po b/fluxer_app/src/features/i18n/locales/da/messages.po
index ceb499ecb..9265e6e00 100644
--- a/fluxer_app/src/features/i18n/locales/da/messages.po
+++ b/fluxer_app/src/features/i18n/locales/da/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Din konto slettes permanent efter 14 dage"
msgid "After date"
msgstr "Efter dato"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Prøv handlingen igen, når du har logget ind."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Når din konto er blevet slettet, kan du ikke længere slette de beskeder, du har sendt"
@@ -9899,6 +9904,11 @@ msgstr "Bekræftelse eller dobbeltklik ved deltagelse i fællesskabets talekanal
msgid "Conflicts with {conflictLabel}"
msgstr "Konflikter med {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Forbind"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Tilslut et kamera og prøv igen."
@@ -10152,7 +10162,11 @@ msgstr "Genvejsmenuer kan åbnes med venstreklik (på knapper) eller højreklik
msgid "Continue"
msgstr "Fortsæt"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Fortsæt i {productName}-appen."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Fortsæt i desktop-appen."
@@ -10831,6 +10845,11 @@ msgstr "Kunne ikke lukke den direkte samtale"
msgid "Couldn't complete sign-in. Try again."
msgstr "Kunne ikke gennemføre login. Prøv igen."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Enkelt log på kunne ikke forbindes"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Gør det muligt at nulstille din adgangskode, hvis du glemmer den."
msgid "Lets you share your screen or a window."
msgstr "Giver dig mulighed for at dele din skærm eller et vindue."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Gør det muligt at logge ind på denne konto med {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Kun bogstaver (a-z, A-Z), tal (0-9) og understregningstegn (_)"
@@ -33613,6 +33637,11 @@ msgstr "Loginmetoder"
msgid "Sign-in page"
msgstr "Loginside"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Login blev annulleret."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Enkelt lag"
msgid "Single line"
msgstr "Én linje"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Enkelt log på"
@@ -43200,6 +43231,11 @@ msgstr "Du logger ind med en kode, der sendes til din e-mail. En adgangskode er
msgid "You sign in with this username. Pick one you will remember."
msgstr "Du logger ind med dette brugernavn. Vælg et, du vil huske."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Du loggede ind på en anden konto. Log ind med den konto, du bruger her."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Din konto er blevet forbundet. Du kan nu lukke denne fane og vende tilba
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Din konto har ingen e-mailadresse. Hvis du glemmer din adgangskode, er et gendannelsessæt den eneste vej tilbage. Det tager kun et minut."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Din konto er forbundet med enkelt log på."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Dit private sted til tanker og påmindelser"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Din profils synlighed er begrænset, så nogle personer vil stadig ikke kunne se denne forbindelse, selvom indstillingen \"Alle\" er aktiveret."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Din udbyder vil have dig til at logge ind igen."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Din udbyder rapporterede en fejl."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Din skærmdeling kunne ikke sendes med et kompatibelt videokodek, så de
msgid "Your setup token stopped working. Enter it again."
msgstr "Dit opsætningstoken virker ikke længere. Indtast det igen."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Din login-udbyder er ikke tilgængelig. Prøv igen senere."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Din login-udbyder administrerer din e-mail og din adgangskode."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/de/messages.po b/fluxer_app/src/features/i18n/locales/de/messages.po
index 702f1ea3a..a08730ec0 100644
--- a/fluxer_app/src/features/i18n/locales/de/messages.po
+++ b/fluxer_app/src/features/i18n/locales/de/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Nach 14 Tagen wird dein Account endgültig gelöscht"
msgid "After date"
msgstr "Nach Datum"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Versuche die Aktion nach der Anmeldung noch einmal."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Nach dem Löschen deines Accounts kannst du die Nachrichten, die du gesendet hast, nicht mehr löschen"
@@ -9899,6 +9904,11 @@ msgstr "Bestätigung oder Doppelklick zum Beitreten zu einem Sprachkanal in der
msgid "Conflicts with {conflictLabel}"
msgstr "In Konflikt mit {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Verbinden"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Kamera verbinden und erneut versuchen."
@@ -10152,7 +10162,11 @@ msgstr "Kontextmenüs können per Linksklick (auf Schaltflächen) oder Rechtskli
msgid "Continue"
msgstr "Weiter"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Weiter in der {productName}-App."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Weiter in der Desktop-App."
@@ -10831,6 +10845,11 @@ msgstr "DM konnte nicht geschlossen werden"
msgid "Couldn't complete sign-in. Try again."
msgstr "Anmeldung konnte nicht abgeschlossen werden. Bitte versuche es noch einmal."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Single Sign-On konnte nicht verbunden werden"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Damit kannst du dein Passwort zurücksetzen, falls du es vergisst."
msgid "Lets you share your screen or a window."
msgstr "Ermöglicht das Teilen deines Bildschirms oder eines Fensters."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Damit kannst du dich mit {providerName} bei diesem Konto anmelden."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Nur Buchstaben (a-z, A-Z), Zahlen (0-9) und Unterstriche (_)"
@@ -33613,6 +33637,11 @@ msgstr "Anmeldemethoden"
msgid "Sign-in page"
msgstr "Anmeldeseite"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Die Anmeldung wurde abgebrochen."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Einzelne Ebene"
msgid "Single line"
msgstr "Einzelne Zeile"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Single Sign-On"
@@ -43200,6 +43231,11 @@ msgstr "Du meldest dich mit einem Code an, der an deine E-Mail-Adresse gesendet
msgid "You sign in with this username. Pick one you will remember."
msgstr "Du meldest dich mit diesem Benutzernamen an. Wähle einen, den du dir merken kannst."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Du hast dich bei einem anderen Konto angemeldet. Melde dich mit dem Konto an, das du hier verwendest."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Dein Account wurde erfolgreich verknüpft. Du kannst diesen Tab jetzt sc
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Dein Konto hat keine E-Mail-Adresse. Wenn du dein Passwort vergisst, ist ein Wiederherstellungskit der einzige Weg zurück. Das dauert nur eine Minute."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Dein Konto ist mit Single Sign-On verbunden."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Dein privater Bereich für Gedanken und Erinnerungen"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Deine Profil-Privatsphäre ist eingeschränkt, sodass einige Personen diese Verbindung nicht sehen können, selbst wenn „Jeder“ aktiviert ist."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Dein Anbieter möchte, dass du dich erneut anmeldest."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Dein Anbieter hat einen Fehler gemeldet."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Deine Bildschirmfreigabe konnte nicht mit einem kompatiblen Videocodec v
msgid "Your setup token stopped working. Enter it again."
msgstr "Dein Einrichtungstoken funktioniert nicht mehr. Gib es erneut ein."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Dein Anmeldeanbieter ist nicht erreichbar. Versuche es später erneut."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Deine E-Mail-Adresse und dein Passwort werden von deinem Anmeldeanbieter verwaltet."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/el/messages.po b/fluxer_app/src/features/i18n/locales/el/messages.po
index 6a5dcf5c5..c70950c07 100644
--- a/fluxer_app/src/features/i18n/locales/el/messages.po
+++ b/fluxer_app/src/features/i18n/locales/el/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Μετά από 14 ημέρες, ο λογαριασμός σας θα
msgid "After date"
msgstr "Μετά την ημερομηνία"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Αφού συνδεθείς, δοκίμασε ξανά την ενέργεια."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Αφού διαγραφεί ο λογαριασμός σας, δεν θα μπορείτε να διαγράψετε τα μηνύματα που στείλατε"
@@ -9899,6 +9904,11 @@ msgstr "Επιβεβαίωση ή διπλό κλικ για συμμετοχή
msgid "Conflicts with {conflictLabel}"
msgstr "Συγκρούεται με {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Σύνδεση"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Συνδέστε μια κάμερα και δοκιμάστε ξανά."
@@ -10152,7 +10162,11 @@ msgstr "Τα μενού περιβάλλοντος μπορούν να ανοί
msgid "Continue"
msgstr "Συνέχεια"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Συνέχισε στην εφαρμογή {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Συνέχεια στην εφαρμογή για υπολογιστή."
@@ -10831,6 +10845,11 @@ msgstr "Δεν ήταν δυνατό το κλείσιμο του DM"
msgid "Couldn't complete sign-in. Try again."
msgstr "Δεν ήταν δυνατή η ολοκλήρωση της σύνδεσης. Δοκιμάστε ξανά."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Δεν ήταν δυνατή η σύνδεση της ενιαίας σύνδεσης"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Σας επιτρέπει να επαναφέρετε τον κωδικ
msgid "Lets you share your screen or a window."
msgstr "Σας επιτρέπει να μοιράζεστε την οθόνη σας ή ένα παράθυρο."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Σου επιτρέπει να συνδέεσαι σε αυτόν τον λογαριασμό με {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Μόνο γράμματα (a-z, A-Z), αριθμοί (0-9) και κάτω παύλες (_)"
@@ -33613,6 +33637,11 @@ msgstr "Μέθοδοι σύνδεσης"
msgid "Sign-in page"
msgstr "Σελίδα σύνδεσης"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Η σύνδεση ακυρώθηκε."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Μονό επίπεδο"
msgid "Single line"
msgstr "Μία γραμμή"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Ενιαία σύνδεση"
@@ -43200,6 +43231,11 @@ msgstr "Συνδέεστε με έναν κωδικό που αποστέλλε
msgid "You sign in with this username. Pick one you will remember."
msgstr "Συνδέεστε με αυτό το όνομα χρήστη. Επιλέξτε ένα που θα θυμάστε."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Συνδέθηκες σε διαφορετικό λογαριασμό. Συνδέσου με τον λογαριασμό που χρησιμοποιείς εδώ."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Ο λογαριασμός σας έχει συνδεθεί επιτυχ
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Ο λογαριασμός σας δεν έχει διεύθυνση email. Αν ξεχάσετε τον κωδικό πρόσβασής σας, ένα κιτ ανάκτησης είναι ο μόνος τρόπος να ξαναμπείτε. Χρειάζεται μόνο ένα λεπτό."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Ο λογαριασμός σου συνδέθηκε με την ενιαία σύνδεση."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Ο προσωπικός σας χώρος για σκέψεις και
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Οι ρυθμίσεις απορρήτου του προφίλ σας είναι περιορισμένες, επομένως ορισμένοι χρήστες ενδέχεται να μην βλέπουν αυτήν τη σύνδεση, ακόμη και αν έχετε επιλέξει τη ρύθμιση \"Όλοι\"."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Ο πάροχός σου ζητά να συνδεθείς ξανά."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Ο πάροχός σου ανέφερε σφάλμα."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Η κοινή χρήση οθόνης σας δεν μπόρεσε να
msgid "Your setup token stopped working. Enter it again."
msgstr "Το διακριτικό ρύθμισης σταμάτησε να λειτουργεί. Εισαγάγετέ το ξανά."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Ο πάροχος σύνδεσής σου δεν είναι διαθέσιμος. Δοκίμασε ξανά αργότερα."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Ο πάροχος σύνδεσής σου διαχειρίζεται το email και τον κωδικό πρόσβασής σου."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/en-GB/messages.po b/fluxer_app/src/features/i18n/locales/en-GB/messages.po
index 9b47f231e..4e6209c18 100644
--- a/fluxer_app/src/features/i18n/locales/en-GB/messages.po
+++ b/fluxer_app/src/features/i18n/locales/en-GB/messages.po
@@ -4075,6 +4075,11 @@ msgstr "After 14 days, your account will be permanently deleted"
msgid "After date"
msgstr "After date"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "After you sign in, try the action again."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "After your account is deleted, you will not be able to delete the messages you sent"
@@ -9899,6 +9904,11 @@ msgstr "Confirmation or double-click for community voice joins"
msgid "Conflicts with {conflictLabel}"
msgstr "Conflicts with {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Connect"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Connect a camera and try again."
@@ -10152,7 +10162,11 @@ msgstr "Context menus can be opened with left-click (on buttons) or right-click
msgid "Continue"
msgstr "Continue"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continue in the {productName} app."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continue in the desktop app."
@@ -10831,6 +10845,11 @@ msgstr "Couldn't close DM"
msgid "Couldn't complete sign-in. Try again."
msgstr "Couldn't complete sign-in. Try again."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Couldn't connect single sign-on"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Lets you reset your password if you forget it."
msgid "Lets you share your screen or a window."
msgstr "Lets you share your screen or a window."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Lets you sign in to this account with {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
@@ -33613,6 +33637,11 @@ msgstr "Sign-in methods"
msgid "Sign-in page"
msgstr "Sign-in page"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Sign-in was cancelled."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Single layer"
msgid "Single line"
msgstr "Single line"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Single sign-on"
@@ -43200,6 +43231,11 @@ msgstr "You sign in with a code sent to your email. A password is optional."
msgid "You sign in with this username. Pick one you will remember."
msgstr "You sign in with this username. Pick one you'll remember."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "You signed in to a different account. Sign in with the account you're using here."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Your account has been linked successfully. You can now close this tab an
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Your account is connected to single sign-on."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Your private space for thoughts and reminders"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Your provider needs you to sign in again."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Your provider reported an error."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Your screen share could not be published with a compatible video codec,
msgid "Your setup token stopped working. Enter it again."
msgstr "Your setup token stopped working. Enter it again."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Your sign-in provider is unavailable. Try again later."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Your sign-in provider manages your email and password."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/en-US/messages.po b/fluxer_app/src/features/i18n/locales/en-US/messages.po
index 9cffcff6f..80bc268c9 100644
--- a/fluxer_app/src/features/i18n/locales/en-US/messages.po
+++ b/fluxer_app/src/features/i18n/locales/en-US/messages.po
@@ -4075,6 +4075,11 @@ msgstr "After 14 days, your account will be permanently deleted"
msgid "After date"
msgstr "After date"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "After you sign in, try the action again."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "After your account is deleted, you will not be able to delete the messages you sent"
@@ -9899,6 +9904,11 @@ msgstr "Confirmation or double-click for community voice joins"
msgid "Conflicts with {conflictLabel}"
msgstr "Conflicts with {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Connect"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Connect a camera and try again."
@@ -10152,7 +10162,11 @@ msgstr "Context menus can be opened with left-click (on buttons) or right-click
msgid "Continue"
msgstr "Continue"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continue in the {productName} app."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continue in the desktop app."
@@ -10831,6 +10845,11 @@ msgstr "Couldn't close DM"
msgid "Couldn't complete sign-in. Try again."
msgstr "Couldn't complete sign-in. Try again."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Couldn't connect single sign-on"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Lets you reset your password if you forget it."
msgid "Lets you share your screen or a window."
msgstr "Lets you share your screen or a window."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Lets you sign in to this account with {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
@@ -33613,6 +33637,11 @@ msgstr "Sign-in methods"
msgid "Sign-in page"
msgstr "Sign-in page"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Sign-in was cancelled."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Single layer"
msgid "Single line"
msgstr "Single line"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Single sign-on"
@@ -43200,6 +43231,11 @@ msgstr "You sign in with a code sent to your email. A password is optional."
msgid "You sign in with this username. Pick one you will remember."
msgstr "You sign in with this username. Pick one you will remember."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "You signed in to a different account. Sign in with the account you're using here."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Your account has been linked successfully. You can now close this tab an
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Your account is connected to single sign-on."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Your private space for thoughts and reminders"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Your provider needs you to sign in again."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Your provider reported an error."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Your screen share could not be published with a compatible video codec,
msgid "Your setup token stopped working. Enter it again."
msgstr "Your setup token stopped working. Enter it again."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Your sign-in provider is unavailable. Try again later."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Your sign-in provider manages your email and password."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/es-419/messages.po b/fluxer_app/src/features/i18n/locales/es-419/messages.po
index ec5346c77..4200fba93 100644
--- a/fluxer_app/src/features/i18n/locales/es-419/messages.po
+++ b/fluxer_app/src/features/i18n/locales/es-419/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Después de 14 días, tu cuenta se eliminará permanentemente"
msgid "After date"
msgstr "Después de la fecha"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Después de iniciar sesión, intenta la acción de nuevo."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Una vez eliminada tu cuenta, no podrás eliminar los mensajes que hayas enviado"
@@ -9899,6 +9904,11 @@ msgstr "Confirmación o doble clic para unirse a canales de voz de la comunidad"
msgid "Conflicts with {conflictLabel}"
msgstr "Conflicto con {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Conectar"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Conecta una cámara e inténtalo de nuevo."
@@ -10152,7 +10162,11 @@ msgstr "Los menús contextuales se pueden abrir con un clic izquierdo (en botone
msgid "Continue"
msgstr "Continuar"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continúa en la app de {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continuar en la aplicación de escritorio."
@@ -10831,6 +10845,11 @@ msgstr "No se pudo cerrar el MD"
msgid "Couldn't complete sign-in. Try again."
msgstr "No se pudo completar el inicio de sesión. Intenta de nuevo."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "No se pudo conectar el inicio de sesión único"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Te permite restablecer tu contraseña si la olvidas."
msgid "Lets you share your screen or a window."
msgstr "Te permite compartir tu pantalla o una ventana."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Te permite iniciar sesión en esta cuenta con {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Solo letras (a-z, A-Z), números (0-9) y guiones bajos (_)"
@@ -33613,6 +33637,11 @@ msgstr "Métodos de inicio de sesión"
msgid "Sign-in page"
msgstr "Página de inicio de sesión"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Se canceló el inicio de sesión."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Capa única"
msgid "Single line"
msgstr "Una sola línea"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Inicio de sesión único"
@@ -43200,6 +43231,11 @@ msgstr "Inicias sesión con un código enviado a tu correo electrónico. La cont
msgid "You sign in with this username. Pick one you will remember."
msgstr "Inicias sesión con este nombre de usuario. Elige uno que recuerdes."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Iniciaste sesión en otra cuenta. Inicia sesión con la cuenta que usas aquí."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Tu cuenta se vinculó correctamente. Ahora puedes cerrar esta pestaña y
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Tu cuenta no tiene una dirección de correo electrónico. Si olvidas tu contraseña, un kit de recuperación es la única forma de volver a entrar. Solo toma un minuto."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tu cuenta está conectada al inicio de sesión único."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Tu espacio privado para pensamientos y recordatorios"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "La privacidad de tu perfil es limitada, por lo que algunas personas aún no podrán ver esta conexión, incluso cuando esté activada la opción \"Todos\"."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Tu proveedor necesita que vuelvas a iniciar sesión."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Tu proveedor informó un error."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "No se pudo publicar tu pantalla compartida con un códec de video compat
msgid "Your setup token stopped working. Enter it again."
msgstr "Tu token de configuración dejó de funcionar. Ingrésalo de nuevo."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Tu proveedor de inicio de sesión no está disponible. Intenta de nuevo más tarde."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Tu proveedor de inicio de sesión administra tu correo electrónico y tu contraseña."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/es-ES/messages.po b/fluxer_app/src/features/i18n/locales/es-ES/messages.po
index 909423ef0..050b8c9bf 100644
--- a/fluxer_app/src/features/i18n/locales/es-ES/messages.po
+++ b/fluxer_app/src/features/i18n/locales/es-ES/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Después de 14 días, tu cuenta se eliminará permanentemente"
msgid "After date"
msgstr "Después de la fecha"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Después de iniciar sesión, vuelve a intentar la acción."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Una vez eliminada tu cuenta, no podrás eliminar los mensajes que hayas enviado"
@@ -9899,6 +9904,11 @@ msgstr "Confirmación o doble clic para unirse a los canales de voz de la comuni
msgid "Conflicts with {conflictLabel}"
msgstr "Entra en conflicto con {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Conectar"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Conecta una cámara y vuelve a intentarlo."
@@ -10152,7 +10162,11 @@ msgstr "Los menús contextuales se pueden abrir con un clic izquierdo (en botone
msgid "Continue"
msgstr "Continuar"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continúa en la app de {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continuar en la aplicación de escritorio."
@@ -10831,6 +10845,11 @@ msgstr "No se pudo cerrar el MD"
msgid "Couldn't complete sign-in. Try again."
msgstr "No se pudo completar el inicio de sesión. Inténtalo de nuevo."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "No se ha podido conectar el inicio de sesión único"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Te permite restablecer tu contraseña si la olvidas."
msgid "Lets you share your screen or a window."
msgstr "Permite compartir tu pantalla o una ventana."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Te permite iniciar sesión en esta cuenta con {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Solo letras (a-z, A-Z), números (0-9) y guiones bajos (_)"
@@ -33613,6 +33637,11 @@ msgstr "Métodos de inicio de sesión"
msgid "Sign-in page"
msgstr "Página de inicio de sesión"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Se ha cancelado el inicio de sesión."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Capa única"
msgid "Single line"
msgstr "Una sola línea"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Inicio de sesión único"
@@ -43200,6 +43231,11 @@ msgstr "Inicias sesión con un código enviado a tu correo electrónico. La cont
msgid "You sign in with this username. Pick one you will remember."
msgstr "Inicias sesión con este nombre de usuario. Elige uno que recuerdes."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Has iniciado sesión en otra cuenta. Inicia sesión con la cuenta que usas aquí."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Tu cuenta se ha vinculado correctamente. Ya puedes cerrar esta pestaña
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Tu cuenta no tiene una dirección de correo electrónico. Si olvidas tu contraseña, un kit de recuperación es la única forma de volver a entrar. Solo lleva un minuto."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tu cuenta está conectada al inicio de sesión único."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Tu espacio privado para pensamientos y recordatorios"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "La privacidad de tu perfil es limitada, por lo que algunas personas seguirán sin poder ver esta conexión, incluso cuando esté activada la opción \"Todos\"."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Tu proveedor necesita que vuelvas a iniciar sesión."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Tu proveedor ha informado de un error."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "No se ha podido publicar tu pantalla compartida con un códec de vídeo
msgid "Your setup token stopped working. Enter it again."
msgstr "Tu token de configuración ha dejado de funcionar. Introdúcelo de nuevo."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Tu proveedor de inicio de sesión no está disponible. Inténtalo de nuevo más tarde."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Tu proveedor de inicio de sesión gestiona tu correo electrónico y tu contraseña."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/fi/messages.po b/fluxer_app/src/features/i18n/locales/fi/messages.po
index ac9161dea..a0fd3b39d 100644
--- a/fluxer_app/src/features/i18n/locales/fi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/fi/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Tilisi poistetaan pysyvästi 14 päivän kuluttua"
msgid "After date"
msgstr "Päivämäärän jälkeen"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Kun olet kirjautunut, yritä toimintoa uudelleen."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Tilisi poistamisen jälkeen et voi enää poistaa lähettämiäsi viestejä"
@@ -9899,6 +9904,11 @@ msgstr "Vahvistus tai kaksoisnapsautus yhteisön äänikanaviin liittyessä"
msgid "Conflicts with {conflictLabel}"
msgstr "Ristiriidassa kohteen {conflictLabel} kanssa"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Yhdistä"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Liitä kamera ja yritä uudelleen."
@@ -10152,7 +10162,11 @@ msgstr "Pikavalikot voi avata vasemmalla napsautuksella (painikkeissa) tai oikea
msgid "Continue"
msgstr "Jatka"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Jatka {productName}-sovelluksessa."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Jatka työpöytäsovelluksessa."
@@ -10831,6 +10845,11 @@ msgstr "Yksityisviestiä ei voitu sulkea"
msgid "Couldn't complete sign-in. Try again."
msgstr "Kirjautuminen epäonnistui. Yritä uudelleen."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Kertakirjautumista ei voitu yhdistää"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Mahdollistaa salasanasi nollaamisen, jos unohdat sen."
msgid "Lets you share your screen or a window."
msgstr "Antaa sinun jakaa näyttösi tai ikkunasi."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Voit kirjautua tähän tiliin palvelun {providerName} kautta."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Vain kirjaimet (a-z, A-Z), numerot (0-9) ja alaviivat (_)"
@@ -33613,6 +33637,11 @@ msgstr "Kirjautumistavat"
msgid "Sign-in page"
msgstr "Kirjautumissivu"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Kirjautuminen peruttiin."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Yksikerroksinen"
msgid "Single line"
msgstr "Yksi rivi"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Yhden kirjautumisen tunnistautuminen"
@@ -43200,6 +43231,11 @@ msgstr "Kirjaudut sisään sähköpostiisi lähetettävällä koodilla. Salasana
msgid "You sign in with this username. Pick one you will remember."
msgstr "Kirjaudut sisään tällä käyttäjänimellä. Valitse sellainen, jonka muistat."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Kirjauduit eri tilille. Kirjaudu tilillä, jota käytät täällä."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Tilisi on nyt yhdistetty. Voit sulkea tämän välilehden ja palata sove
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Tililläsi ei ole sähköpostiosoitetta. Jos unohdat salasanasi, palautussarja on ainoa tapa päästä takaisin sisään. Se vie vain minuutin."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tilisi on yhdistetty kertakirjautumiseen."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Yksityinen tilasi ajatuksille ja muistutuksille"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Profiilisi yksityisyysasetukset ovat rajoitetut, joten jotkut eivät silti näe tätä yhteyttä, vaikka \"Kaikki\" olisi käytössä."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Palveluntarjoajasi pyytää sinua kirjautumaan uudelleen."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Palveluntarjoajasi ilmoitti virheestä."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Näyttösi jakamista ei voitu julkaista yhteensopivalla videokoodekilla,
msgid "Your setup token stopped working. Enter it again."
msgstr "Asennustunnuksesi lakkasi toimimasta. Syötä se uudelleen."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Kirjautumispalvelusi tarjoaja ei ole käytettävissä. Yritä myöhemmin uudelleen."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Kirjautumispalvelusi tarjoaja hallinnoi sähköpostiosoitettasi ja salasanaasi."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/fr/messages.po b/fluxer_app/src/features/i18n/locales/fr/messages.po
index 3cdfd1342..56498b15f 100644
--- a/fluxer_app/src/features/i18n/locales/fr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/fr/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Après 14 jours, votre compte sera définitivement supprimé"
msgid "After date"
msgstr "Après le"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Après t'être connecté, réessaie l'action."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Après la suppression de votre compte, vous ne pourrez plus supprimer les messages que vous avez envoyés"
@@ -9899,6 +9904,11 @@ msgstr "Confirmation ou double-clic pour rejoindre les salons vocaux des communa
msgid "Conflicts with {conflictLabel}"
msgstr "Conflit avec {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Connecter"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Connectez une caméra et réessayez."
@@ -10152,7 +10162,11 @@ msgstr "Les menus contextuels peuvent être ouverts par un clic gauche (sur les
msgid "Continue"
msgstr "Continuer"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continue dans l'app {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continuer dans l'application de bureau."
@@ -10831,6 +10845,11 @@ msgstr "Impossible de fermer la conversation privée"
msgid "Couldn't complete sign-in. Try again."
msgstr "Impossible de terminer la connexion. Veuillez réessayer."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Impossible de connecter la connexion unique"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Permet de réinitialiser votre mot de passe si vous l'oubliez."
msgid "Lets you share your screen or a window."
msgstr "Permet de partager votre écran ou une fenêtre."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Te permet de te connecter à ce compte avec {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Lettres (a-z, A-Z), chiffres (0-9) et tirets bas (_) uniquement"
@@ -33613,6 +33637,11 @@ msgstr "Méthodes de connexion"
msgid "Sign-in page"
msgstr "Page de connexion"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "La connexion a été annulée."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Couche unique"
msgid "Single line"
msgstr "Ligne unique"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Connexion unique"
@@ -43200,6 +43231,11 @@ msgstr "Vous vous connectez avec un code envoyé à votre adresse e-mail. Un mot
msgid "You sign in with this username. Pick one you will remember."
msgstr "Vous vous connectez avec ce nom d'utilisateur. Choisissez-en un dont vous vous souviendrez."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Tu t'es connecté à un autre compte. Connecte-toi avec le compte que tu utilises ici."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Votre compte a été lié avec succès. Vous pouvez maintenant fermer ce
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Votre compte n'a pas d'adresse e-mail. Si vous oubliez votre mot de passe, un kit de récupération est le seul moyen de revenir. Cela ne prend qu'une minute."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Ton compte est relié à la connexion unique."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Votre espace privé pour vos pensées et rappels"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Les paramètres de confidentialité de votre profil sont limités, certaines personnes ne verront donc pas cette connexion même si l’option Tout le monde est activée."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Ton fournisseur te demande de te reconnecter."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Ton fournisseur a signalé une erreur."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Votre partage d'écran n'a pas pu être publié avec un codec vidéo com
msgid "Your setup token stopped working. Enter it again."
msgstr "Votre jeton d'installation ne fonctionne plus. Saisissez-le à nouveau."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Votre fournisseur de connexion n’est pas disponible. Réessayez plus tard."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Votre fournisseur de connexion gère votre adresse e-mail et votre mot de passe."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/he/messages.po b/fluxer_app/src/features/i18n/locales/he/messages.po
index fdab317e1..29b0c3169 100644
--- a/fluxer_app/src/features/i18n/locales/he/messages.po
+++ b/fluxer_app/src/features/i18n/locales/he/messages.po
@@ -4075,6 +4075,11 @@ msgstr "לאחר 14 יום, החשבון שלך יימחק לצמיתות"
msgid "After date"
msgstr "אחרי תאריך"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "לאחר ההתחברות יש לנסות שוב את הפעולה."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "לאחר מחיקת החשבון שלך, לא ניתן יהיה למחוק את ההודעות ששלחת"
@@ -9899,6 +9904,11 @@ msgstr "אישור או לחיצה כפולה להצטרפות לערוץ קול
msgid "Conflicts with {conflictLabel}"
msgstr "מתנגש עם {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "חיבור"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "חבר מצלמה ונסה שוב."
@@ -10152,7 +10162,11 @@ msgstr "ניתן לפתוח תפריטי הקשר בלחיצה שמאלית (ע
msgid "Continue"
msgstr "המשך"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "יש להמשיך באפליקציית {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "המשך באפליקציית שולחן העבודה."
@@ -10831,6 +10845,11 @@ msgstr "לא ניתן היה לסגור את הצ'אט"
msgid "Couldn't complete sign-in. Try again."
msgstr "ההתחברות לא הושלמה. יש לנסות שוב."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "לא ניתן היה לחבר את הכניסה היחידה"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "מאפשר לך לאפס את הסיסמה שלך אם תשכח אותה
msgid "Lets you share your screen or a window."
msgstr "מאפשר לך לשתף את המסך שלך או חלון."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "מאפשר לך להיכנס לחשבון הזה עם {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "אותיות (a-z, A-Z), מספרים (0-9) וקווים תחתונים (_) בלבד"
@@ -33613,6 +33637,11 @@ msgstr "שיטות כניסה"
msgid "Sign-in page"
msgstr "דף ההתחברות"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "ההתחברות בוטלה."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "שכבה אחת"
msgid "Single line"
msgstr "שורה בודדת"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "כניסה יחידה"
@@ -43200,6 +43231,11 @@ msgstr "אתה נכנס באמצעות קוד שנשלח לאימייל שלך.
msgid "You sign in with this username. Pick one you will remember."
msgstr "אתה נכנס עם שם המשתמש הזה. בחר אחד שתזכור."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "התחברת לחשבון אחר. יש להתחבר עם החשבון שבו נעשה שימוש כאן."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "החשבון שלך קושר בהצלחה. עכשיו אפשר לסגו
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "לחשבונך אין כתובת אימייל. אם תשכח את הסיסמה שלך, ערכת שחזור היא הדרך היחידה לחזור. זה לוקח רק דקה."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "החשבון שלך מחובר לכניסה היחידה."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "המרחב הפרטי שלך למחשבות ותזכורות"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "פרטיות הפרופיל שלך מוגבלת, כך שאנשים מסוימים עדיין לא יראו את החיבור הזה גם כאשר האפשרות 'כולם' מופעלת."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "הספק שלך מבקש שתתחבר שוב."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "הספק שלך דיווח על שגיאה."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "לא ניתן היה לפרסם את שיתוף המסך שלך בקוד
msgid "Your setup token stopped working. Enter it again."
msgstr "אסימון ההגדרה שלך הפסיק לעבוד. הזן אותו שוב."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "ספק ההתחברות שלך לא זמין. נסה שוב מאוחר יותר."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "ספק ההתחברות שלך מנהל את כתובת האימייל והסיסמה שלך."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/hi/messages.po b/fluxer_app/src/features/i18n/locales/hi/messages.po
index 494680150..8ba100f93 100644
--- a/fluxer_app/src/features/i18n/locales/hi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hi/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14 दिनों के बाद, आपका अकाउंट ह
msgid "After date"
msgstr "इस तारीख के बाद"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "साइन इन करने के बाद कार्रवाई फिर से करें।"
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "आपका अकाउंट डिलीट होने के बाद आप अपने भेजे गए मैसेज डिलीट नहीं कर पाएँगे"
@@ -9899,6 +9904,11 @@ msgstr "कम्युनिटी वॉइस जॉइन के लिए
msgid "Conflicts with {conflictLabel}"
msgstr "{conflictLabel} से टकराता है"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "कनेक्ट करें"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "कैमरा कनेक्ट करें और फिर से प्रयास करें।"
@@ -10152,7 +10162,11 @@ msgstr "कॉन्टेक्स्ट मेन्यू को लेफ्
msgid "Continue"
msgstr "जारी रखें"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "{productName} ऐप में जारी रखें।"
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "डेस्कटॉप ऐप में जारी रखें।"
@@ -10831,6 +10845,11 @@ msgstr "DM बंद नहीं कर पाए"
msgid "Couldn't complete sign-in. Try again."
msgstr "साइन-इन पूरा नहीं हो सका। फिर से कोशिश करें।"
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "सिंगल साइन-ऑन कनेक्ट नहीं हो सका"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "यह आपको अपना पासवर्ड भूल जा
msgid "Lets you share your screen or a window."
msgstr "आपको अपनी स्क्रीन या कोई विंडो शेयर करने की सुविधा देता है।"
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "इससे आप {providerName} से इस खाते में साइन इन कर सकते हैं।"
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "केवल अक्षर (a-z, A-Z), संख्याएँ (0-9) और अंडरस्कोर (_)"
@@ -33613,6 +33637,11 @@ msgstr "साइन-इन के तरीके"
msgid "Sign-in page"
msgstr "साइन-इन पेज"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "साइन-इन रद्द कर दिया गया।"
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "सिंगल लेयर"
msgid "Single line"
msgstr "एकल पंक्ति"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "सिंगल साइन-ऑन"
@@ -43200,6 +43231,11 @@ msgstr "आप अपने ईमेल पर भेजे गए कोड
msgid "You sign in with this username. Pick one you will remember."
msgstr "आप इस यूज़रनेम से साइन इन करते हैं। ऐसा यूज़रनेम चुनें जो आपको याद रहे।"
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "आपने किसी दूसरे खाते में साइन इन किया। उसी खाते से साइन इन करें जिसका आप यहाँ उपयोग कर रहे हैं।"
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "आपका अकाउंट सफलतापूर्वक लि
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "आपके खाते में कोई ईमेल पता नहीं है। यदि आप अपना पासवर्ड भूल जाते हैं, तो रिकवरी किट ही वापस आने का एकमात्र तरीका है। इसमें बस एक मिनट लगता है।"
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "आपका खाता सिंगल साइन-ऑन से कनेक्ट हो गया है।"
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "आपके विचारों और रिमाइंडर क
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "आपकी प्रोफ़ाइल गोपनीयता सीमित है, इसलिए \"हर कोई\" चालू होने पर भी कुछ लोग यह कनेक्शन नहीं देख पाएँगे।"
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "आपका प्रदाता चाहता है कि आप फिर से साइन इन करें।"
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "आपके प्रदाता ने एक त्रुटि बताई।"
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "आपका स्क्रीन शेयर किसी कम्
msgid "Your setup token stopped working. Enter it again."
msgstr "आपका सेटअप टोकन काम करना बंद कर चुका है। इसे फिर से डालें।"
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "आपका साइन-इन प्रोवाइडर अभी उपलब्ध नहीं है। बाद में फिर से कोशिश करें।"
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "आपका साइन-इन प्रोवाइडर आपका ईमेल और पासवर्ड मैनेज करता है।"
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/hr/messages.po b/fluxer_app/src/features/i18n/locales/hr/messages.po
index 88a91a4cc..7824e7b42 100644
--- a/fluxer_app/src/features/i18n/locales/hr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hr/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Nakon 14 dana vaš će račun biti trajno izbrisan"
msgid "After date"
msgstr "Nakon datuma"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Nakon prijave ponovno pokušaj radnju."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Nakon brisanja računa više nećete moći izbrisati poruke koje ste poslali"
@@ -9899,6 +9904,11 @@ msgstr "Potvrda ili dvostruki klik za pridruživanje glasovnim kanalima zajednic
msgid "Conflicts with {conflictLabel}"
msgstr "U sukobu s {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Poveži"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Povežite kameru i pokušajte ponovno."
@@ -10152,7 +10162,11 @@ msgstr "Kontekstni izbornici mogu se otvoriti lijevim klikom (na gumbe) ili desn
msgid "Continue"
msgstr "Nastavi"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Nastavi u aplikaciji {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Nastavi u desktop aplikaciji."
@@ -10831,6 +10845,11 @@ msgstr "Nije moguće zatvoriti izravnu poruku"
msgid "Couldn't complete sign-in. Try again."
msgstr "Nije moguće dovršiti prijavu. Pokušajte ponovno."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Jedinstvenu prijavu nije moguće povezati"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Omogućuje vam poništavanje lozinke ako je zaboravite."
msgid "Lets you share your screen or a window."
msgstr "Omogućuje dijeljenje zaslona ili prozora."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Omogućuje ti prijavu u ovaj račun putem {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Samo slova (a-z, A-Z), brojevi (0-9) i podvlake (_)"
@@ -33613,6 +33637,11 @@ msgstr "Nač"
msgid "Sign-in page"
msgstr "Stranica za prijavu"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Prijava je otkazana."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Jednoslojno"
msgid "Single line"
msgstr "Jedan redak"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Jedinstvena prijava"
@@ -43200,6 +43231,11 @@ msgstr "Prijavljujete se kodom poslanim na vašu e-poštu. Lozinka nije obavezna
msgid "You sign in with this username. Pick one you will remember."
msgstr "Prijavljuješ se ovim korisničkim imenom. Odaberi ono kojeg ćeš se sjetiti."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Prijavio si se na drugi račun. Prijavi se računom koji ovdje koristiš."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Vaš je račun uspješno povezan. Sada možete zatvoriti ovu karticu i v
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Tvoj račun nema pridruženu e-adresu. Ako zaboraviš lozinku, komplet za oporavak jedini je način da se vratiš. Potrebna je samo minuta."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tvoj je račun povezan s jedinstvenom prijavom."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Vaš privatni prostor za misli i podsjetnike"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Vaše postavke privatnosti profila su ograničene, pa čak i kada je odabrano \"Svi\", neki ljudi neće vidjeti ovu vezu."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Tvoj pružatelj traži da se ponovno prijaviš."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Tvoj pružatelj prijavio je pogrešku."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Vaše dijeljenje zaslona nije se moglo objaviti s kompatibilnim video ko
msgid "Your setup token stopped working. Enter it again."
msgstr "Vaš token za postavljanje više ne radi. Unesite ga ponovno."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Tvoj davatelj prijave nije dostupan. Pokušaj ponovno kasnije."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Tvoj davatelj prijave upravlja tvojom e-poštom i lozinkom."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/hu/messages.po b/fluxer_app/src/features/i18n/locales/hu/messages.po
index b0c887a01..f2ff48181 100644
--- a/fluxer_app/src/features/i18n/locales/hu/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hu/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14 nap múlva fiókod véglegesen törlődik"
msgid "After date"
msgstr "Dátum után"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Bejelentkezés után próbáld újra a műveletet."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "A fiókod törlése után már nem tudod törölni az elküldött üzeneteidet"
@@ -9899,6 +9904,11 @@ msgstr "Megerősítés vagy dupla kattintás a közösségi hangcsatornákhoz va
msgid "Conflicts with {conflictLabel}"
msgstr "Ütközik a(z) {conflictLabel} billentyűkombinációval"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Összekapcsolás"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Csatlakoztass egy kamerát, és próbáld újra."
@@ -10152,7 +10162,11 @@ msgstr "A helyi menük bal egérgombbal (gombokon) vagy jobb egérgombbal (egyé
msgid "Continue"
msgstr "Folytatás"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Folytasd a(z) {productName} alkalmazásban."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Folytatás az asztali alkalmazásban."
@@ -10831,6 +10845,11 @@ msgstr "Nem sikerült bezárni a közvetlen beszélgetést"
msgid "Couldn't complete sign-in. Try again."
msgstr "Nem sikerült befejezni a bejelentkezést. Próbáld újra."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Nem sikerült összekapcsolni az egyszeri bejelentkezést"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Lehetővé teszi a jelszavad visszaállítását, ha elfelejtenéd."
msgid "Lets you share your screen or a window."
msgstr "Lehetővé teszi a képernyőd vagy egy ablak megosztását."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Így a(z) {providerName} szolgáltatással is bejelentkezhetsz ebbe a fiókba."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Csak betűk (a-z, A-Z), számok (0-9) és aláhúzásjelek (_)"
@@ -33613,6 +33637,11 @@ msgstr "Bejelentkezési módok"
msgid "Sign-in page"
msgstr "Bejelentkezési oldal"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "A bejelentkezés megszakadt."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Egyetlen réteg"
msgid "Single line"
msgstr "Egysoros"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Egyszeri bejelentkezés"
@@ -43200,6 +43231,11 @@ msgstr "E-mailben küldött kóddal jelentkezel be. A jelszó nem kötelező."
msgid "You sign in with this username. Pick one you will remember."
msgstr "Ezzel a felhasználónévvel jelentkezel be. Válassz egyet, amit meg fogsz jegyezni."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Egy másik fiókba jelentkeztél be. Azzal a fiókkal jelentkezz be, amelyet itt használsz."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Fiókod sikeresen összekapcsolva. Most már bezárhatod ezt az oldalt,
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Fiókodhoz nincs hozzárendelve e-mail cím. Ha elfelejted a jelszavadat, csak egy helyreállítási csomaggal tudsz visszajutni. Csak egy percet vesz igénybe."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "A fiókod össze van kapcsolva az egyszeri bejelentkezéssel."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "A privát tered gondolatokhoz és emlékeztetőkhöz"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "A profilod adatvédelmi beállításai korlátozottak, ezért néhányan akkor sem fogják látni ezt a kapcsolatot, ha a „Mindenki” lehetőség be van kapcsolva."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "A szolgáltatód azt kéri, hogy jelentkezz be újra."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "A szolgáltatód hibát jelzett."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "A képernyőmegosztásodat nem sikerült kompatibilis videokodekkel köz
msgid "Your setup token stopped working. Enter it again."
msgstr "A beállítási tokened már nem működik. Add meg újra."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "A bejelentkezési szolgáltatód nem érhető el. Próbáld újra később."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Az e-mail-címedet és a jelszavadat a bejelentkezési szolgáltatód kezeli."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/id/messages.po b/fluxer_app/src/features/i18n/locales/id/messages.po
index 56df455fa..4d3418ec2 100644
--- a/fluxer_app/src/features/i18n/locales/id/messages.po
+++ b/fluxer_app/src/features/i18n/locales/id/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Setelah 14 hari, akunmu akan dihapus secara permanen"
msgid "After date"
msgstr "Setelah tanggal"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Setelah masuk, coba tindakan itu lagi."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Setelah akunmu dihapus, kamu tidak akan bisa menghapus pesan yang sudah kamu kirim"
@@ -9899,6 +9904,11 @@ msgstr "Konfirmasi atau klik dua kali untuk bergabung dengan saluran suara komun
msgid "Conflicts with {conflictLabel}"
msgstr "Berbenturan dengan {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Hubungkan"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Hubungkan kamera dan coba lagi."
@@ -10152,7 +10162,11 @@ msgstr "Menu konteks dapat dibuka dengan klik kiri (pada tombol) atau klik kanan
msgid "Continue"
msgstr "Lanjutkan"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Lanjutkan di aplikasi {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Lanjutkan di aplikasi desktop."
@@ -10831,6 +10845,11 @@ msgstr "Tidak dapat menutup DM"
msgid "Couldn't complete sign-in. Try again."
msgstr "Tidak dapat menyelesaikan proses masuk. Coba lagi."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Tidak dapat menghubungkan login tunggal"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Memungkinkan Anda mengatur ulang sandi jika lupa."
msgid "Lets you share your screen or a window."
msgstr "Memungkinkan Anda membagikan layar atau jendela Anda."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Memungkinkan kamu masuk ke akun ini dengan {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Hanya huruf (a-z, A-Z), angka (0-9), dan garis bawah (_)"
@@ -33613,6 +33637,11 @@ msgstr "Metode masuk"
msgid "Sign-in page"
msgstr "Halaman masuk"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Proses masuk dibatalkan."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Satu lapisan"
msgid "Single line"
msgstr "Satu baris"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Login tunggal"
@@ -43200,6 +43231,11 @@ msgstr "Kamu masuk dengan kode yang dikirim ke emailmu. Kata sandi bersifat opsi
msgid "You sign in with this username. Pick one you will remember."
msgstr "Anda masuk dengan nama pengguna ini. Pilih salah satu yang akan Anda ingat."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Kamu masuk ke akun lain. Masuk dengan akun yang kamu gunakan di sini."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Akunmu berhasil ditautkan. Sekarang kamu bisa menutup tab ini dan kembal
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Akun Anda tidak memiliki alamat email. Jika Anda lupa kata sandi, kit pemulihan adalah satu-satunya cara untuk masuk kembali. Hanya perlu semenit."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Akunmu sudah terhubung ke login tunggal."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Ruang pribadimu untuk catatan dan pengingat"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Privasi profilmu terbatas, jadi sebagian orang tetap tidak akan melihat koneksi ini meskipun opsi \"Semua orang\" diaktifkan."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Penyediamu memintamu masuk lagi."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Penyediamu melaporkan kesalahan."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Berbagi layarmu tidak dapat dipublikasikan dengan codec video yang kompa
msgid "Your setup token stopped working. Enter it again."
msgstr "Token penyiapanmu berhenti berfungsi. Masukkan lagi."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Penyedia login kamu sedang tidak tersedia. Coba lagi nanti."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Email dan kata sandi kamu dikelola oleh penyedia login kamu."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/it/messages.po b/fluxer_app/src/features/i18n/locales/it/messages.po
index def9b1068..38df30068 100644
--- a/fluxer_app/src/features/i18n/locales/it/messages.po
+++ b/fluxer_app/src/features/i18n/locales/it/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Dopo 14 giorni, il tuo account verrà eliminato definitivamente"
msgid "After date"
msgstr "Dopo il"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Dopo l'accesso, riprova l'azione."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Dopo l’eliminazione del tuo account, non potrai più eliminare i messaggi che hai inviato"
@@ -9899,6 +9904,11 @@ msgstr "Conferma o doppio clic per partecipare alle chat vocali"
msgid "Conflicts with {conflictLabel}"
msgstr "In conflitto con {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Collega"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Connetti una fotocamera e riprova."
@@ -10152,7 +10162,11 @@ msgstr "I menu contestuali si aprono con un clic sinistro (sui pulsanti) o destr
msgid "Continue"
msgstr "Continua"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continua nell'app {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continua nell'app desktop."
@@ -10831,6 +10845,11 @@ msgstr "Impossibile chiudere il DM"
msgid "Couldn't complete sign-in. Try again."
msgstr "Accesso non completato. Riprova."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Impossibile collegare l'accesso singolo"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Ti permette di reimpostare la password se la dimentichi."
msgid "Lets you share your screen or a window."
msgstr "Ti consente di condividere il tuo schermo o una finestra."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Ti permette di accedere a questo account con {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Solo lettere (a-z, A-Z), numeri (0-9) e trattini bassi (_)"
@@ -33613,6 +33637,11 @@ msgstr "Metodi di accesso"
msgid "Sign-in page"
msgstr "Pagina di accesso"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "L'accesso è stato annullato."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Singolo livello"
msgid "Single line"
msgstr "Riga singola"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Accesso singolo"
@@ -43200,6 +43231,11 @@ msgstr "Accedi con un codice inviato alla tua email. La password è facoltativa.
msgid "You sign in with this username. Pick one you will remember."
msgstr "Accedi con questo nome utente. Scegline uno che ricorderai."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Hai effettuato l'accesso a un altro account. Accedi con l'account che usi qui."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Il tuo account è stato collegato. Ora puoi chiudere questa scheda e tor
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Il tuo account non ha un indirizzo email. Se dimentichi la password, un kit di recupero è l'unico modo per rientrare. Ci vuole solo un minuto."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Il tuo account è collegato all'accesso singolo."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Il tuo spazio privato per pensieri e promemoria"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "La privacy del tuo profilo è limitata, quindi alcune persone non vedranno comunque questa connessione anche quando l'impostazione è su Tutti."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Il tuo provider ti chiede di accedere di nuovo."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Il tuo provider ha segnalato un errore."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "La condivisione dello schermo non è stata pubblicata con un codec video
msgid "Your setup token stopped working. Enter it again."
msgstr "Il tuo token di configurazione non funziona più. Inseriscilo di nuovo."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Il tuo provider di accesso non è disponibile. Riprova più tardi."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "La tua email e la tua password sono gestite dal tuo provider di accesso."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/ja/messages.po b/fluxer_app/src/features/i18n/locales/ja/messages.po
index b19d5501e..4c7853791 100644
--- a/fluxer_app/src/features/i18n/locales/ja/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ja/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14日後にアカウントは完全に削除されます"
msgid "After date"
msgstr "以降"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "サインイン後に、もう一度操作をお試しください。"
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "アカウント削除後、送信済みのメッセージを削除することはできません"
@@ -9899,6 +9904,11 @@ msgstr "コミュニティボイスへの参加時の確認またはダブルク
msgid "Conflicts with {conflictLabel}"
msgstr "{conflictLabel}と競合しています"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "連携"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "カメラを接続して、もう一度お試しください。"
@@ -10152,7 +10162,11 @@ msgstr "左クリック(ボタン上)または右クリック(その他の
msgid "Continue"
msgstr "続行"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "{productName} アプリで続けてください。"
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "デスクトップアプリで続ける"
@@ -10831,6 +10845,11 @@ msgstr "DMを閉じられませんでした"
msgid "Couldn't complete sign-in. Try again."
msgstr "サインインを完了できませんでした。もう一度お試しください。"
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "シングルサインオンを連携できませんでした"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "パスワードを忘れた場合にリセットできます。"
msgid "Lets you share your screen or a window."
msgstr "画面またはウィンドウを共有できます。"
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "{providerName} でこのアカウントにサインインできるようになります。"
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "半角英数字とアンダースコア (_) のみ使用できます"
@@ -33613,6 +33637,11 @@ msgstr "サインイン方法"
msgid "Sign-in page"
msgstr "サインイン画面"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "サインインはキャンセルされました。"
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "シングルレイヤー"
msgid "Single line"
msgstr "1行"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "シングルサインオン"
@@ -43200,6 +43231,11 @@ msgstr "メールで送信されたコードでサインインします。パス
msgid "You sign in with this username. Pick one you will remember."
msgstr "このユーザー名でサインインします。覚えやすいものを選択してください。"
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "別のアカウントでサインインしました。ここで使っているアカウントでサインインしてください。"
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "アカウントの連携が完了しました。このタブを閉じて
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "メールアドレスが登録されていません。パスワードを忘れた場合、リカバリーキットが唯一の復旧手段となります。わずか1分で作成できます。"
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "アカウントがシングルサインオンと連携されました。"
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "思考やリマインダーを記録するプライベートな場所で
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "プロフィールのプライバシー設定が限定されているため、「全員」にしても一部のユーザーにはこの接続が表示されません。"
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "プロバイダーから再度サインインするよう求められています。"
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "プロバイダーがエラーを報告しました。"
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "互換性のあるビデオコーデックで画面共有を公開でき
msgid "Your setup token stopped working. Enter it again."
msgstr "セットアップトークンが使えなくなりました。もう一度入力してください。"
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "サインインプロバイダーを利用できません。後でもう一度お試しください。"
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "メールアドレスとパスワードはサインインプロバイダーで管理されています。"
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/ko/messages.po b/fluxer_app/src/features/i18n/locales/ko/messages.po
index 982e34807..edf322c5e 100644
--- a/fluxer_app/src/features/i18n/locales/ko/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ko/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14일 후 계정이 영구적으로 삭제됩니다"
msgid "After date"
msgstr "날짜 이후"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "로그인한 후 작업을 다시 시도하세요."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "계정 삭제 후에는 보낸 메시지를 삭제할 수 없습니다"
@@ -9899,6 +9904,11 @@ msgstr "커뮤니티 음성 채널 참여 시 확인 또는 더블 클릭"
msgid "Conflicts with {conflictLabel}"
msgstr "{conflictLabel}과(와) 충돌"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "연결"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "카메라를 연결하고 다시 시도하세요."
@@ -10152,7 +10162,11 @@ msgstr "좌클릭(버튼) 또는 우클릭(다른 요소)으로 상황별 메뉴
msgid "Continue"
msgstr "계속"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "{productName} 앱에서 계속하세요."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "데스크톱 앱에서 계속하세요."
@@ -10831,6 +10845,11 @@ msgstr "DM을 닫을 수 없습니다"
msgid "Couldn't complete sign-in. Try again."
msgstr "로그인을 완료할 수 없습니다. 다시 시도해 주세요."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "SSO 로그인을 연결할 수 없습니다"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "비밀번호를 잊어버렸을 때 재설정할 수 있습니다."
msgid "Lets you share your screen or a window."
msgstr "화면이나 창을 공유할 수 있습니다."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "{providerName}(으)로 이 계정에 로그인할 수 있습니다."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "문자(a-z, A-Z), 숫자(0-9), 밑줄(_)만 사용 가능"
@@ -33613,6 +33637,11 @@ msgstr "로그인 방법"
msgid "Sign-in page"
msgstr "로그인 페이지"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "로그인이 취소되었습니다."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "단일 레이어"
msgid "Single line"
msgstr "한 줄"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "SSO 로그인"
@@ -43200,6 +43231,11 @@ msgstr "이메일로 전송된 코드로 로그인합니다. 비밀번호는 선
msgid "You sign in with this username. Pick one you will remember."
msgstr "이 사용자 이름으로 로그인합니다. 기억하기 쉬운 이름으로 선택하세요."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "다른 계정으로 로그인했습니다. 여기서 사용하는 계정으로 로그인하세요."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "계정이 성공적으로 연결되었습니다. 이 탭을 닫고 앱
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "계정에 이메일 주소가 없습니다. 비밀번호를 잊으셨을 경우, 복구 키트가 유일한 복구 방법입니다. 1분이면 충분합니다."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "계정이 SSO 로그인에 연결되었습니다."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "생각과 미리 알림을 위한 나만의 공간"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "프로필 개인 정보 설정에 제한이 있으므로 일부 사용자는 \"모두\"로 설정하더라도 이 연결을 볼 수 없습니다."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "제공자가 다시 로그인하도록 요청합니다."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "제공자가 오류를 보고했습니다."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "호환되는 비디오 코덱으로 화면 공유를 게시할 수 없
msgid "Your setup token stopped working. Enter it again."
msgstr "설정 토큰이 더 이상 작동하지 않습니다. 다시 입력하세요."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "로그인 제공자를 사용할 수 없어요. 나중에 다시 시도해 주세요."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "이메일과 비밀번호는 로그인 제공자가 관리해요."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/lt/messages.po b/fluxer_app/src/features/i18n/locales/lt/messages.po
index b8d690962..5f7ce2ae5 100644
--- a/fluxer_app/src/features/i18n/locales/lt/messages.po
+++ b/fluxer_app/src/features/i18n/locales/lt/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Po 14 dienų jūsų paskyra bus visam laikui ištrinta"
msgid "After date"
msgstr "Po datos"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Prisijungęs pabandyk veiksmą dar kartą."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Ištrynus paskyrą, išsiųstų žinučių ištrinti nebegalėsite"
@@ -9899,6 +9904,11 @@ msgstr "Patvirtinimas arba dvigubas spustelėjimas prisijungiant prie bendruomen
msgid "Conflicts with {conflictLabel}"
msgstr "Kertasi su „{conflictLabel}“"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Susieti"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Prijunkite kamerą ir bandykite dar kartą."
@@ -10152,7 +10162,11 @@ msgstr "Kontekstiniai meniu atidaromi kairiuoju pelės mygtuku (ant mygtukų) ar
msgid "Continue"
msgstr "Tęsti"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Tęsk programėlėje {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Tęsti darbalaukio programėlėje."
@@ -10831,6 +10845,11 @@ msgstr "Nepavyko uždaryti tiesioginio pokalbio"
msgid "Couldn't complete sign-in. Try again."
msgstr "Nepavyko prisijungti. Bandykite dar kartą."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Nepavyko susieti vienkartinio prisijungimo"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21066,6 +21085,11 @@ msgstr "Leidžia atkurti slaptažodį, jei jį pamiršite."
msgid "Lets you share your screen or a window."
msgstr "Leidžia bendrinti jūsų ekraną arba langą."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Leidžia prisijungti prie šios paskyros per {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Tik raidės (a-z, A-Z), skaitmenys (0-9) ir apatiniai brūkšniai (_)"
@@ -33614,6 +33638,11 @@ msgstr "Prisijungimo būdai"
msgid "Sign-in page"
msgstr "Prisijungimo puslapis"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Prisijungimas atšauktas."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33703,8 +33732,10 @@ msgstr "Vienas sluoksnis"
msgid "Single line"
msgstr "Viena eilutė"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Vienkartinis prisijungimas"
@@ -43201,6 +43232,11 @@ msgstr "Prisijungiate naudodami kodą, išsiųstą jūsų el. paštu. Slaptažod
msgid "You sign in with this username. Pick one you will remember."
msgstr "Prisijunkite naudodami šį vartotojo vardą. Pasirinkite tokį, kurį atsiminsite."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Prisijungei prie kitos paskyros. Prisijunk paskyra, kurią naudoji čia."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43569,6 +43605,11 @@ msgstr "Jūsų paskyra sėkmingai susieta. Dabar galite uždaryti šį skirtuką
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Jūsų paskyroje nėra el. pašto adreso. Jei pamiršite slaptažodį, atsigavimo rinkinys yra vienintelis būdas grįžti. Tai užtruks tik minutę."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tavo paskyra susieta su vienkartiniu prisijungimu."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43977,6 +44018,16 @@ msgstr "Jūsų privati erdvė mintims ir priminimams"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Jūsų profilio privatumas yra ribotas, todėl net jei nustatyta „Visi“, kai kurie žmonės vis tiek nematys šio ryšio."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Tavo teikėjas prašo prisijungti iš naujo."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Tavo teikėjas pranešė apie klaidą."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44018,6 +44069,16 @@ msgstr "Jūsų ekrano bendrinimas negalėjo būti paskelbtas naudojant suderinam
msgid "Your setup token stopped working. Enter it again."
msgstr "Jūsų sąrankos žetonas nebeveikia. Įveskite jį dar kartą."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Tavo prisijungimo teikėjas nepasiekiamas. Bandyk dar kartą vėliau."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Tavo el. paštą ir slaptažodį tvarko tavo prisijungimo teikėjas."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/nl/messages.po b/fluxer_app/src/features/i18n/locales/nl/messages.po
index fe52681d3..34ad4df04 100644
--- a/fluxer_app/src/features/i18n/locales/nl/messages.po
+++ b/fluxer_app/src/features/i18n/locales/nl/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Na 14 dagen wordt je account permanent verwijderd"
msgid "After date"
msgstr "Na datum"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Probeer de actie opnieuw nadat je je hebt aangemeld."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Nadat je account is verwijderd, kun je de berichten die je hebt verzonden niet meer verwijderen"
@@ -9899,6 +9904,11 @@ msgstr "Bevestiging of dubbelklik bij deelname aan spraakkanalen in communities"
msgid "Conflicts with {conflictLabel}"
msgstr "Conflict met {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Koppelen"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Sluit een camera aan en probeer het opnieuw."
@@ -10152,7 +10162,11 @@ msgstr "Contextmenu's kunnen worden geopend met een linkermuisklik (op knoppen)
msgid "Continue"
msgstr "Doorgaan"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Ga verder in de {productName}-app."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Doorgaan in de desktop-app."
@@ -10831,6 +10845,11 @@ msgstr "DM kon niet worden gesloten"
msgid "Couldn't complete sign-in. Try again."
msgstr "Aanmelden is mislukt. Probeer het opnieuw."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Single sign-on kon niet worden gekoppeld"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Hiermee kun je je wachtwoord opnieuw instellen als je het vergeet."
msgid "Lets you share your screen or a window."
msgstr "Hiermee kun je je scherm of een venster delen."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Hiermee kun je met {providerName} inloggen op dit account."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Alleen letters (a-z, A-Z), cijfers (0-9) en underscores (_)"
@@ -33613,6 +33637,11 @@ msgstr "Inlogmethoden"
msgid "Sign-in page"
msgstr "Inlogpagina"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Aanmelden is geannuleerd."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Enkele laag"
msgid "Single line"
msgstr "Eén regel"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Single sign-on"
@@ -43200,6 +43231,11 @@ msgstr "Je logt in met een code die naar je e-mailadres wordt gestuurd. Een wach
msgid "You sign in with this username. Pick one you will remember."
msgstr "Je meldt je aan met deze gebruikersnaam. Kies er een die je onthoudt."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Je hebt je aangemeld bij een ander account. Meld je aan met het account dat je hier gebruikt."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Je account is gekoppeld. Je kunt dit tabblad nu sluiten en teruggaan naa
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Uw account heeft geen e-mailadres. Als u uw wachtwoord vergeet, is een herstelkit de enige manier om weer toegang te krijgen. Het duurt maar een minuut."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Je account is gekoppeld aan single sign-on."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Jouw privéruimte voor gedachten en herinneringen"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Je hebt de zichtbaarheid van je profiel beperkt. Daardoor zien sommige mensen deze verbinding niet, zelfs als \"Iedereen\" is ingeschakeld."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Je provider wil dat je je opnieuw aanmeldt."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Je provider heeft een fout gemeld."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Je gedeelde scherm kon niet met een compatibele videocodec worden uitgez
msgid "Your setup token stopped working. Enter it again."
msgstr "Je instellingstoken werkt niet meer. Vul hem opnieuw in."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Je aanmeldprovider is niet beschikbaar. Probeer het later opnieuw."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Je e-mailadres en wachtwoord worden beheerd door je aanmeldprovider."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/no/messages.po b/fluxer_app/src/features/i18n/locales/no/messages.po
index bf6412989..de8b70f35 100644
--- a/fluxer_app/src/features/i18n/locales/no/messages.po
+++ b/fluxer_app/src/features/i18n/locales/no/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Etter 14 dager blir kontoen din slettet permanent"
msgid "After date"
msgstr "Etter dato"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Prøv handlingen på nytt etter at du har logget på."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Etter at kontoen din er slettet, kan du ikke lenger slette meldingene du har sendt"
@@ -9899,6 +9904,11 @@ msgstr "Bekreftelse eller dobbeltklikk for å bli med i talekanaler i fellesskap
msgid "Conflicts with {conflictLabel}"
msgstr "I konflikt med {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Koble til"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Koble til et kamera og prøv igjen."
@@ -10152,7 +10162,11 @@ msgstr "Du kan åpne kontekstmenyer med venstreklikk (på knapper) eller høyrek
msgid "Continue"
msgstr "Fortsett"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Fortsett i {productName}-appen."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Fortsett i skrivebordsappen."
@@ -10831,6 +10845,11 @@ msgstr "Kunne ikke lukke direktemeldingssamtalen"
msgid "Couldn't complete sign-in. Try again."
msgstr "Kunne ikke fullføre pålogging. Prøv igjen."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Kunne ikke koble til enhetsinnlogging"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Lar deg tilbakestille passordet ditt hvis du glemmer det."
msgid "Lets you share your screen or a window."
msgstr "Lar deg dele skjermen eller et vindu."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Lar deg logge på denne kontoen med {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Kun bokstaver (a-z, A-Z), tall (0-9) og understrek (_)"
@@ -33613,6 +33637,11 @@ msgstr "Innloggingsmetoder"
msgid "Sign-in page"
msgstr "Påloggingsside"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Påloggingen ble avbrutt."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Enkeltlag"
msgid "Single line"
msgstr "Enkel linje"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Enhetsinnlogging"
@@ -43200,6 +43231,11 @@ msgstr "Du logger inn med en kode som sendes til e-posten din. Et passord er val
msgid "You sign in with this username. Pick one you will remember."
msgstr "Du logger inn med dette brukernavnet. Velg et du vil huske."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Du logget på en annen konto. Logg på med kontoen du bruker her."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Kontoen din er nå koblet til. Du kan lukke denne fanen og gå tilbake t
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Kontoen din har ingen e-postadresse. Hvis du glemmer passordet ditt, er et gjenopprettingssett den eneste måten å komme inn igjen på. Det tar bare et minutt."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Kontoen din er koblet til enhetsinnlogging."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Din private plass for tanker og påminnelser"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Profilen din har begrenset synlighet, så noen vil fortsatt ikke se denne tilkoblingen selv om «Alle» er valgt."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Leverandøren din vil at du logger på igjen."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Leverandøren din rapporterte en feil."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Skjermdelingen din kunne ikke publiseres med en kompatibel videokodek, s
msgid "Your setup token stopped working. Enter it again."
msgstr "Oppsettstokenet ditt virker ikke lenger. Skriv det inn på nytt."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Påloggingsleverandøren din er ikke tilgjengelig. Prøv igjen senere."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "E-postadressen og passordet ditt administreres av påloggingsleverandøren din."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/pl/messages.po b/fluxer_app/src/features/i18n/locales/pl/messages.po
index c1b13e0ec..63354626e 100644
--- a/fluxer_app/src/features/i18n/locales/pl/messages.po
+++ b/fluxer_app/src/features/i18n/locales/pl/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Po 14 dniach Twoje konto zostanie trwale usunięte"
msgid "After date"
msgstr "Po dacie"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Po zalogowaniu spróbuj ponownie wykonać tę czynność."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Po usunięciu konta nie będzie można usunąć wysłanych wiadomości"
@@ -9899,6 +9904,11 @@ msgstr "Potwierdzenie lub dwukrotne kliknięcie przy dołączaniu do kanałów g
msgid "Conflicts with {conflictLabel}"
msgstr "Konflikt z {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Połącz"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Podłącz kamerę i spróbuj ponownie."
@@ -10152,7 +10162,11 @@ msgstr "Menu kontekstowe można otworzyć lewym przyciskiem myszy (na przyciskac
msgid "Continue"
msgstr "Dalej"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Kontynuuj w aplikacji {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Kontynuuj w aplikacji desktopowej."
@@ -10831,6 +10845,11 @@ msgstr "Nie udało się zamknąć rozmowy prywatnej"
msgid "Couldn't complete sign-in. Try again."
msgstr "Nie udało się dokończyć logowania. Spróbuj ponownie."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Nie udało się połączyć logowania jednokrotnego"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Pozwala zresetować hasło, jeśli je zapomnisz."
msgid "Lets you share your screen or a window."
msgstr "Umożliwia udostępnianie ekranu lub okna."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Pozwala logować się na to konto przez {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Tylko litery (a-z, A-Z), cyfry (0-9) i podkreślenia (_)"
@@ -33613,6 +33637,11 @@ msgstr "Metody logowania"
msgid "Sign-in page"
msgstr "Strona logowania"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Logowanie zostało anulowane."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Pojedyncza warstwa"
msgid "Single line"
msgstr "Pojedyncza linia"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Logowanie jednokrotne"
@@ -43200,6 +43231,11 @@ msgstr "Logujesz się kodem wysłanym na Twój adres e-mail. Hasło jest opcjona
msgid "You sign in with this username. Pick one you will remember."
msgstr "Logujesz się tym identyfikatorem. Wybierz taki, który zapamiętasz."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Zalogowano się na inne konto. Zaloguj się na konto, którego tu używasz."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Twoje konto zostało pomyślnie połączone. Możesz teraz zamknąć tę
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Twoje konto nie ma adresu e-mail. Jeśli zapomnisz hasła, zestaw odzyskiwania to jedyny sposób na powrót. Zajmie to tylko minutę."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Twoje konto jest połączone z logowaniem jednokrotnym."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Twoja prywatna przestrzeń na myśli i przypomnienia"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Widoczność Twojego profilu jest ograniczona, więc niektóre osoby nadal nie będą widzieć tego połączenia, nawet jeśli włączysz opcję „Wszyscy”."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Twój dostawca wymaga ponownego zalogowania."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Twój dostawca zgłosił błąd."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Nie udało się opublikować udostępniania ekranu za pomocą zgodnego k
msgid "Your setup token stopped working. Enter it again."
msgstr "Twój token konfiguracyjny przestał działać. Wpisz go ponownie."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Twój dostawca logowania jest niedostępny. Spróbuj ponownie później."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Twoim adresem e-mail i hasłem zarządza Twój dostawca logowania."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
index ca2539ab5..39feee113 100644
--- a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
+++ b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Após 14 dias, sua conta será excluída permanentemente"
msgid "After date"
msgstr "Depois de"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Depois de entrar, tente a ação novamente."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Depois que sua conta for excluída, você não poderá excluir as mensagens que enviou"
@@ -9899,6 +9904,11 @@ msgstr "Confirmação ou duplo clique para entrar em canais de voz da comunidade
msgid "Conflicts with {conflictLabel}"
msgstr "Conflita com {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Conectar"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Conecte uma câmera e tente novamente."
@@ -10152,7 +10162,11 @@ msgstr "Os menus de contexto podem ser abertos com um clique esquerdo (em botõe
msgid "Continue"
msgstr "Continuar"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continue no app do {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continuar no aplicativo para desktop."
@@ -10831,6 +10845,11 @@ msgstr "Não foi possível fechar a conversa por mensagem direta"
msgid "Couldn't complete sign-in. Try again."
msgstr "Não foi possível concluir o login. Tente novamente."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Não foi possível conectar o login único"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Permite redefinir sua senha caso você a esqueça."
msgid "Lets you share your screen or a window."
msgstr "Permite que você compartilhe sua tela ou uma janela."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Permite que você entre nesta conta com {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Somente letras (a-z, A-Z), números (0-9) e sublinhados (_)"
@@ -33613,6 +33637,11 @@ msgstr "Métodos de login"
msgid "Sign-in page"
msgstr "Página de login"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "O login foi cancelado."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Camada única"
msgid "Single line"
msgstr "Linha única"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Login único"
@@ -43200,6 +43231,11 @@ msgstr "Você faz login com um código enviado para o seu e-mail. A senha é opc
msgid "You sign in with this username. Pick one you will remember."
msgstr "Você faz login com este nome de usuário. Escolha um que você lembrará."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Você entrou em outra conta. Entre com a conta que você usa aqui."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Sua conta foi vinculada com sucesso. Agora você pode fechar esta aba e
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Sua conta não tem um endereço de e-mail. Se você esquecer sua senha, um kit de recuperação é a única maneira de voltar. Leva apenas um minuto."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Sua conta está conectada ao login único."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Seu espaço privado para pensamentos e lembretes"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Sua privacidade de perfil é limitada, então algumas pessoas ainda não verão essa conexão mesmo quando a opção \"Todos\" estiver ativada."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Seu provedor precisa que você entre novamente."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Seu provedor informou um erro."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Seu compartilhamento de tela não pôde ser publicado com um codec de v
msgid "Your setup token stopped working. Enter it again."
msgstr "Seu token de configuração parou de funcionar. Digite-o novamente."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Seu provedor de login está indisponível. Tente novamente mais tarde."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Seu e-mail e sua senha são gerenciados pelo seu provedor de login."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/ro/messages.po b/fluxer_app/src/features/i18n/locales/ro/messages.po
index 9819c9f19..a10b47002 100644
--- a/fluxer_app/src/features/i18n/locales/ro/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ro/messages.po
@@ -4075,6 +4075,11 @@ msgstr "După 14 zile, contul tău va fi șters definitiv"
msgid "After date"
msgstr "După data de"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "După autentificare, încearcă din nou acțiunea."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "După ștergerea contului, nu vei mai putea șterge mesajele pe care le-ai trimis"
@@ -9899,6 +9904,11 @@ msgstr "Confirmare sau dublu clic pentru a intra în canalele vocale ale comunit
msgid "Conflicts with {conflictLabel}"
msgstr "Intră în conflict cu {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Conectează"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Conectează o cameră și încearcă din nou."
@@ -10152,7 +10162,11 @@ msgstr "Meniurile contextuale pot fi deschise cu clic stânga (pe butoane) sau c
msgid "Continue"
msgstr "Continuă"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Continuă în aplicația {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Continuă în aplicația desktop."
@@ -10831,6 +10845,11 @@ msgstr "Nu s-a putut închide DM-ul"
msgid "Couldn't complete sign-in. Try again."
msgstr "Nu s-a putut finaliza autentificarea. Încearcă din nou."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Autentificarea unică nu a putut fi conectată"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Îți permite să-ți resetezi parola dacă o uiți."
msgid "Lets you share your screen or a window."
msgstr "Îți permite să partajezi ecranul sau o fereastră."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Îți permite să te conectezi la acest cont cu {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Doar litere (a-z, A-Z), cifre (0-9) și liniuțe de subliniere (_)"
@@ -33613,6 +33637,11 @@ msgstr "Metode de conectare"
msgid "Sign-in page"
msgstr "Pagina de conectare"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Autentificarea a fost anulată."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Strat unic"
msgid "Single line"
msgstr "O singură linie"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Autentificare unică"
@@ -43200,6 +43231,11 @@ msgstr "Te conectezi cu un cod trimis pe e-mailul tău. Parola este opțională.
msgid "You sign in with this username. Pick one you will remember."
msgstr "Te autentifici cu acest nume de utilizator. Alege unul pe care ți-l vei aminti."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Te-ai autentificat într-un alt cont. Autentifică-te cu contul pe care îl folosești aici."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Contul tău a fost conectat cu succes. Acum poți închide această fil
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Contul tău nu are o adresă de e-mail. Dacă uiți parola, un kit de recuperare este singura modalitate de a reveni. Durează doar un minut."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Contul tău este conectat la autentificarea unică."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Spațiul tău privat pentru gânduri și memento-uri"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Confidențialitatea profilului tău este limitată, astfel încât unele persoane tot nu vor vedea această conexiune, chiar dacă opțiunea „Toată lumea” este activată."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Furnizorul tău îți cere să te autentifici din nou."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Furnizorul tău a raportat o eroare."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Partajarea ecranului tău nu a putut fi publicată cu un codec video com
msgid "Your setup token stopped working. Enter it again."
msgstr "Tokenul tău de configurare nu mai funcționează. Introdu-l din nou."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Furnizorul tău de autentificare nu este disponibil. Încearcă din nou mai târziu."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Adresa ta de email și parola sunt gestionate de furnizorul tău de autentificare."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/ru/messages.po b/fluxer_app/src/features/i18n/locales/ru/messages.po
index 1c244fb74..e139dc051 100644
--- a/fluxer_app/src/features/i18n/locales/ru/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ru/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Через 14 дней ваш аккаунт будет удален б
msgid "After date"
msgstr "После даты"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "После входа попробуй выполнить действие ещё раз."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "После удаления аккаунта вы не сможете удалить сообщения, которые отправили"
@@ -9899,6 +9904,11 @@ msgstr "Подтверждение или двойной щелчок для в
msgid "Conflicts with {conflictLabel}"
msgstr "Конфликтует с {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Подключить"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Подключите камеру и попробуйте снова."
@@ -10152,7 +10162,11 @@ msgstr "Контекстные меню открываются левым кли
msgid "Continue"
msgstr "Продолжить"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Продолжи в приложении {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Продолжить в настольном приложении."
@@ -10831,6 +10845,11 @@ msgstr "Не удалось закрыть личный чат"
msgid "Couldn't complete sign-in. Try again."
msgstr "Не удалось завершить вход. Повторите попытку."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Не удалось подключить единый вход"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Позволяет сбросить пароль, если вы его
msgid "Lets you share your screen or a window."
msgstr "Позволяет делиться экраном или окном."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Позволяет входить в этот аккаунт через {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Только буквы (a-z, A-Z), цифры (0-9) и знаки подчеркивания (_)"
@@ -33613,6 +33637,11 @@ msgstr "Способы входа"
msgid "Sign-in page"
msgstr "Страница входа"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Вход отменён."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Один слой"
msgid "Single line"
msgstr "Одна строка"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Единый вход"
@@ -43200,6 +43231,11 @@ msgstr "Вы входите с помощью кода, отправленног
msgid "You sign in with this username. Pick one you will remember."
msgstr "Вы входите в систему с этим именем пользователя. Выберите то, которое запомните."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Ты вошёл в другой аккаунт. Войди в аккаунт, который используешь здесь."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Ваш аккаунт успешно привязан. Теперь вы
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "На вашем аккаунте нет адреса электронной почты. Если вы забудете пароль, восстановить доступ можно будет только с помощью комплекта восстановления. Это займет всего минуту."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Твой аккаунт подключён к единому входу."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Ваше личное пространство для мыслей и н
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Настройки конфиденциальности вашего профиля ограничены, поэтому некоторые люди всё равно не увидят это подключение, даже если выбрано значение «Все»."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Твой провайдер просит войти снова."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Твой провайдер сообщил об ошибке."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Не удалось опубликовать демонстрацию э
msgid "Your setup token stopped working. Enter it again."
msgstr "Ваш токен настройки перестал работать. Введите его снова."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Твой провайдер входа недоступен. Попробуй позже."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Твоей почтой и паролем управляет твой провайдер входа."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
index 44abba4c1..7a252b920 100644
--- a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
+++ b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Efter 14 dagar raderas ditt konto permanent"
msgid "After date"
msgstr "Efter datum"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Försök med åtgärden igen när du har loggat in."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Efter att ditt konto har raderats kommer du inte att kunna radera meddelandena du har skickat"
@@ -9899,6 +9904,11 @@ msgstr "Bekräftelse eller dubbelklick för att ansluta till röstkanaler i comm
msgid "Conflicts with {conflictLabel}"
msgstr "Konflikter med {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Anslut"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Anslut en kamera och försök igen."
@@ -10152,7 +10162,11 @@ msgstr "Snabbmenyer kan öppnas med vänsterklick (på knappar) eller högerklic
msgid "Continue"
msgstr "Fortsätt"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Fortsätt i {productName}-appen."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Fortsätt i skrivbordsappen."
@@ -10831,6 +10845,11 @@ msgstr "Kunde inte stänga DM-konversationen"
msgid "Couldn't complete sign-in. Try again."
msgstr "Kunde inte slutföra inloggningen. Försök igen."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Det gick inte att ansluta enkel inloggning"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Låter dig återställa ditt lösenord om du glömmer det."
msgid "Lets you share your screen or a window."
msgstr "Låter dig dela din skärm eller ett fönster."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Gör att du kan logga in på det här kontot med {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Endast bokstäver (a-z, A-Z), siffror (0-9) och understreck (_)"
@@ -33613,6 +33637,11 @@ msgstr "Inloggningsmetoder"
msgid "Sign-in page"
msgstr "Inloggningssida"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Inloggningen avbröts."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Enkelt lager"
msgid "Single line"
msgstr "Enkel rad"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Enkel inloggning"
@@ -43200,6 +43231,11 @@ msgstr "Du loggar in med en kod som skickas till din e-post. Ett lösenord är v
msgid "You sign in with this username. Pick one you will remember."
msgstr "Du loggar in med det här användarnamnet. Välj ett du kommer att komma ihåg."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Du loggade in på ett annat konto. Logga in med kontot du använder här."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Ditt konto har länkats. Du kan nu stänga den här fliken och återgå
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Ditt konto saknar e-postadress. Om du glömmer ditt lösenord är en återställningsnyckel det enda sättet att komma tillbaka. Det tar bara en minut."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Ditt konto är anslutet till enkel inloggning."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Ditt privata utrymme för tankar och påminnelser"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Din profils synlighet är begränsad, så vissa personer kan fortfarande inte se den här anslutningen även när ”Alla” är aktiverat."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Din leverantör vill att du loggar in igen."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Din leverantör rapporterade ett fel."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Din skärmdelning kunde inte publiceras med en kompatibel videokodek, s
msgid "Your setup token stopped working. Enter it again."
msgstr "Din konfigurationstoken slutade fungera. Ange den igen."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Din inloggningsleverantör är inte tillgänglig. Försök igen senare."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Din e-postadress och ditt lösenord hanteras av din inloggningsleverantör."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/th/messages.po b/fluxer_app/src/features/i18n/locales/th/messages.po
index 1a69fd921..c39451697 100644
--- a/fluxer_app/src/features/i18n/locales/th/messages.po
+++ b/fluxer_app/src/features/i18n/locales/th/messages.po
@@ -4075,6 +4075,11 @@ msgstr "หลังจาก 14 วัน บัญชีของคุณจ
msgid "After date"
msgstr "หลังวันที่"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "หลังจากลงชื่อเข้าใช้ ให้ลองดำเนินการอีกครั้ง"
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "หลังจากบัญชีของคุณถูกลบแล้ว คุณจะไม่สามารถลบข้อความที่ส่งไปแล้วได้"
@@ -9899,6 +9904,11 @@ msgstr "ยืนยันหรือดับเบิลคลิกเพื
msgid "Conflicts with {conflictLabel}"
msgstr "ขัดแย้งกับ {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "เชื่อมต่อ"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "เชื่อมต่อกล้องแล้วลองอีกครั้ง"
@@ -10152,7 +10162,11 @@ msgstr "เมนูบริบทสามารถเปิดได้ด้
msgid "Continue"
msgstr "ดำเนินการต่อ"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "ดำเนินการต่อในแอป {productName}"
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "ดำเนินการต่อในแอปเดสก์ท็อป"
@@ -10831,6 +10845,11 @@ msgstr "ปิดข้อความส่วนตัวไม่ได้"
msgid "Couldn't complete sign-in. Try again."
msgstr "ลงชื่อเข้าใช้ไม่สำเร็จ โปรดลองอีกครั้ง"
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "เชื่อมต่อการลงชื่อเข้าใช้แบบครั้งเดียวไม่สำเร็จ"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "ช่วยให้คุณรีเซ็ตรหัสผ่าน
msgid "Lets you share your screen or a window."
msgstr "ให้คุณแชร์หน้าจอหรือหน้าต่างของคุณ"
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "ให้คุณลงชื่อเข้าใช้บัญชีนี้ด้วย {providerName} ได้"
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "ตัวอักษร (a-z, A-Z), ตัวเลข (0-9) และขีดล่าง (_) เท่านั้น"
@@ -33613,6 +33637,11 @@ msgstr "วิธีการลงชื่อเข้าใช้"
msgid "Sign-in page"
msgstr "หน้าลงชื่อเข้าใช้"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "การลงชื่อเข้าใช้ถูกยกเลิก"
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "เลเยอร์เดียว"
msgid "Single line"
msgstr "บรรทัดเดียว"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "การลงชื่อเข้าใช้แบบครั้งเดียว"
@@ -43200,6 +43231,11 @@ msgstr "คุณลงชื่อเข้าใช้ด้วยรหัส
msgid "You sign in with this username. Pick one you will remember."
msgstr "คุณจะใช้ชื่อผู้ใช้นี้ในการลงชื่อเข้าใช้ เลือกชื่อที่คุณจะจำได้"
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "คุณลงชื่อเข้าใช้บัญชีอื่น โปรดลงชื่อเข้าใช้ด้วยบัญชีที่คุณใช้อยู่ที่นี่"
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "เชื่อมบัญชีของคุณสำเร็จแ
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "บัญชีของคุณไม่มีที่อยู่อีเมล หากคุณลืมรหัสผ่าน ชุดกู้คืนจะเป็นวิธีเดียวที่จะกลับเข้าสู่ระบบได้ ใช้เวลาเพียงนาทีเดียว"
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "บัญชีของคุณเชื่อมต่อกับการลงชื่อเข้าใช้แบบครั้งเดียวแล้ว"
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "พื้นที่ส่วนตัวสำหรับจดคว
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "ความเป็นส่วนตัวของโปรไฟล์ของคุณถูกจำกัด ดังนั้นบางคนอาจยังไม่เห็นการเชื่อมต่อนี้ แม้ว่าคุณจะตั้งค่าเป็น \"ทุกคน\" แล้วก็ตาม"
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "ผู้ให้บริการของคุณต้องการให้คุณลงชื่อเข้าใช้อีกครั้ง"
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "ผู้ให้บริการของคุณรายงานข้อผิดพลาด"
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "ไม่สามารถเผยแพร่การแชร์ห
msgid "Your setup token stopped working. Enter it again."
msgstr "โทเค็นการตั้งค่าของคุณใช้งานไม่ได้แล้ว ใส่อีกครั้ง"
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "ผู้ให้บริการเข้าสู่ระบบของคุณไม่พร้อมใช้งาน โปรดลองอีกครั้งในภายหลัง"
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "ผู้ให้บริการเข้าสู่ระบบของคุณเป็นผู้จัดการอีเมลและรหัสผ่านของคุณ"
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/tr/messages.po b/fluxer_app/src/features/i18n/locales/tr/messages.po
index 0bffc1211..973228d3b 100644
--- a/fluxer_app/src/features/i18n/locales/tr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/tr/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14 gün sonra hesabınız kalıcı olarak silinecek"
msgid "After date"
msgstr "Şu tarihten sonra"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Oturum açtıktan sonra işlemi tekrar dene."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Hesabınız silindikten sonra gönderdiğiniz mesajları silemezsiniz"
@@ -9899,6 +9904,11 @@ msgstr "Topluluk sesli kanallarına katılmak için onay veya çift tıklama"
msgid "Conflicts with {conflictLabel}"
msgstr "{conflictLabel} ile çakışıyor"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Bağla"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Bir kamera bağlayıp tekrar deneyin."
@@ -10152,7 +10162,11 @@ msgstr "Bağlam menüleri sol tıklama (düğmelerde) veya sağ tıklama (diğer
msgid "Continue"
msgstr "Devam et"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "{productName} uygulamasında devam et."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Masaüstü uygulamasında devam et."
@@ -10831,6 +10845,11 @@ msgstr "DM kapatılamadı"
msgid "Couldn't complete sign-in. Try again."
msgstr "Oturum açılamadı. Tekrar deneyin."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Tekli oturum açma bağlanamadı"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Unutursanız parolanızı sıfırlamanızı sağlar."
msgid "Lets you share your screen or a window."
msgstr "Ekranınızı veya bir pencereyi paylaşmanıza olanak tanır."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Bu hesaba {providerName} ile giriş yapmanı sağlar."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Yalnızca harfler (a-z, A-Z), rakamlar (0-9) ve alt çizgi (_)"
@@ -33613,6 +33637,11 @@ msgstr "Oturum açma yöntemleri"
msgid "Sign-in page"
msgstr "Giriş sayfası"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Oturum açma iptal edildi."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Tek katmanlı"
msgid "Single line"
msgstr "Tek satır"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Tekli oturum açma"
@@ -43200,6 +43231,11 @@ msgstr "E-posta adresinize gönderilen bir kodla oturum açarsınız. Şifre ist
msgid "You sign in with this username. Pick one you will remember."
msgstr "Bu kullanıcı adıyla oturum açarsınız. Hatırlayacağınız bir tane seçin."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Farklı bir hesapta oturum açtın. Burada kullandığın hesapla oturum aç."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Hesabınız başarıyla bağlandı. Artık bu sekmeyi kapatıp uygulamay
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Hesabınızda e-posta adresi yok. Parolanızı unutursanız, kurtarma kiti tek geri dönüş yolunuzdur. Bir dakika sürer."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Hesabın tekli oturum açmaya bağlandı."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Düşünceleriniz ve hatırlatıcılarınız için özel alanınız"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Profil gizliliğiniz sınırlı, bu nedenle Herkes seçeneği etkinken bile bazı kişiler bu bağlantıyı göremez."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Sağlayıcın tekrar oturum açmanı istiyor."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Sağlayıcın bir hata bildirdi."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Ekran paylaşımınız uyumlu bir video kodeğiyle yayınlanamadı, bu n
msgid "Your setup token stopped working. Enter it again."
msgstr "Kurulum belirteciniz artık çalışmıyor. Yeniden girin."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Oturum açma sağlayıcın şu anda kullanılamıyor. Daha sonra tekrar dene."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "E-posta adresin ve şifren oturum açma sağlayıcın tarafından yönetiliyor."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/uk/messages.po b/fluxer_app/src/features/i18n/locales/uk/messages.po
index 86677d661..a9da48498 100644
--- a/fluxer_app/src/features/i18n/locales/uk/messages.po
+++ b/fluxer_app/src/features/i18n/locales/uk/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Через 14 днів ваш обліковий запис буде о
msgid "After date"
msgstr "Після дати"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Після входу спробуй виконати дію ще раз."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Після видалення облікового запису ви не зможете видалити повідомлення, які надіслали"
@@ -9899,6 +9904,11 @@ msgstr "Підтвердження або подвійне клацання дл
msgid "Conflicts with {conflictLabel}"
msgstr "Конфліктує з {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Під'єднати"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Підключіть камеру та спробуйте ще раз."
@@ -10152,7 +10162,11 @@ msgstr "Контекстні меню можна відкрити лівим к
msgid "Continue"
msgstr "Продовжити"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Продовж у застосунку {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Продовжити в настільному додатку."
@@ -10831,6 +10845,11 @@ msgstr "Не вдалося закрити приватний чат"
msgid "Couldn't complete sign-in. Try again."
msgstr "Не вдалося завершити вхід. Спробуйте ще раз."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Не вдалося під'єднати єдиний вхід"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Дозволяє скинути пароль, якщо ви його з
msgid "Lets you share your screen or a window."
msgstr "Дозволяє ділитися екраном або вікном."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Дає змогу входити в цей обліковий запис через {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Лише літери (a-z, A-Z), цифри (0-9) та символи підкреслення (_)"
@@ -33613,6 +33637,11 @@ msgstr "Способи входу"
msgid "Sign-in page"
msgstr "Сторінка входу"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Вхід скасовано."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Один шар"
msgid "Single line"
msgstr "Один рядок"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Єдиний вхід"
@@ -43200,6 +43231,11 @@ msgstr "Ви входите за допомогою коду, надіслано
msgid "You sign in with this username. Pick one you will remember."
msgstr "Ви входите за допомогою цього імені користувача. Виберіть те, яке запам'ятаєте."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Ти увійшов в інший обліковий запис. Увійди в обліковий запис, який використовуєш тут."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Ваш обліковий запис успішно прив'язано.
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Ваш обліковий запис не має адреси електронної пошти. Якщо ви забудете пароль, відновити доступ можна буде лише за допомогою комплекту для відновлення. Це займе всього хвилину."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Твій обліковий запис під'єднано до єдиного входу."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Ваш особистий простір для думок і нагад
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Ваша конфіденційність профілю обмежена, тому деякі люди все одно не бачитимуть це підключення, навіть якщо ввімкнено «Усі»."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Твій провайдер просить увійти знову."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Твій провайдер повідомив про помилку."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Не вдалося опублікувати демонстрацію е
msgid "Your setup token stopped working. Enter it again."
msgstr "Ваш токен налаштування перестав працювати. Введіть його знову."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Твій провайдер входу недоступний. Спробуй пізніше."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Твоєю електронною поштою та паролем керує твій провайдер входу."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/vi/messages.po b/fluxer_app/src/features/i18n/locales/vi/messages.po
index 590a0e16e..23faf2416 100644
--- a/fluxer_app/src/features/i18n/locales/vi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/vi/messages.po
@@ -4075,6 +4075,11 @@ msgstr "Sau 14 ngày, tài khoản của bạn sẽ bị xóa vĩnh viễn"
msgid "After date"
msgstr "Sau ngày"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "Sau khi đăng nhập, hãy thử lại thao tác."
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "Sau khi tài khoản bị xóa, bạn sẽ không thể xóa các tin nhắn đã gửi"
@@ -9899,6 +9904,11 @@ msgstr "Xác nhận hoặc nhấp đúp để tham gia kênh thoại cộng đ
msgid "Conflicts with {conflictLabel}"
msgstr "Xung đột với {conflictLabel}"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "Kết nối"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "Kết nối camera và thử lại."
@@ -10152,7 +10162,11 @@ msgstr "Bạn có thể mở menu ngữ cảnh bằng cách nhấp chuột trái
msgid "Continue"
msgstr "Tiếp tục"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "Tiếp tục trong ứng dụng {productName}."
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "Tiếp tục trong ứng dụng máy tính."
@@ -10831,6 +10845,11 @@ msgstr "Không thể đóng tin nhắn trực tiếp"
msgid "Couldn't complete sign-in. Try again."
msgstr "Không thể hoàn tất đăng nhập. Vui lòng thử lại."
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "Không thể kết nối đăng nhập một lần"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "Cho phép bạn đặt lại mật khẩu nếu bạn quên."
msgid "Lets you share your screen or a window."
msgstr "Cho phép bạn chia sẻ màn hình hoặc một cửa sổ."
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "Cho phép bạn đăng nhập vào tài khoản này bằng {providerName}."
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "Chỉ dùng chữ cái (a-z, A-Z), số (0-9) và dấu gạch dưới (_)"
@@ -33613,6 +33637,11 @@ msgstr "Phương thức đăng nhập"
msgid "Sign-in page"
msgstr "Trang đăng nhập"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "Đã hủy đăng nhập."
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "Một lớp"
msgid "Single line"
msgstr "Một dòng"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "Đăng nhập một lần"
@@ -43200,6 +43231,11 @@ msgstr "Bạn đăng nhập bằng mã gửi đến email của bạn. Mật kh
msgid "You sign in with this username. Pick one you will remember."
msgstr "Bạn đăng nhập bằng tên người dùng này. Hãy chọn một tên bạn sẽ nhớ."
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "Bạn đã đăng nhập vào một tài khoản khác. Hãy đăng nhập bằng tài khoản bạn đang dùng ở đây."
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "Tài khoản của bạn đã được liên kết thành công. Bây gi
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "Tài khoản của bạn chưa có địa chỉ email. Nếu quên mật khẩu, bộ dụng cụ khôi phục là cách duy nhất để truy cập lại. Chỉ mất một phút thôi."
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "Tài khoản của bạn đã được kết nối với đăng nhập một lần."
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "Không gian riêng tư để ghi chú và nhắc nhở"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "Quyền riêng tư hồ sơ của bạn bị giới hạn, vì vậy một số người vẫn không thấy kết nối này ngay cả khi bật tùy chọn \"Mọi người\"."
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "Nhà cung cấp của bạn yêu cầu bạn đăng nhập lại."
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "Nhà cung cấp của bạn đã báo lỗi."
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "Không thể phát lượt chia sẻ màn hình của bạn bằng codec
msgid "Your setup token stopped working. Enter it again."
msgstr "Mã thiết lập của bạn không còn hoạt động. Hãy nhập lại."
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "Nhà cung cấp đăng nhập của bạn hiện không khả dụng. Vui lòng thử lại sau."
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "Email và mật khẩu của bạn do nhà cung cấp đăng nhập của bạn quản lý."
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
index 981b17e10..78bfa6e50 100644
--- a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
+++ b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14 天后,你的账号将被永久删除"
msgid "After date"
msgstr "在此日期之后"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "登录后,请再次尝试该操作。"
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "账号删除后,你将无法删除已发送的消息"
@@ -9899,6 +9904,11 @@ msgstr "加入社区语音频道时需确认或双击"
msgid "Conflicts with {conflictLabel}"
msgstr "与 {conflictLabel} 冲突"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "关联"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "连接摄像头后重试。"
@@ -10152,7 +10162,11 @@ msgstr "左键点击(按钮)或右键点击(其他元素)可打开上下
msgid "Continue"
msgstr "继续"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "请在 {productName} 应用中继续。"
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "在桌面应用中继续。"
@@ -10831,6 +10845,11 @@ msgstr "无法关闭私信"
msgid "Couldn't complete sign-in. Try again."
msgstr "无法完成登录。请重试。"
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "无法关联单点登录"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "如果忘记密码,可以使用它来重置。"
msgid "Lets you share your screen or a window."
msgstr "允许你共享屏幕或窗口。"
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "你可以使用 {providerName} 登录此账号。"
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "仅限字母(a-z, A-Z)、数字(0-9)和下划线(_)"
@@ -33613,6 +33637,11 @@ msgstr "登录方式"
msgid "Sign-in page"
msgstr "登录页面"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "登录已取消。"
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "单层"
msgid "Single line"
msgstr "单行"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "单点登录"
@@ -43200,6 +43231,11 @@ msgstr "你将使用发送到邮箱的验证码登录。密码为可选项。"
msgid "You sign in with this username. Pick one you will remember."
msgstr "您将使用此用户名登录。请选择一个您能记住的。"
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "你登录的是另一个账号。请使用你在这里使用的账号登录。"
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "你的账号已成功关联。现在可以关闭此标签页并返回应
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "您的账号未绑定邮箱。如果忘记密码,恢复工具是找回账号的唯一途径。只需一分钟即可完成。"
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "你的账号已关联单点登录。"
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "你的私密空间,用来记录想法和提醒"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "你的个人资料隐私设置有限制,因此即使启用了“所有人”,仍有些人无法看到此连接。"
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "你的提供方需要你重新登录。"
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "你的提供方报告了一个错误。"
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "你的屏幕共享无法使用兼容的视频编解码器发布,因此
msgid "Your setup token stopped working. Enter it again."
msgstr "你的设置令牌已失效。请重新输入。"
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "你的登录提供商目前不可用。请稍后重试。"
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "你的邮箱和密码由你的登录提供商管理。"
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
index f048aa9b8..b199f6dfd 100644
--- a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
+++ b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
@@ -4075,6 +4075,11 @@ msgstr "14 天後,您的帳號將會被永久刪除"
msgid "After date"
msgstr "此日期之後"
+#. Shown above the single sign-on button when confirming it's you. Signing in can leave the page, and the person repeats the action afterwards.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "After you sign in, try the action again."
+msgstr "登入後,請再試一次該操作。"
+
#: src/features/auth/components/modals/AccountDeleteModal.tsx
msgid "After your account is deleted, you will not be able to delete the messages you sent"
msgstr "帳號刪除後,您將無法刪除已傳送的訊息"
@@ -9899,6 +9904,11 @@ msgstr "社群語音加入時的確認或雙擊動作"
msgid "Conflicts with {conflictLabel}"
msgstr "與 {conflictLabel} 衝突"
+#. Button in account settings that connects the account to single sign-on.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Connect"
+msgstr "連結"
+
#: src/features/user/components/modals/tabs/UserVideoTab.tsx
msgid "Connect a camera and try again."
msgstr "請連接相機後再試一次。"
@@ -10152,7 +10162,11 @@ msgstr "按一下左鍵(在按鈕上)或按一下右鍵(在其他元素上
msgid "Continue"
msgstr "繼續"
+#. Shown on the web page after an SSO sign-in that started in the mobile app. productName is the app name.
#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Continue in the {productName} app."
+msgstr "請在 {productName} 應用程式中繼續。"
+
#: src/features/auth/flow/DesktopDeepLinkPrompt.tsx
msgid "Continue in the desktop app."
msgstr "在桌面應用程式中繼續。"
@@ -10831,6 +10845,11 @@ msgstr "無法關閉私訊"
msgid "Couldn't complete sign-in. Try again."
msgstr "無法完成登入。請再試一次。"
+#. Error title shown when starting to connect single sign-on from account settings fails.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Couldn't connect single sign-on"
+msgstr "無法連結單一登入"
+
#. Auth error shown when connecting to an instance fails, in the instance selector or when sign-in cannot reach the live connection. Domain is interpolated.
#: src/features/auth/flow/instance_selector/InstanceDiscoveryFailure.ts
msgid "Couldn't connect to {domain}. Try again."
@@ -21065,6 +21084,11 @@ msgstr "讓你忘記密碼時可以重設。"
msgid "Lets you share your screen or a window."
msgstr "可讓你分享你的螢幕或視窗。"
+#. Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
+msgid "Lets you sign in to this account with {providerName}."
+msgstr "你可以使用 {providerName} 登入此帳號。"
+
#: src/features/ui/components/form/UsernameValidationRules.tsx
msgid "Letters (a-z, A-Z), numbers (0-9), and underscores (_) only"
msgstr "僅限使用字母 (a-z, A-Z)、數字 (0-9) 和底線 (_)"
@@ -33613,6 +33637,11 @@ msgstr "登入方式"
msgid "Sign-in page"
msgstr "登入頁面"
+#. SSO callback page error shown when the person cancelled the sign-in at their sign-in provider.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Sign-in was cancelled."
+msgstr "登入已取消。"
+
#. Aria label on the signal-strength icon shown while the first latency sample is still pending.
#: src/features/voice/components/SignalStrengthIcon.tsx
msgid "Signal strength loading"
@@ -33702,8 +33731,10 @@ msgstr "單層"
msgid "Single line"
msgstr "單行"
-#. Heading of the single sign-on panel when the admin has not named the sign-in provider.
+#. Heading of the single sign-on panel when the admin has not given the sign-in provider a name.
+#. Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.
#: src/features/auth/flow/AuthSsoPanel.tsx
+#: src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
msgid "Single sign-on"
msgstr "單一登入"
@@ -43200,6 +43231,11 @@ msgstr "您會使用傳送到您電子郵件的驗證碼登入。密碼是選填
msgid "You sign in with this username. Pick one you will remember."
msgstr "你將使用此使用者名稱登入。請選擇一個你會記得的。"
+#. Error shown when the person confirmed it's them by signing in to a different account than the one they are using.
+#: src/features/auth/components/modals/SudoSsoReauth.tsx
+msgid "You signed in to a different account. Sign in with the account you're using here."
+msgstr "你登入的是另一個帳號。請使用你在這裡使用的帳號登入。"
+
#. Voice chat status tooltip for the current user. A moderator deafened them so they cannot hear voice chat.
#: src/features/voice/utils/VoiceMessageDescriptors.ts
msgid "You were deafened by moderators"
@@ -43568,6 +43604,11 @@ msgstr "您的帳號已成功連結。現在您可以關閉此分頁並返回應
msgid "Your account has no email address. If you forget your password, a recovery kit is the only way back in. It only takes a minute."
msgstr "你的帳號沒有設定電子郵件。如果忘記密碼,恢復套件是唯一能重新登入的方式。只需一分鐘即可完成。"
+#. Toast shown after the account was connected to single sign-on from account settings.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your account is connected to single sign-on."
+msgstr "你的帳號已連結單一登入。"
+
#. Settings alert for an unclaimed account on an instance where people sign in with a username.
#: src/features/user/utils/AccountGatePresentation.tsx
msgid "Your account is not yet claimed. Without a username and password, you won't be able to sign in from other devices and you could lose access to your account. Claim your account now to secure it."
@@ -43976,6 +44017,16 @@ msgstr "專屬於您的私人空間,記錄想法與提醒"
msgid "Your profile privacy is limited, so some people still won't see this connection even when Everyone is enabled."
msgstr "您的個人檔案隱私設定較為嚴格,因此即使啟用「所有人」,仍有部分使用者看不到此連線。"
+#. SSO callback page error shown when the sign-in provider asks the person to sign in or give consent again.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider needs you to sign in again."
+msgstr "你的提供者需要你重新登入。"
+
+#. SSO callback page error shown when the sign-in provider sent back any other error.
+#: src/features/auth/components/pages/SsoCallbackPage.tsx
+msgid "Your provider reported an error."
+msgstr "你的提供者回報了一個錯誤。"
+
#. Settings search entry label. Names the settings search entry in the settings UI.
#: src/features/user/components/settings_utils/search_index/GiftInventoryIndex.ts
msgid "Your purchased gifts"
@@ -44017,6 +44068,16 @@ msgstr "由於無法使用相容的視訊編解碼器發布您的螢幕畫面,
msgid "Your setup token stopped working. Enter it again."
msgstr "您的設定權杖已失效。請重新輸入。"
+#. Explanation shown in place of the single sign-on description when the instance requires single sign-on but cannot connect to its sign-in provider right now.
+#: src/features/auth/flow/AuthSsoPanel.tsx
+msgid "Your sign-in provider is unavailable. Try again later."
+msgstr "你的登入提供者目前無法使用。請稍後再試。"
+
+#. Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.
+#: src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+msgid "Your sign-in provider manages your email and password."
+msgstr "你的電子郵件和密碼由你的登入提供者管理。"
+
#. Subtitle under the preview-paused overlay reassuring the user that the screen share is still live for others.
#: src/features/voice/components/voice_participant_tile/shared.ts
msgid "Your stream is still live"
diff --git a/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx b/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx
index 1b66b57f7..fc4739487 100644
--- a/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx
+++ b/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx
@@ -9,7 +9,7 @@ import {AuthBottomLink} from '@app/features/auth/flow/AuthBottomLink';
import sharedStyles from '@app/features/auth/flow/AuthPageStyles.module.css';
import {AuthRegisterFormCore} from '@app/features/auth/flow/AuthRegisterFormCore';
import {AuthRuntimeTargetGate} from '@app/features/auth/flow/AuthRuntimeTargetGate';
-import {AuthSsoPanel, resolveAuthPanelSso} from '@app/features/auth/flow/AuthSsoPanel';
+import {AuthSsoPanel, isSsoLoginEnforced, resolveAuthPanelSso} from '@app/features/auth/flow/AuthSsoPanel';
import {DesktopDeepLinkPrompt} from '@app/features/auth/flow/DesktopDeepLinkPrompt';
import {
InstantAccountForm,
@@ -144,7 +144,7 @@ const InviteRegisterPageContent = observer(function InviteRegisterPageContent({
);
const runtimeSso = resolveAuthPanelSso(runtimeSnapshot);
- if (runtimeSso?.enabled === true && runtimeSso.enforced === true) {
+ if (isSsoLoginEnforced(runtimeSso)) {
return (
<>
<DesktopDeepLinkPrompt
diff --git a/fluxer_app/src/features/user/commands/SsoLinkCommands.ts b/fluxer_app/src/features/user/commands/SsoLinkCommands.ts
new file mode 100644
index 000000000..6d445c029
--- /dev/null
+++ b/fluxer_app/src/features/user/commands/SsoLinkCommands.ts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {Endpoints} from '@app/features/app/constants/Endpoints';
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
+import {storeSsoPendingContext} from '@app/features/auth/state/SsoPendingContext';
+import {http} from '@app/features/platform/transport/RestTransport';
+import {navigateToExternalURL} from '@app/features/ui/utils/NativeUtils';
+import type {SsoStartResponse} from '@fluxer/schema/src/domains/auth/AuthSchemas';
+
+export async function connectSso(): Promise<void> {
+ const {body} = await http.post<SsoStartResponse>(Endpoints.USER_SSO_LINK_START, {body: {}});
+ await storeSsoPendingContext(body.state, {
+ redirectTo: null,
+ runtimeSnapshot: RuntimeConfig.getSnapshot(),
+ clientBinding: body.client_binding,
+ });
+ await navigateToExternalURL(body.authorization_url);
+}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
index edf68d2bf..062b58817 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountTab.tsx
@@ -18,6 +18,10 @@ import {
RecoveryKitReminderAlert,
RecoveryKitRow,
} from '@app/features/user/components/modals/tabs/account_security_tab/RecoveryKitSettings';
+import {
+ canConnectSso,
+ SsoConnectRow,
+} from '@app/features/user/components/modals/tabs/account_security_tab/SsoConnectRow';
import type {User} from '@app/features/user/models/User';
import {needsEmailConfirmation} from '@app/features/user/utils/AccountGates';
import * as DateUtils from '@app/features/user/utils/DateFormatting';
@@ -26,6 +30,7 @@ import {
REVEAL_DESCRIPTOR as REVEAL_EMAIL_TOGGLE_DESCRIPTOR,
} from '@app/features/user/utils/UserMessageDescriptors';
import {AccountTiers, AccountVerificationNeeds} from '@fluxer/constants/src/AccountTierConstants';
+import {hasUserTrait, UserTraits} from '@fluxer/constants/src/UserTraitConstants';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -41,6 +46,14 @@ const maskEmail = (email: string): string => {
return `${maskedUsername}@${domain}`;
};
+function isSsoRequired(): boolean {
+ return RuntimeConfig.getSnapshot().sso?.enforced === true;
+}
+
+function credentialsManagedBySso(user: User): boolean {
+ return isSsoRequired() && hasUserTrait(user.traits, UserTraits.SSO);
+}
+
interface AccountTabProps {
user: User;
showMaskedEmail: boolean;
@@ -53,6 +66,8 @@ export const AccountTabContent: React.FC<AccountTabProps> = observer(({user, sho
const need = user.verificationNeed;
const needsPassword = need === AccountVerificationNeeds.SET_PASSWORD;
const isClaimed = user.accountTier !== AccountTiers.UNCLAIMED;
+ const credentialsManaged = credentialsManagedBySso(user);
+ const showsRecoveryKit = usesUsernameSignIn && isClaimed && !isSsoRequired();
const email = user.email;
let emailRow: React.ReactNode;
if (usesUsernameSignIn) {
@@ -84,7 +99,7 @@ export const AccountTabContent: React.FC<AccountTabProps> = observer(({user, sho
}
data-flx="user.account-security-tab.account-tab.account-tab-content.email-row"
>
- {RuntimeConfig.emailsEnabled && isClaimed && (
+ {RuntimeConfig.emailsEnabled && isClaimed && !credentialsManaged && (
<Button
variant="secondary"
small={true}
@@ -112,7 +127,7 @@ export const AccountTabContent: React.FC<AccountTabProps> = observer(({user, sho
warning={<Trans>No email address set</Trans>}
data-flx="user.account-security-tab.account-tab.account-tab-content.email-row--unclaimed"
>
- {!isClaimed && (
+ {!isClaimed && !credentialsManaged && (
<Button
small={true}
onClick={() => openClaimAccountModal()}
@@ -127,6 +142,18 @@ export const AccountTabContent: React.FC<AccountTabProps> = observer(({user, sho
let passwordRow: React.ReactNode;
if (need === AccountVerificationNeeds.ADD_EMAIL) {
passwordRow = null;
+ } else if (credentialsManaged) {
+ passwordRow = (
+ <AccountSecurityRow
+ label={<Trans>Password</Trans>}
+ description={
+ <Trans comment="Description of the password row in account settings when the instance requires single sign-on and the sign-in provider manages the account's email and password.">
+ Your sign-in provider manages your email and password.
+ </Trans>
+ }
+ data-flx="user.account-security-tab.account-tab.account-tab-content.password-row--sso"
+ />
+ );
} else if (needsPassword) {
passwordRow = (
<AccountSecurityRow
@@ -210,10 +237,10 @@ export const AccountTabContent: React.FC<AccountTabProps> = observer(({user, sho
}
return (
<>
- {needsPassword && (
+ {needsPassword && !credentialsManaged && (
<UnclaimedAccountAlert data-flx="user.account-security-tab.account-tab.account-tab-content.unclaimed-account-alert" />
)}
- {usesUsernameSignIn && isClaimed && (
+ {showsRecoveryKit && (
<RecoveryKitReminderAlert
user={user}
data-flx="user.account-security-tab.account-tab.account-tab-content.recovery-kit-reminder-alert"
@@ -225,12 +252,15 @@ export const AccountTabContent: React.FC<AccountTabProps> = observer(({user, sho
>
{emailRow}
{passwordRow}
- {usesUsernameSignIn && isClaimed && (
+ {showsRecoveryKit && (
<RecoveryKitRow
user={user}
data-flx="user.account-security-tab.account-tab.account-tab-content.recovery-kit-row"
/>
)}
+ {canConnectSso(user) && (
+ <SsoConnectRow data-flx="user.account-security-tab.account-tab.account-tab-content.sso-connect-row" />
+ )}
</AccountSecurityCard>
{needsEmailConfirmation(user) && (
<EmailVerificationAlert data-flx="user.account-security-tab.account-tab.account-tab-content.email-verification-alert" />
diff --git a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
new file mode 100644
index 000000000..552e092ed
--- /dev/null
+++ b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/SsoConnectRow.tsx
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
+import {Button} from '@app/features/ui/button/Button';
+import {isDesktop} from '@app/features/ui/utils/NativeUtils';
+import {connectSso} from '@app/features/user/commands/SsoLinkCommands';
+import {AccountSecurityRow} from '@app/features/user/components/modals/tabs/account_security_tab/AccountSecurityCard';
+import type {User} from '@app/features/user/models/User';
+import * as FormUtils from '@app/lib/forms';
+import {msg} from '@lingui/core/macro';
+import {Trans, useLingui} from '@lingui/react/macro';
+import {observer} from 'mobx-react-lite';
+import {useCallback, useState} from 'react';
+
+const SINGLE_SIGN_ON_DESCRIPTOR = msg({
+ message: 'Single sign-on',
+ comment:
+ 'Label of the account settings row for connecting single sign-on when the admin has not given the provider a name.',
+});
+const CONNECT_SSO_FAILED_DESCRIPTOR = msg({
+ message: "Couldn't connect single sign-on",
+ comment: 'Error title shown when starting to connect single sign-on from account settings fails.',
+});
+
+export function canConnectSso(user: User): boolean {
+ return (
+ RuntimeConfig.getSnapshot().sso?.enabled === true &&
+ !isDesktop() &&
+ !user.traits.some((trait) => trait.startsWith('sso_identity:'))
+ );
+}
+
+export const SsoConnectRow = observer(() => {
+ const {i18n} = useLingui();
+ const [connecting, setConnecting] = useState(false);
+ const providerName = RuntimeConfig.getSnapshot().sso?.display_name ?? i18n._(SINGLE_SIGN_ON_DESCRIPTOR);
+ const connect = useCallback(async () => {
+ setConnecting(true);
+ try {
+ await connectSso();
+ } catch (error) {
+ FormUtils.pushApiErrorModal(i18n, error, i18n._(CONNECT_SSO_FAILED_DESCRIPTOR));
+ setConnecting(false);
+ }
+ }, [i18n]);
+ return (
+ <AccountSecurityRow
+ label={<bdi data-flx="user.account-security-tab.sso-connect-row.bdi">{providerName}</bdi>}
+ description={
+ <Trans comment="Description of the account settings row that connects the account to the instance's single sign-on provider. providerName is the provider name typed by the admin.">
+ Lets you sign in to this account with {providerName}.
+ </Trans>
+ }
+ data-flx="user.account-security-tab.sso-connect-row"
+ >
+ <Button
+ small={true}
+ variant="secondary"
+ submitting={connecting}
+ onClick={connect}
+ data-flx="user.account-security-tab.sso-connect-row.button.connect"
+ >
+ <Trans comment="Button in account settings that connects the account to single sign-on.">Connect</Trans>
+ </Button>
+ </AccountSecurityRow>
+ );
+});
diff --git a/fluxer_docs/src/content/docs/admin-api/instance.mdx b/fluxer_docs/src/content/docs/admin-api/instance.mdx
index e5028bd07..a7f39126f 100644
--- a/fluxer_docs/src/content/docs/admin-api/instance.mdx
+++ b/fluxer_docs/src/content/docs/admin-api/instance.mdx
@@ -36,6 +36,7 @@ The full runtime configuration. A setting that was never saved uses the default
| accounts | [accounts configuration](#accounts-configuration-object) object | Date of birth step, account tiers and cleanup |
| guild_visits | [guild visits configuration](#guild-visits-configuration-object) object | Rollout of visiting communities before joining |
| notice | ?[instance notice](/http-api/instance/#instance-notice-object) object | Notice shown to everyone, or null |
+| warnings | array[string] | Problems that didn't stop the last save. Empty except in the response to [update instance configuration](#update-instance-configuration) |
## Account identity configuration object
@@ -62,7 +63,7 @@ Settings for the instance's OpenID Connect provider.
| enforced | boolean | Whether single sign-on is the only way to sign in |
| display_name | ?string | Provider name shown on the sign-in screen |
| button_label | ?string | Text on the sign-in button, or null for the default (up to 64 characters) |
-| issuer | ?string | OpenID Connect issuer |
+| issuer | ?string | OpenID Connect issuer. Required while `enabled` is true |
| authorization_url | ?string | Authorization endpoint |
| token_url | ?string | Token endpoint |
| userinfo_url | ?string | Userinfo endpoint |
@@ -79,7 +80,7 @@ Settings for the instance's OpenID Connect provider.
<sup>1</sup> The web app URL followed by `/auth/sso/callback`, which mobile sign-in also uses. It is read-only
-<sup>2</sup> Used only in single-community mode. At each sign-in that has the groups claim, Fluxer adds or removes each mapped role to match the person's groups and leaves other roles alone
+<sup>2</sup> Used only in single-community mode. At each sign-in, Fluxer adds or removes each mapped role to match the person's groups and leaves other roles alone. If the groups claim is missing, the person loses every mapped role. Keycloak leaves the claim out when someone is in no groups
## SSO group role mapping object
@@ -632,13 +633,13 @@ The rate limit is 200 requests per minute, on the `admin:lookup` bucket.
<RouteHeader method="PATCH" path="/v1/admin/instance/config" auditReason />
-Merges the body into the saved configuration and returns the [instance configuration](#instance-configuration-object). You need `instance:config:update`. Sections and keys you leave out keep their saved value, and null clears a nullable key.
+Merges the body into the saved configuration and returns the [instance configuration](#instance-configuration-object) with a `warnings` array. You need `instance:config:update`. Sections and keys you leave out keep their saved value, and null clears a nullable key.
### JSON body
| Field | Type | Description |
| --- | --- | --- |
-| sso?<sup>1</sup> | object | [SSO configuration](#sso-configuration-object) fields except `client_secret_set` and `redirect_uri`, plus `client_secret` |
+| sso?<sup>1</sup> | object | [SSO configuration](#sso-configuration-object) fields except `client_secret_set` and `redirect_uri`, plus `client_secret` and `migrate_identities` |
| gateway_rollout? | object | Any [Gateway rollout configuration](#gateway-rollout-configuration-object) fields |
| push_relay? | object | `relay_consent_accepted` from the [push relay configuration](#push-relay-configuration-object) |
| voice_p2p? | object | Any [peer-to-peer voice](#peer-to-peer-voice-configuration-object) fields |
@@ -655,7 +656,7 @@ Merges the body into the saved configuration and returns the [instance configura
| guild_visits? | object | Any [guild visits configuration](#guild-visits-configuration-object) fields |
| notice?<sup>5</sup> | object | `message`, `url`, `starts_at` and `ends_at` of the [instance notice](/http-api/instance/#instance-notice-object) |
-<sup>1</sup> While `enabled` is true, endpoint URLs must use `https` and point at a public address unless `FLUXER_SSO_ALLOW_PRIVATE_ADDRESSES` is true. Turning on both `enabled` and `enforced` fails with `SSO_MISCONFIGURED` unless there is an `issuer`, or an authorization endpoint, a token endpoint, a client ID and `jwks_url` or `userinfo_url`
+<sup>1</sup> While `enabled` is true, a save without an `issuer` fails with `SSO_ISSUER_REQUIRED`, and endpoint URLs must use `https` and point at a public address unless `FLUXER_SSO_ALLOW_PRIVATE_ADDRESSES` is true. Turning on both `enabled` and `enforced` fails with `SSO_MISCONFIGURED` without a `client_id`. When endpoints come from the `issuer`, Fluxer fetches the provider's discovery document. If that fails, turning on `enforced` fails with `SSO_DISCOVERY_FAILED`, and a save without `enforced` goes through with a line in `warnings`. A save that changes the provider ID while accounts are linked to the old one moves those links itself when only a trailing `/` changed, or when it adds an `issuer` whose authorization endpoint is the one already in use. Otherwise it fails with `SSO_ISSUER_CHANGE_HAS_IDENTITIES` unless it sends `migrate_identities`. True moves the links to the new issuer, and false leaves them on the old one. Each move writes a `migrate_sso_identities` audit log entry. `migrate_identities` applies to that save only and is never stored
<sup>2</sup> `branding.product_name` is 1-80 characters, `branding.premium_product_name` 1-40, `branding.custom_css` up to 32,768 and `branding.upload_limit_message` up to 500. `branding.trusted_domains` holds up to 50 hostnames, each optionally starting with `*.`, and null clears it. URLs are up to 2048 characters and `branding.theme_color` is a hex color. Setting `setup.configured` to true finishes setup, and accounts that register after that don't get the wildcard Admin ACL
@@ -704,7 +705,7 @@ It also refuses `sso.username_from_provider` set to true on an instance that isn
| Status | Body | Condition |
| --- | --- | --- |
-| 200 | [instance configuration](#instance-configuration-object) object | The update was applied |
+| 200 | [instance configuration](#instance-configuration-object) object with `warnings`, a list of problems that didn't stop the save | The update was applied |
| 400 | [error response](/admin-api/#error-response) | `INSTANCE_POLICY_TRANSITION_NOT_ALLOWED` when a policy change isn't allowed |
Fluxer saves the sections one at a time, and a failure partway keeps the sections saved before it.
diff --git a/fluxer_docs/src/content/docs/admin-api/users.mdx b/fluxer_docs/src/content/docs/admin-api/users.mdx
index c62174b5c..dc5350fa1 100644
--- a/fluxer_docs/src/content/docs/admin-api/users.mdx
+++ b/fluxer_docs/src/content/docs/admin-api/users.mdx
@@ -1258,7 +1258,7 @@ The rate limit is 100 requests per minute, on the `admin:user:modify` bucket.
<RouteHeader method="DELETE" path="/v1/admin/users/{user_id}/sso-identities" auditReason />
-Releases every subject bound to the account. You need `user:update:email`. On an email instance, the next single sign-on with a matching verified email binds the account again.
+Releases every subject bound to the account and signs it out on every device. You need `user:update:email`. On an email instance, the next single sign-on with a matching verified email binds the account again.
### Response body
diff --git a/fluxer_docs/src/content/docs/authentication.md b/fluxer_docs/src/content/docs/authentication.md
index bc7fb2ca6..ffd4cdb5a 100644
--- a/fluxer_docs/src/content/docs/authentication.md
+++ b/fluxer_docs/src/content/docs/authentication.md
@@ -93,7 +93,7 @@ Sudo mode is a recent proof that the account holder re-verified a credential. An
After a TOTP, passkey or emailed-code proof, the response returns a token in the `X-Fluxer-Sudo-Mode-JWT` header. Send it in that request header for five minutes to skip the proof. An account that proves sudo mode with its password gets no token and sends the password each time.
-A bot account, or an account with no password, TOTP secret, WebAuthn credential or confirmed email, passes sudo mode without a proof. An account with only a confirmed email proves it with an [emailed code](/http-api/users/mfa/#send-a-sudo-email-code). [Multi-factor authentication](/http-api/users/mfa/#sudo-mode) covers the accepted proofs and the [sudo mode methods object](/http-api/users/mfa/#sudo-mode-methods-object).
+A bot account, or an account with no password, TOTP secret, WebAuthn credential or confirmed email, passes sudo mode without a proof. If that account is connected to SSO, it passes only from a session that signed in with SSO in the last 10 minutes. While the instance has SSO turned off, such an account can't pass sudo mode, and the person needs a password set before SSO goes off. An account with only a confirmed email proves it with an [emailed code](/http-api/users/mfa/#send-a-sudo-email-code). [Multi-factor authentication](/http-api/users/mfa/#sudo-mode) covers the accepted proofs and the [sudo mode methods object](/http-api/users/mfa/#sudo-mode-methods-object).
## Gateway authentication
diff --git a/fluxer_docs/src/content/docs/http-api/authentication.mdx b/fluxer_docs/src/content/docs/http-api/authentication.mdx
index 6dd919d33..040c8c28f 100644
--- a/fluxer_docs/src/content/docs/http-api/authentication.mdx
+++ b/fluxer_docs/src/content/docs/http-api/authentication.mdx
@@ -72,10 +72,11 @@ Where to send the user to sign in with the identity provider.
| authorization_url | string | The provider URL to send the user to, unchanged |
| state | string | The one-use state to pass to [complete SSO](#complete-sso), valid for 10 minutes |
| redirect_uri | string | The callback URI for this state |
+| client_binding | string | A one-use secret to send back to [complete SSO](#complete-sso) with this state |
## SSO completion response object
-The result of [complete SSO](#complete-sso). It extends an [authentication token response](#authentication-token-response) or an [MFA challenge response](#mfa-challenge-response) with the redirect bound to the state.
+The result of [complete SSO](#complete-sso). It extends an [authentication token response](#authentication-token-response) or an [MFA challenge response](#mfa-challenge-response) with the redirect bound to the state. A flow from [start connecting SSO](#start-connecting-sso) returns only `linked` and `redirect_to`.
### Structure
@@ -85,6 +86,7 @@ The result of [complete SSO](#complete-sso). It extends an [authentication token
| user_id | snowflake | The authenticated user ID |
| user | [partial user](/http-api/users/#partial-user-object) object | The authenticated account |
| redirect_to | string | The `redirect_to` given to [start SSO](#start-sso), or an empty string |
+| linked? | boolean | `true` when the identity was connected to the account that started [start connecting SSO](#start-connecting-sso). No session is created |
When `mfa` is `true`, finish the sign-in with the ticket the same way as after [password login](#log-in-with-a-password).
@@ -395,7 +397,7 @@ Starts single sign-on and returns an [SSO start](#sso-start-object) object. Send
| redirect_to?<sup>1</sup> | ?string | The path to open after sign-in |
| redirect_uri?<sup>2</sup> | ?string | The callback URI for the result |
-<sup>1</sup> Kept only when it starts with a single `/` and is at most 2,048 characters
+<sup>1</sup> Kept only when it is a path on this instance that starts with a single `/`, is at most 2,048 characters and has no backslash or control character
<sup>2</sup> Must be the instance default from [get SSO status](#get-sso-status) or `fluxer://auth/sso/callback` for the mobile apps. Any other value returns the field code `INVALID_URL_FORMAT`
@@ -405,6 +407,7 @@ Starts single sign-on and returns an [SSO start](#sso-start-object) object. Send
| --- | --- | --- |
| 200 | [SSO start](#sso-start-object) object | The state was created |
| 403 | [error response](/http-api/#error-response) | `FEATURE_TEMPORARILY_DISABLED` when SSO is off or not fully configured |
+| 503 | [error response](/http-api/#error-response) | `SSO_PROVIDER_UNAVAILABLE` when SSO is on but the provider's discovery document can't be fetched |
The rate limit is 10 requests per 10 seconds, on the `auth:sso:start` bucket.
@@ -414,9 +417,9 @@ The rate limit is 10 requests per 10 seconds, on the `auth:sso:start` bucket.
Signs in or creates the account linked to the provider identity and returns an [SSO completion response](#sso-completion-response-object). The state works once, and after any failure you start again with [start SSO](#start-sso).
-An unlinked identity is linked to the account with the same verified email, after the second factor if the account has one. A new account has no password and accepts no invite, and it joins the instance's single community when the instance has one. On an `email` instance it gets the provider's verified email, and when SSO is enforced each sign-in sets the account email to it.
+An unlinked identity is linked to the account with the same verified email only when the instance sends email and that account's email is confirmed. Otherwise it returns `SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN`, and the person connects the account with [start connecting SSO](#start-connecting-sso). An account with a second factor or a passkey is asked for it on every SSO sign-in, except a sign-in to an already linked account from a state started with the mobile `redirect_uri`. A new account has no password and accepts no invite, and it joins the instance's single community when the instance has one. On an `email` instance it gets the provider's verified email, and when SSO is enforced each sign-in sets the account email to it.
-:::caution[A verified provider email takes over a matching account]
+:::caution[A verified provider email signs in to a matching confirmed account]
Turn on SSO only for a provider that controls the email addresses it asserts.
:::
@@ -426,6 +429,7 @@ Turn on SSO only for a provider that controls the email addresses it asserts.
| --- | --- | --- |
| code | string | The authorization code from the provider (1-4096 characters) |
| state | string | The state from [start SSO](#start-sso) (1-4096 characters) |
+| client_binding? | ?string | The `client_binding` from [start SSO](#start-sso). Required unless the state was started with the mobile `redirect_uri` (1-128 characters) |
### Response
@@ -433,11 +437,33 @@ Turn on SSO only for a provider that controls the email addresses it asserts.
| --- | --- | --- |
| 200 | [SSO completion response](#sso-completion-response-object) | The account was signed in, or its second factor is needed |
| 400 | [error response](/http-api/#error-response) | `INVALID_OR_EXPIRED_SSO_STATE`, `SSO_EMAIL_NOT_VERIFIED` or another provider or linking code |
+| 400 | [error response](/http-api/#error-response) | `INVALID_OR_EXPIRED_SSO_STATE` also when `client_binding` is missing or does not match the state |
| 403 | [error response](/http-api/#error-response) | `SSO_REQUIRED` when the account is unknown and new accounts are off |
| 403 | [error response](/http-api/#error-response) | `REGISTRATION_PENDING_APPROVAL`, `REGISTRATION_REJECTED` or a suspension code |
+| 503 | [error response](/http-api/#error-response) | `SSO_PROVIDER_UNAVAILABLE` when the provider didn't answer or its token or keys URL returned a 5xx |
The rate limit is 15 requests per 10 seconds, on the `auth:sso:complete` bucket.
+## Start connecting SSO
+
+<RouteHeader method="POST" path="/v1/users/@me/sso/link/start" mfa />
+
+Starts connecting the instance's SSO provider to the current account after [sudo mode](/http-api/users/mfa/#sudo-mode) and returns an [SSO start](#sso-start-object) object. Send the user to `authorization_url`, then finish with [complete SSO](#complete-sso), which returns `linked` and creates no new session. It works while the instance enforces SSO. The session that started it has to stay signed in until it finishes, and an identity another account holds returns `SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT`.
+
+### JSON body
+
+The body is the [sudo verification object](/http-api/users/mfa/#sudo-verification-object).
+
+### Response
+
+| Status | Body | Condition |
+| --- | --- | --- |
+| 200 | [SSO start](#sso-start-object) object | The state was created |
+| 403 | [error response](/http-api/#error-response) | `SUDO_MODE_REQUIRED` without a valid sudo proof |
+| 403 | [error response](/http-api/#error-response) | `FEATURE_TEMPORARILY_DISABLED` when SSO is off or not fully configured |
+
+The rate limit is 10 requests per 10 seconds, on the shared `auth:sso:start` bucket.
+
## Register an account
<RouteHeader method="POST" path="/v1/auth/register" unauthenticated />
diff --git a/fluxer_docs/src/content/docs/http-api/errors.md b/fluxer_docs/src/content/docs/http-api/errors.md
index 704eb3091..227d80307 100644
--- a/fluxer_docs/src/content/docs/http-api/errors.md
+++ b/fluxer_docs/src/content/docs/http-api/errors.md
@@ -311,6 +311,7 @@ These are the values of the top-level `code`, and the [OpenAPI document](/http-a
| `SINGLE_COMMUNITY_CANNOT_DELETE` | The community for this instance cannot be deleted |
| `SINGLE_COMMUNITY_CANNOT_LEAVE` | You cannot leave the community for this instance |
| `SLOWMODE_RATE_LIMITED` | Slowmode rate limited |
+| `SSO_PROVIDER_UNAVAILABLE` | Your sign-in provider didn't answer. Try again in a moment |
| `SSO_REQUIRED` | This instance requires single sign-on |
| `STREAM_KEY_CHANNEL_MISMATCH` | Stream key channel mismatch |
| `STREAM_KEY_SCOPE_MISMATCH` | Stream key scope mismatch |
@@ -607,13 +608,18 @@ These are the values of `code` inside `errors`.
| `SMTP_HOST_REQUIRED` | Enter an SMTP server before turning on email delivery |
| `SNOWFLAKE_OUT_OF_RANGE` | Invalid snowflake |
| `SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY` | This account is already linked to a different SSO identity |
+| `SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN` | An account with this email already exists. Sign in to it another way, then connect single sign-on |
+| `SSO_DISCOVERY_FAILED` | Couldn't connect to the sign-in provider at its issuer URL |
| `SSO_EMAIL_NOT_VERIFIED` | Your SSO provider has not verified your email address |
| `SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT` | This SSO identity is already linked to a different account |
| `SSO_IDENTITY_MISMATCH` | SSO identity mismatch between id_token and userinfo |
+| `SSO_ISSUER_CHANGE_HAS_IDENTITIES` | {count} accounts are linked to the old issuer. Choose whether to move those links to the new issuer |
+| `SSO_ISSUER_REQUIRED` | Enter the issuer URL of your sign-in provider |
| `SSO_MISCONFIGURED` | SSO is misconfigured |
| `SSO_PROVIDER_DID_NOT_RETURN_EMAIL` | Your SSO provider didn't return an email address |
| `SSO_TEST_CODE_MISSING_EMAIL` | SSO test code is missing the email payload |
| `SSO_UNABLE_TO_ALLOCATE_DISCRIMINATOR` | We couldn't allocate a discriminator for your SSO account |
+| `SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED` | Your sign-in provider sent your profile in a signed format that Fluxer can't use |
| `STRING_LENGTH_EXACT` | String must be exactly {length} characters |
| `STRING_LENGTH_INVALID` | String length must be between {min} and {max} characters |
| `SYSTEM_CHANNEL_MUST_BE_IN_GUILD` | System channel must be in this community |
@@ -632,6 +638,7 @@ These are the values of `code` inside `errors`.
| `UNCLAIMED_ACCOUNTS_CAN_ONLY_SET_EMAIL_VIA_TOKEN` | Claim your account before changing your profile |
| `UNRESOLVED_ATTACHMENT_URL` | Unresolved `attachment://` URL detected |
| `UPLOADED_ATTACHMENT_NOT_FOUND` | Uploaded attachment {filename} wasn't found |
+| `URL_HOSTNAME_NOT_RESOLVABLE` | Fluxer couldn't look up the hostname in this URL |
| `URL_LENGTH_INVALID` | URL must be between {min} and {max} characters |
| `URL_MUST_USE_HTTPS` | URL must start with https:// |
| `URL_NOT_PUBLICLY_ROUTABLE` | URL must resolve to a publicly routable address |
diff --git a/fluxer_docs/src/content/docs/http-api/users/mfa.mdx b/fluxer_docs/src/content/docs/http-api/users/mfa.mdx
index a83c3e114..fb42acde4 100644
--- a/fluxer_docs/src/content/docs/http-api/users/mfa.mdx
+++ b/fluxer_docs/src/content/docs/http-api/users/mfa.mdx
@@ -44,6 +44,7 @@ The first row that matches the account says which proofs it can send.
| A second factor is turned on | `mfa_method` of `totp` or `webauthn` with its fields |
| Has a password | `password`, or `webauthn` with a passkey |
| Has a confirmed email address on an instance that sends email | `mfa_method` of `email_code` after [Send a sudo email code](#send-a-sudo-email-code), or `webauthn` with a passkey |
+| Connected to SSO | Nothing, from a session that signed in with SSO in the last 10 minutes. Older sessions sign in with SSO again first |
| None of these | Nothing, and the operation goes ahead |
Without a proof, the request returns 403 `SUDO_MODE_REQUIRED` with the [sudo mode methods](#sudo-mode-methods-object) fields. A wrong password returns 400 `INVALID_PASSWORD` on the path `password`, and a wrong TOTP code, backup code or passkey assertion returns 400 `INVALID_MFA_CODE` on the path `mfa_code`. The `totp` method allows 10 attempts per 15 minutes for each account, and a correct code resets the count. A wrong email code returns 400 `INVALID_SIGN_IN_CODE`, a ticket past 10 minutes or 5 wrong tries returns 400 `SIGN_IN_CODE_EXPIRED`, and an unknown ticket returns 400 `UNKNOWN_SIGN_IN_TICKET`.
@@ -70,6 +71,7 @@ Without a proof, the request returns 403 `SUDO_MODE_REQUIRED` with the [sudo mod
| backup_codes<sup>1</sup> | boolean | Whether the account has at least one unused backup code |
| email_code? | boolean | Whether the account can prove sudo mode with an emailed code |
| password? | boolean | Whether the account can prove sudo mode with its password |
+| sso_reauth | boolean | Whether the account proves sudo mode by signing in with SSO again. Always false while the instance has SSO turned off |
<sup>1</sup> A backup code goes in `mfa_code` with `mfa_method` set to `totp`, also on an account without TOTP. There is no `backup_codes` method
diff --git a/fluxer_docs/src/content/docs/operator/rexctl.mdx b/fluxer_docs/src/content/docs/operator/rexctl.mdx
index 067bd328e..724b4f787 100644
--- a/fluxer_docs/src/content/docs/operator/rexctl.mdx
+++ b/fluxer_docs/src/content/docs/operator/rexctl.mdx
@@ -46,7 +46,7 @@ rexctl admins remove <user>
### rexctl admins sign-in-link
-Print a link that signs an admin in once.
+Print a link that signs an admin in once. Use it to get in when Require SSO is on and your sign-in provider is down or set up wrong. See https://docs.fluxer.app/operator/sign-in/#single-sign-on.
```sh
rexctl admins sign-in-link <user>
@@ -215,9 +215,17 @@ rexctl config list [flags]
Change one or more settings.
```sh
-rexctl config set <key> <value> | <key>=<value>...
+rexctl config set <key> <value> | <key>=<value>... [flags]
```
+- `--migrate-identities`
+
+ When sso.issuer changes, move SSO links to the new issuer.
+
+- `--no-migrate-identities`
+
+ When sso.issuer changes, leave SSO links on the old issuer.
+
### rexctl config unset
Go back to the default for one or more settings.
diff --git a/fluxer_docs/src/content/docs/operator/sign-in.mdx b/fluxer_docs/src/content/docs/operator/sign-in.mdx
index 055b4f25e..57b76c172 100644
--- a/fluxer_docs/src/content/docs/operator/sign-in.mdx
+++ b/fluxer_docs/src/content/docs/operator/sign-in.mdx
@@ -20,16 +20,46 @@ People create an account with an email address, a username and a password. The i
People can sign in through your own identity provider, such as Authentik or Keycloak, over OpenID Connect. Set it up in the admin panel on the "Instance Config" page, in the "Single Sign-On (SSO)" card. Fill in the details from your provider, turn on "Enable SSO" and register the "Redirect URI" that the card shows with your provider.
-With "Automatically provision users on first SSO login" on, the first sign-in from someone new creates their account. In single-community mode, "Community Roles From Groups" maps groups at your provider to roles in the community, and each SSO sign-in adds or removes those roles.
+The issuer URL is required, and Fluxer only accepts sign-ins that your provider issued under it. It accepts the issuer with or without a trailing `/`. For Microsoft Entra ID, use your tenant's issuer, `https://login.microsoftonline.com/<tenant>/v2.0`, not `/common`. SSO that was set up without an issuer stays off until you add one. Upgrade first, then run `rexctl config set sso.issuer <issuer URL>` straight away. Fluxer moves the existing links to the issuer when it finds the same provider there. Don't add the issuer before you upgrade, because older versions leave the links behind. People who are already signed in stay signed in, and if Require SSO is on, `rexctl admins sign-in-link <admin>` gets you in.
+
+On an email instance, and whenever "Allowed Email Domains" is filled in, Fluxer only takes an email address that your provider marks as verified with the `email_verified` claim. Microsoft Entra ID doesn't send that claim. Add the optional `xms_edov` claim to the ID token in your Entra app registration, and Fluxer accepts it in its place. Register Fluxer as a single-tenant app. OneLogin also leaves `email_verified` out by default. Set your OneLogin app to send the `email_verified` claim, or every sign-in on an email instance is refused with `SSO_EMAIL_NOT_VERIFIED`.
+
+Every URL for your provider has to use https and a public address. If your provider runs on your own network or in Docker next to Fluxer, run `rexctl config set sso.allow_private_addresses true`. The URLs still have to use https.
+
+With "Automatically provision users on first SSO login" on, the first sign-in from someone new creates their account. This happens even when registration is closed or needs an invite, and if new accounts need your approval, they still wait for it. To choose who gets in, limit access to Fluxer at your provider or fill in "Allowed Email Domains". In single-community mode, "Community Roles From Groups" maps groups at your provider to roles in the community, and each SSO sign-in adds or removes those roles. If the provider leaves out the groups claim, the person loses every mapped role. Keycloak leaves the claim out when someone is in no groups. Entra leaves it out when someone is in too many groups. Limit the token to the groups you map.
+
+When your provider's discovery document lists `client_secret_post`, Fluxer sends the client secret in the request body. When it lists no methods, or lists `client_secret_basic` and not `client_secret_post`, Fluxer uses HTTP Basic authentication first. If the provider turns the first attempt down with a 400 or 401 for any reason other than `invalid_grant`, Fluxer tries the other method once and remembers what worked. Fluxer doesn't follow redirects from your provider's discovery, token, userinfo or keys URLs, and each URL you enter has to be the one that answers. Fluxer can't use signed userinfo responses (`application/jwt`), and sign-in fails with `SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED` until you turn off userinfo signing for the client at your provider. When a sign-in fails at the provider, the API logs say what the provider sent back.
"Require SSO" turns off password and passkey sign-in and local registration for everyone. Before you turn it on, make sure at least one admin can sign in through your provider.
+While Require SSO is on and your provider is down, nobody can sign in until it's back, and the sign-in page says the provider is unavailable. To get in, run `rexctl admins sign-in-link <admin>` for a one-time admin sign-in link, or `rexctl config set sso.enforced false` to turn Require SSO off. If SSO has no issuer yet, that command is refused. Set the issuer with `rexctl config set sso.issuer <issuer URL>`, or as a last resort turn SSO off with `rexctl config set sso.enabled false`. While Fluxer can't connect to your provider at its issuer URL, it refuses any SSO change that leaves Require SSO on.
+
+If someone has two-factor authentication or a passkey on their Fluxer account, Fluxer asks for it each time they sign in with SSO on the web or in the desktop app, even if your provider asked for its own. The mobile app doesn't ask for it yet once the account is linked, and it still asks before an account is first linked by email.
+
On a username instance you can turn on "Usernames come from your sign-in provider" (`sso.username_from_provider` in rexctl). It's off by default and doesn't depend on Require SSO. While it's on, each SSO sign-in sets the person's username from the `preferred_username` claim, and people who sign in with SSO can't change it in Fluxer.
Usernames can only use letters, numbers and underscores, up to 32 characters. Fluxer keeps the part before any `@`, turns accented letters into plain ones, turns dots, dashes and spaces into underscores, drops other characters, removes the word `fluxer` and keeps the first 32 characters. For example, `[email protected]` becomes `john_doe`. This means different people can end up with the same username. `[email protected]` and `[email protected]` both become `alice`, and whoever signs in first keeps it. If your provider sends an email address or UPN as `preferred_username`, such as Entra ID with more than one domain, map that claim to a value that is unique across your tenant.
If the claim is missing, isn't usable or belongs to someone else, the person keeps their current username. A rename in the admin panel lasts until the person's next SSO sign-in. Turn off username editing at your provider, or anyone who can edit their own `preferred_username` can take any free name here.
+### Existing accounts
+
+When someone signs in with SSO for the first time and an account already has their email address, Fluxer only signs them in to that account if the instance sends email and the account's email address is confirmed. If the account has two-factor authentication, Fluxer asks for it first. Otherwise the sign-in stops and tells them to sign in to the account another way and connect single sign-on from their account settings in the web app.
+
+People connect an existing account from their account settings in the web app, where a row for your provider has a "Connect" button. Fluxer asks them to confirm it's them first, the same way it does before other account changes, and connecting works while Require SSO is on. On a username instance, or an email instance that doesn't send email, this is the only way an existing account gets linked. Turn on SSO, ask people to connect their accounts and turn on Require SSO after that. If someone can't sign in to connect, an admin can link their account with `PUT /admin/users/{user_id}/sso-identities`.
+
+### Changing the issuer
+
+Fluxer links each SSO account to the issuer it signed in through. When you change the issuer while accounts are linked to the old one, Fluxer asks what to do with those links. If it's the same provider at a new address, move the links so people keep their accounts. If it's a different provider, leave them, because the same subject there can be a different person. People then link to the new provider by their verified email the first time they sign in through it. In the admin panel, pick this under "SSO Links When the Issuer Changes". With rexctl, add `--migrate-identities` or `--no-migrate-identities` to `rexctl config set sso.issuer <issuer URL>`.
+
+Fluxer moves the links without asking when only a trailing `/` changes, or when you add an issuer to SSO that had none and its authorization endpoint is the one already in use.
+
+Fluxer can't tell a new address for the same provider from a different provider. If you moved the links to a different provider by mistake, sign-ins from it fail with `SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY`. Unlink those accounts with `DELETE /admin/users/{user_id}/sso-identities`, and each person links again by email at their next sign-in.
+
+### Removing someone
+
+A session from an SSO sign-in lasts 30 days, and after that the person signs in through your provider again. Sessions that started before this version of Fluxer don't have this limit. If you turn someone off at your provider, they lose access at their next SSO sign-in, or the first time their app contacts Fluxer after their sessions are 30 days old. An app that stays connected keeps getting messages until then. To remove them right away, use "Terminate All Sessions" on their account's page in the admin panel. While Require SSO is off, they can still sign in with a password or passkey if they have one. Unlinking their SSO account with `DELETE /admin/users/{user_id}/sso-identities` signs them out on every device. Signing out of Fluxer doesn't sign anyone out of your provider.
+
## Lost passwords
On a username instance, or an email instance that doesn't send email, you can create a reset link for someone who has lost their password. The "Create Password Reset Link" button on the account's page in the admin panel does the same.
diff --git a/fluxer_rexctl/cmd/admins.go b/fluxer_rexctl/cmd/admins.go
index ea642c1a1..58a44080c 100644
--- a/fluxer_rexctl/cmd/admins.go
+++ b/fluxer_rexctl/cmd/admins.go
@@ -47,7 +47,12 @@ func newAdminsCmd(app *App) *cobra.Command {
return nil
})
}
- signInLink := &cobra.Command{Use: "sign-in-link <user>", Short: "Print a link that signs an admin in once", Args: exactArgs(userArg)}
+ signInLink := &cobra.Command{
+ Use: "sign-in-link <user>",
+ Short: "Print a link that signs an admin in once",
+ Long: "Print a link that signs an admin in once. Use it to get in when Require SSO is on and your sign-in provider is down or set up wrong. See " + docsURL + "sign-in/#single-sign-on.",
+ Args: exactArgs(userArg),
+ }
signInLink.RunE = func(c *cobra.Command, args []string) error {
return adminWrite(c, app, func(ctx context.Context, api *adminapi.Client, _ *instance.Instance) error {
u, err := api.ResolveUser(ctx, args[0])
diff --git a/fluxer_rexctl/cmd/config.go b/fluxer_rexctl/cmd/config.go
index 1e9d12279..5eea9111c 100644
--- a/fluxer_rexctl/cmd/config.go
+++ b/fluxer_rexctl/cmd/config.go
@@ -480,12 +480,20 @@ func newConfigSetCmd(app *App) *cobra.Command {
return nil
},
}
+ var migrate, noMigrate bool
+ set.Flags().BoolVar(&migrate, "migrate-identities", false, "when sso.issuer changes, move SSO links to the new issuer")
+ set.Flags().BoolVar(&noMigrate, "no-migrate-identities", false, "when sso.issuer changes, leave SSO links on the old issuer")
+ set.MarkFlagsMutuallyExclusive("migrate-identities", "no-migrate-identities")
set.RunE = func(c *cobra.Command, args []string) error {
changes, err := parseSetArgs(app, args)
if err != nil {
return err
}
- return runConfigChange(c.Context(), app, changes)
+ var extra map[string]any
+ if migrate || noMigrate {
+ extra = map[string]any{"sso": map[string]any{"migrate_identities": migrate}}
+ }
+ return runConfigChange(c.Context(), app, changes, extra)
}
return set
}
@@ -506,12 +514,12 @@ func newConfigUnsetCmd(app *App) *cobra.Command {
for _, a := range args {
changes = append(changes, configChange{name: strings.TrimSpace(a)})
}
- return runConfigChange(c.Context(), app, changes)
+ return runConfigChange(c.Context(), app, changes, nil)
}
return unset
}
-func runConfigChange(ctx context.Context, app *App, changes []configChange) error {
+func runConfigChange(ctx context.Context, app *App, changes []configChange, extra map[string]any) error {
typed := make([]string, 0, len(changes))
for _, ch := range changes {
typed = append(typed, ch.name)
@@ -538,7 +546,7 @@ func runConfigChange(ctx context.Context, app *App, changes []configChange) erro
admin = append(admin, ac)
}
finish := func(change *deploy.Change) error {
- sent, err := applyAdminChanges(ctx, app, v.inst, admin)
+ sent, err := applyAdminChanges(ctx, app, v.inst, admin, extra)
if err != nil {
return err
}
@@ -649,7 +657,7 @@ func parseAdminChange(schema []adminapi.ConfigKey, name string, raw *string) (ad
return adminChange{key: k, value: value, patch: adminapi.ConfigPatch(k.Key, value)}, nil
}
-func applyAdminChanges(ctx context.Context, app *App, inst *instance.Instance, changes []adminChange) ([]adminChange, error) {
+func applyAdminChanges(ctx context.Context, app *App, inst *instance.Instance, changes []adminChange, extra map[string]any) ([]adminChange, error) {
pendingImport := inst.State.AdminImport != nil && inst.State.AdminImport.SentAt == ""
if len(changes) == 0 && !pendingImport {
return nil, nil
@@ -687,9 +695,14 @@ func applyAdminChanges(ctx context.Context, app *App, inst *instance.Instance, c
if len(sent) == 0 {
return nil, nil
}
- if err := api.PatchConfig(ctx, patch); err != nil {
+ adminapi.MergePatch(patch, extra)
+ warnings, err := api.PatchConfigWithWarnings(ctx, patch)
+ if err != nil {
return nil, adminapi.Explain(err)
}
+ for _, w := range warnings {
+ app.UI.Warn(w, "")
+ }
return sent, nil
}
diff --git a/fluxer_rexctl/cmd/config_edit_test.go b/fluxer_rexctl/cmd/config_edit_test.go
index 0ce87824d..3f237224e 100644
--- a/fluxer_rexctl/cmd/config_edit_test.go
+++ b/fluxer_rexctl/cmd/config_edit_test.go
@@ -326,7 +326,7 @@ func TestConfigRepairsSettingAfterUpgradePulled(t *testing.T) {
if err := inst.Save(); err != nil {
t.Fatal(err)
}
- if err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort}}); err != nil {
+ if err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort}}, nil); err != nil {
t.Fatalf("%v\n%s", err, out)
}
found, err := instance.Find(inst.Dir)
@@ -337,7 +337,7 @@ func TestConfigRepairsSettingAfterUpgradePulled(t *testing.T) {
t.Fatal("the invalid setting is still there")
}
v := "8080"
- if err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort, value: &v}}); exitCode(err) != ui.ExitRefused {
+ if err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort, value: &v}}, nil); exitCode(err) != ui.ExitRefused {
t.Fatalf("changed a valid setting halfway through an upgrade: %v", err)
}
}
@@ -349,7 +349,7 @@ func TestConfigSetDuringUpgradeChecksPorts(t *testing.T) {
t.Fatal(err)
}
v := "7881"
- err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort, value: &v}})
+ err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort, value: &v}}, nil)
if exitCode(err) != ui.ExitRefused || !strings.Contains(err.Error(), "already uses") {
t.Fatalf("err %v\n%s", err, out)
}
diff --git a/fluxer_rexctl/cmd/layout_test.go b/fluxer_rexctl/cmd/layout_test.go
index da0375a0a..97f4b5e40 100644
--- a/fluxer_rexctl/cmd/layout_test.go
+++ b/fluxer_rexctl/cmd/layout_test.go
@@ -90,7 +90,7 @@ func TestConfigUnsetRepairsSettingDuringUnfinishedUpgrade(t *testing.T) {
if _, err := app.Instance(); exitCode(err) != ui.ExitRefused {
t.Fatalf("loaded an invalid setting: %v", err)
}
- if err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort}}); err != nil {
+ if err := runConfigChange(context.Background(), app, []configChange{{name: settings.EdgeHTTPPort}}, nil); err != nil {
t.Fatalf("%v\n%s", err, out)
}
found, err := instance.Find(inst.Dir)
diff --git a/fluxer_rexctl/internal/adminapi/explain.go b/fluxer_rexctl/internal/adminapi/explain.go
index 699d58207..10eb411b7 100644
--- a/fluxer_rexctl/internal/adminapi/explain.go
+++ b/fluxer_rexctl/internal/adminapi/explain.go
@@ -100,13 +100,31 @@ func explainAPI(e *APIError) error {
const SSOPrivateFix = "If the provider is on your own network, run rexctl config set sso.allow_private_addresses true, then try again."
-var ssoURLFields = []string{"issuer", "authorization_url", "token_url", "user_info_url", "jwks_url"}
+const SSOHostnameFix = "Check the hostname is spelled right and resolves from the Fluxer server."
+
+const SSODiscoveryFix = "Check sso.issuer with rexctl config get sso.issuer, or turn on Require SSO once the provider is back."
+
+const SSOIssuerRequiredFix = "Set it with rexctl config set sso.issuer <issuer URL>, or turn SSO off with rexctl config set sso.enabled false."
+
+const SSOIssuerChangeFix = "If it's the same provider at a new address, run rexctl config set sso.issuer <issuer URL> --migrate-identities. If it's a different provider, use --no-migrate-identities."
+
+var ssoURLFields = []string{"issuer", "authorization_url", "token_url", "userinfo_url", "jwks_url"}
func fieldFix(fields []FieldError) string {
for _, f := range fields {
if f.Code == "URL_NOT_PUBLICLY_ROUTABLE" && slices.Contains(ssoURLFields, f.Path) {
return SSOPrivateFix
}
+ switch f.Code {
+ case "URL_HOSTNAME_NOT_RESOLVABLE":
+ return SSOHostnameFix
+ case "SSO_DISCOVERY_FAILED":
+ return SSODiscoveryFix
+ case "SSO_ISSUER_REQUIRED":
+ return SSOIssuerRequiredFix
+ case "SSO_ISSUER_CHANGE_HAS_IDENTITIES":
+ return SSOIssuerChangeFix
+ }
}
return ""
}
diff --git a/fluxer_rexctl/internal/adminapi/explain_test.go b/fluxer_rexctl/internal/adminapi/explain_test.go
index fe0ad7889..dc0c02b7d 100644
--- a/fluxer_rexctl/internal/adminapi/explain_test.go
+++ b/fluxer_rexctl/internal/adminapi/explain_test.go
@@ -13,14 +13,56 @@ import (
)
func TestPrivateSSOAddressPointsAtTheSetting(t *testing.T) {
+ for _, field := range []string{"issuer", "authorization_url", "token_url", "userinfo_url", "jwks_url"} {
+ err := adminapi.Explain(&adminapi.APIError{Status: 400, Fields: []adminapi.FieldError{
+ {Path: field, Code: "URL_NOT_PUBLICLY_ROUTABLE", Message: "URL must resolve to a publicly routable address."},
+ }})
+ var exit *ui.ExitError
+ if !errors.As(err, &exit) || exit.Fix != adminapi.SSOPrivateFix {
+ t.Errorf("Explain() for %s = %#v, want the private address fix", field, err)
+ }
+ }
+ if !strings.Contains(adminapi.SSOPrivateFix, "config set "+settings.SSOPrivate+" true") {
+ t.Errorf("fix %q doesn't name %s", adminapi.SSOPrivateFix, settings.SSOPrivate)
+ }
+}
+
+func TestUnresolvableSSOHostnamePointsAtTheSpelling(t *testing.T) {
err := adminapi.Explain(&adminapi.APIError{Status: 400, Fields: []adminapi.FieldError{
- {Path: "issuer", Code: "URL_NOT_PUBLICLY_ROUTABLE", Message: "URL must resolve to a publicly routable address."},
+ {Path: "issuer", Code: "URL_HOSTNAME_NOT_RESOLVABLE", Message: "Fluxer couldn't look up the hostname in this URL."},
}})
var exit *ui.ExitError
- if !errors.As(err, &exit) || exit.Fix != adminapi.SSOPrivateFix {
- t.Fatalf("Explain() = %#v, want the private address fix", err)
+ if !errors.As(err, &exit) || exit.Fix != adminapi.SSOHostnameFix {
+ t.Fatalf("Explain() = %#v, want the hostname fix", err)
}
- if !strings.Contains(adminapi.SSOPrivateFix, "config set "+settings.SSOPrivate+" true") {
- t.Errorf("fix %q doesn't name %s", adminapi.SSOPrivateFix, settings.SSOPrivate)
+}
+
+func TestUnreachableSSOProviderPointsAtTheIssuer(t *testing.T) {
+ err := adminapi.Explain(&adminapi.APIError{Status: 400, Fields: []adminapi.FieldError{
+ {Path: "sso", Code: "SSO_DISCOVERY_FAILED", Message: "Couldn't connect to the sign-in provider at its issuer URL."},
+ }})
+ var exit *ui.ExitError
+ if !errors.As(err, &exit) || exit.Fix != adminapi.SSODiscoveryFix {
+ t.Fatalf("Explain() = %#v, want the discovery fix", err)
+ }
+}
+
+func TestMissingSSOIssuerPointsAtTheSetting(t *testing.T) {
+ err := adminapi.Explain(&adminapi.APIError{Status: 400, Fields: []adminapi.FieldError{
+ {Path: "issuer", Code: "SSO_ISSUER_REQUIRED", Message: "Enter the issuer URL of your sign-in provider."},
+ }})
+ var exit *ui.ExitError
+ if !errors.As(err, &exit) || exit.Fix != adminapi.SSOIssuerRequiredFix {
+ t.Fatalf("Explain() = %#v, want the issuer fix", err)
+ }
+}
+
+func TestSSOIssuerChangeWithLinksPointsAtTheFlags(t *testing.T) {
+ err := adminapi.Explain(&adminapi.APIError{Status: 400, Fields: []adminapi.FieldError{
+ {Path: "issuer", Code: "SSO_ISSUER_CHANGE_HAS_IDENTITIES", Message: "2 accounts are linked to the old issuer."},
+ }})
+ var exit *ui.ExitError
+ if !errors.As(err, &exit) || exit.Fix != adminapi.SSOIssuerChangeFix {
+ t.Fatalf("Explain() = %#v, want the migrate fix", err)
}
}
diff --git a/fluxer_rexctl/internal/adminapi/gen.go b/fluxer_rexctl/internal/adminapi/gen.go
index 0a3da00e9..bf7e01009 100644
--- a/fluxer_rexctl/internal/adminapi/gen.go
+++ b/fluxer_rexctl/internal/adminapi/gen.go
@@ -2240,6 +2240,9 @@ type InstanceConfigResponse struct {
UsernameFromProvider bool `json:"username_from_provider"`
} `json:"sso"`
VoiceP2p VoiceP2pConfigResponse `json:"voice_p2p"`
+
+ // Warnings Problems the save found that did not stop it. Always empty outside a save response
+ Warnings []string `json:"warnings"`
}
// InstanceConfigResponseIntegrationsEmailEffectiveProvider Deprecated, use delivery
@@ -2429,9 +2432,12 @@ type InstanceConfigUpdateRequest struct {
GroupsClaim *string `json:"groups_claim,omitempty"`
Issuer *string `json:"issuer,omitempty"`
JwksUrl *string `json:"jwks_url,omitempty"`
- Scope *string `json:"scope,omitempty"`
- TokenUrl *string `json:"token_url,omitempty"`
- UserinfoUrl *string `json:"userinfo_url,omitempty"`
+
+ // MigrateIdentities Only for a save that changes the issuer while accounts are linked to the old one. True moves those links to the new issuer, false leaves them on the old one. Applies to this save only and is never stored
+ MigrateIdentities *bool `json:"migrate_identities,omitempty"`
+ Scope *string `json:"scope,omitempty"`
+ TokenUrl *string `json:"token_url,omitempty"`
+ UserinfoUrl *string `json:"userinfo_url,omitempty"`
// UsernameFromProvider Each SSO sign-in sets the username from the provider, and people can't change it in Fluxer. Only on username instances
UsernameFromProvider *bool `json:"username_from_provider,omitempty"`
diff --git a/fluxer_rexctl/internal/adminapi/instance.go b/fluxer_rexctl/internal/adminapi/instance.go
index de3ccb792..5a0d9e56b 100644
--- a/fluxer_rexctl/internal/adminapi/instance.go
+++ b/fluxer_rexctl/internal/adminapi/instance.go
@@ -35,6 +35,16 @@ func (c *Client) PatchConfig(ctx context.Context, patch any) error {
return c.Call(ctx, http.MethodPatch, configPath, nil, patch, nil)
}
+func (c *Client) PatchConfigWithWarnings(ctx context.Context, patch any) ([]string, error) {
+ var resp struct {
+ Warnings []string `json:"warnings"`
+ }
+ if err := c.Call(ctx, http.MethodPatch, configPath, nil, patch, &resp); err != nil {
+ return nil, err
+ }
+ return resp.Warnings, nil
+}
+
var RegistrationModes = []string{"open", "approval", "invite", "closed"}
func RegistrationPatch(mode string) (map[string]any, error) {
diff --git a/fluxer_rexctl/internal/adminapi/schemagen/main.go b/fluxer_rexctl/internal/adminapi/schemagen/main.go
index 299a9afc8..829d98a89 100644
--- a/fluxer_rexctl/internal/adminapi/schemagen/main.go
+++ b/fluxer_rexctl/internal/adminapi/schemagen/main.go
@@ -44,6 +44,7 @@ type key struct {
var skip = map[string]bool{
"app_public.setup.configured": true,
+ "sso.migrate_identities": true,
}
type gen struct {
diff --git a/packages/constants/src/ApiErrorCodes.ts b/packages/constants/src/ApiErrorCodes.ts
index 1ef1bd744..6553c7d1b 100644
--- a/packages/constants/src/ApiErrorCodes.ts
+++ b/packages/constants/src/ApiErrorCodes.ts
@@ -215,6 +215,7 @@ export const APIErrorCodes = {
INSTANCE_POLICY_TRANSITION_NOT_ALLOWED: 'INSTANCE_POLICY_TRANSITION_NOT_ALLOWED',
SLOWMODE_RATE_LIMITED: 'SLOWMODE_RATE_LIMITED',
SEARCH_INDEX_NOT_READY: 'SEARCH_INDEX_NOT_READY',
+ SSO_PROVIDER_UNAVAILABLE: 'SSO_PROVIDER_UNAVAILABLE',
SSO_REQUIRED: 'SSO_REQUIRED',
STORE_BILLING_UNAVAILABLE: 'STORE_BILLING_UNAVAILABLE',
STORE_NOTIFICATION_UNAUTHORIZED: 'STORE_NOTIFICATION_UNAUTHORIZED',
diff --git a/packages/constants/src/ValidationErrorCodes.ts b/packages/constants/src/ValidationErrorCodes.ts
index 9199fa77f..36da94b45 100644
--- a/packages/constants/src/ValidationErrorCodes.ts
+++ b/packages/constants/src/ValidationErrorCodes.ts
@@ -213,13 +213,18 @@ export const ValidationErrorCodes = {
SETUP_TOKEN_REQUIRED: 'SETUP_TOKEN_REQUIRED',
SMTP_HOST_REQUIRED: 'SMTP_HOST_REQUIRED',
SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY: 'SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY',
+ SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN: 'SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN',
+ SSO_DISCOVERY_FAILED: 'SSO_DISCOVERY_FAILED',
SSO_EMAIL_NOT_VERIFIED: 'SSO_EMAIL_NOT_VERIFIED',
SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT: 'SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT',
SSO_IDENTITY_MISMATCH: 'SSO_IDENTITY_MISMATCH',
+ SSO_ISSUER_CHANGE_HAS_IDENTITIES: 'SSO_ISSUER_CHANGE_HAS_IDENTITIES',
+ SSO_ISSUER_REQUIRED: 'SSO_ISSUER_REQUIRED',
SSO_MISCONFIGURED: 'SSO_MISCONFIGURED',
SSO_PROVIDER_DID_NOT_RETURN_EMAIL: 'SSO_PROVIDER_DID_NOT_RETURN_EMAIL',
SSO_TEST_CODE_MISSING_EMAIL: 'SSO_TEST_CODE_MISSING_EMAIL',
SSO_UNABLE_TO_ALLOCATE_DISCRIMINATOR: 'SSO_UNABLE_TO_ALLOCATE_DISCRIMINATOR',
+ SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED: 'SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED',
STRING_LENGTH_EXACT: 'STRING_LENGTH_EXACT',
STRING_LENGTH_INVALID: 'STRING_LENGTH_INVALID',
SYSTEM_CHANNEL_MUST_BE_IN_GUILD: 'SYSTEM_CHANNEL_MUST_BE_IN_GUILD',
@@ -237,6 +242,7 @@ export const ValidationErrorCodes = {
UNCLAIMED_ACCOUNTS_CAN_ONLY_SET_EMAIL_VIA_TOKEN: 'UNCLAIMED_ACCOUNTS_CAN_ONLY_SET_EMAIL_VIA_TOKEN',
UNRESOLVED_ATTACHMENT_URL: 'UNRESOLVED_ATTACHMENT_URL',
UPLOADED_ATTACHMENT_NOT_FOUND: 'UPLOADED_ATTACHMENT_NOT_FOUND',
+ URL_HOSTNAME_NOT_RESOLVABLE: 'URL_HOSTNAME_NOT_RESOLVABLE',
URL_LENGTH_INVALID: 'URL_LENGTH_INVALID',
URL_MUST_USE_HTTPS: 'URL_MUST_USE_HTTPS',
URL_NOT_PUBLICLY_ROUTABLE: 'URL_NOT_PUBLICLY_ROUTABLE',
diff --git a/packages/errors/src/domains/auth/SsoProviderUnavailableError.ts b/packages/errors/src/domains/auth/SsoProviderUnavailableError.ts
new file mode 100644
index 000000000..bbaf73b05
--- /dev/null
+++ b/packages/errors/src/domains/auth/SsoProviderUnavailableError.ts
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
+import {defaultCodeStatusError} from '@fluxer/errors/src/FluxerError';
+
+export class SsoProviderUnavailableError extends defaultCodeStatusError(503, APIErrorCodes.SSO_PROVIDER_UNAVAILABLE) {}
diff --git a/packages/errors/src/domains/auth/SudoModeRequiredError.ts b/packages/errors/src/domains/auth/SudoModeRequiredError.ts
index cba706b58..d1bb01981 100644
--- a/packages/errors/src/domains/auth/SudoModeRequiredError.ts
+++ b/packages/errors/src/domains/auth/SudoModeRequiredError.ts
@@ -9,6 +9,7 @@ export interface SudoModeMethods {
backup_codes: boolean;
email_code: boolean;
password: boolean;
+ sso_reauth: boolean;
}
const EMPTY_METHODS: SudoModeMethods = {
@@ -17,6 +18,7 @@ const EMPTY_METHODS: SudoModeMethods = {
backup_codes: false,
email_code: false,
password: false,
+ sso_reauth: false,
};
export class SudoModeRequiredError extends ForbiddenError {
diff --git a/packages/errors/src/i18n/ErrorCodeMappings.ts b/packages/errors/src/i18n/ErrorCodeMappings.ts
index f73f1a3ad..39b91fcb0 100644
--- a/packages/errors/src/i18n/ErrorCodeMappings.ts
+++ b/packages/errors/src/i18n/ErrorCodeMappings.ts
@@ -274,6 +274,7 @@ export const ErrorCodeToI18nKey = {
[APIErrorCodes.SERVICE_UNAVAILABLE]: 'http.service_unavailable',
[APIErrorCodes.SESSION_TOKEN_MISMATCH]: 'account.session_token_mismatch',
[APIErrorCodes.SLOWMODE_RATE_LIMITED]: 'rate_limits.slowmode_rate_limited',
+ [APIErrorCodes.SSO_PROVIDER_UNAVAILABLE]: 'auth_and_oauth.sso_provider_unavailable',
[APIErrorCodes.SSO_REQUIRED]: 'auth_and_oauth.sso_required',
[APIErrorCodes.STORE_BILLING_UNAVAILABLE]: 'store_billing.unavailable',
[APIErrorCodes.STORE_NOTIFICATION_UNAUTHORIZED]: 'store_billing.notification_unauthorized',
@@ -462,6 +463,7 @@ export const ErrorCodeToI18nKey = {
[ValidationErrorCodes.UNRESOLVED_ATTACHMENT_URL]: 'attachments_and_uploads.unresolved_attachment_url',
[ValidationErrorCodes.UPLOADED_ATTACHMENT_NOT_FOUND]: 'attachments_and_uploads.uploaded_attachment_not_found',
[ValidationErrorCodes.URL_LENGTH_INVALID]: 'urls.url_length_invalid',
+ [ValidationErrorCodes.URL_HOSTNAME_NOT_RESOLVABLE]: 'urls.url_hostname_not_resolvable',
[ValidationErrorCodes.URL_MUST_USE_HTTPS]: 'urls.url_must_use_https',
[ValidationErrorCodes.URL_NOT_PUBLICLY_ROUTABLE]: 'urls.url_not_publicly_routable',
[ValidationErrorCodes.ACCENT_COLOR_CHANGED_TOO_MANY_TIMES]: 'rate_limits.accent_color_changed_too_often',
@@ -540,14 +542,20 @@ export const ErrorCodeToI18nKey = {
[ValidationErrorCodes.SETUP_TOKEN_REQUIRED]: 'auth_and_registration.setup_token_required',
[ValidationErrorCodes.SSO_ACCOUNT_LINKED_TO_ANOTHER_IDENTITY]:
'auth_and_oauth.sso_account_linked_to_another_identity',
+ [ValidationErrorCodes.SSO_ACCOUNT_LINK_REQUIRES_SIGN_IN]: 'auth_and_oauth.sso_account_link_requires_sign_in',
+ [ValidationErrorCodes.SSO_DISCOVERY_FAILED]: 'auth_and_oauth.sso_discovery_failed',
[ValidationErrorCodes.SSO_EMAIL_NOT_VERIFIED]: 'auth_and_oauth.sso_email_not_verified',
[ValidationErrorCodes.SSO_IDENTITY_LINKED_TO_ANOTHER_ACCOUNT]:
'auth_and_oauth.sso_identity_linked_to_another_account',
[ValidationErrorCodes.SSO_IDENTITY_MISMATCH]: 'auth_and_oauth.sso_identity_mismatch',
+ [ValidationErrorCodes.SSO_ISSUER_CHANGE_HAS_IDENTITIES]: 'auth_and_oauth.sso_issuer_change_has_identities',
+ [ValidationErrorCodes.SSO_ISSUER_REQUIRED]: 'auth_and_oauth.sso_issuer_required',
[ValidationErrorCodes.SSO_MISCONFIGURED]: 'auth_and_oauth.sso_misconfigured',
[ValidationErrorCodes.SSO_PROVIDER_DID_NOT_RETURN_EMAIL]: 'auth_and_oauth.sso_provider_did_not_return_email',
[ValidationErrorCodes.SSO_TEST_CODE_MISSING_EMAIL]: 'auth_and_oauth.sso_test_code_missing_email',
[ValidationErrorCodes.SSO_UNABLE_TO_ALLOCATE_DISCRIMINATOR]: 'auth_and_oauth.sso_unable_to_allocate_discriminator',
+ [ValidationErrorCodes.SSO_USER_INFO_SIGNED_RESPONSE_UNSUPPORTED]:
+ 'auth_and_oauth.sso_user_info_signed_response_unsupported',
[ValidationErrorCodes.USER_DOES_NOT_HAVE_AN_EMAIL_ADDRESS]: 'email.user_has_no_email_address',
[ValidationErrorCodes.VERIFICATION_CODE_EXPIRED]: 'email.verification_code_expired',
[ValidationErrorCodes.VERIFICATION_CODE_NOT_ISSUED]: 'email.verification_code_not_issued',
diff --git a/packages/errors/src/i18n/ErrorI18nMessages.ts b/packages/errors/src/i18n/ErrorI18nMessages.ts
index c0f01731f..4355b575f 100644
--- a/packages/errors/src/i18n/ErrorI18nMessages.ts
+++ b/packages/errors/src/i18n/ErrorI18nMessages.ts
@@ -191,17 +191,28 @@ export const ERROR_I18N_MESSAGES = {
'auth_and_oauth.registration_url_invalid': 'This registration link is invalid or has expired.',
'auth_and_oauth.sso_account_linked_to_another_identity':
'This account is already linked to a different SSO identity.',
+ 'auth_and_oauth.sso_account_link_requires_sign_in':
+ "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
+ 'auth_and_oauth.sso_discovery_failed':
+ "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
'auth_and_oauth.sso_email_not_verified': 'Your SSO provider has not verified your email address.',
'auth_and_oauth.sso_identity_linked_to_another_account':
'This SSO identity is already linked to a different account.',
'auth_and_oauth.sso_identity_mismatch': 'SSO identity mismatch between id_token and userinfo.',
+ 'auth_and_oauth.sso_issuer_change_has_identities':
+ '{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.',
+ 'auth_and_oauth.sso_issuer_required':
+ 'Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.',
'auth_and_oauth.sso_misconfigured': 'SSO is misconfigured. Please contact your administrator.',
'auth_and_oauth.sso_provider_did_not_return_email': "Your SSO provider didn't return an email address.",
+ 'auth_and_oauth.sso_provider_unavailable': "Your sign-in provider didn't answer. Try again in a moment.",
'auth_and_oauth.sso_required':
"{reason, select, managed_credentials {This instance requires single sign-on, so your SSO provider manages your email and password.} no_account {This instance only lets existing accounts sign in with SSO, and there's no account for you yet. Ask an admin of this instance for access.} managed_username {This instance requires single sign-on, so your username comes from your SSO provider.} other {This instance requires single sign-on. Sign in with the SSO button on the sign-in page.}}",
'auth_and_oauth.sso_test_code_missing_email': 'SSO test code is missing the email payload.',
'auth_and_oauth.sso_unable_to_allocate_discriminator':
"We couldn't allocate a discriminator for your SSO account. Please try again.",
+ 'auth_and_oauth.sso_user_info_signed_response_unsupported':
+ "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
'auth_and_oauth.sudo_mode_required': 'Sudo mode is required.',
'auth_and_oauth.unknown_application': 'Unknown application.',
'auth_and_oauth.unknown_origin_handoff': 'This sign-in transfer has expired or was already used.',
@@ -691,6 +702,8 @@ export const ERROR_I18N_MESSAGES = {
'unknown_entities.unknown_user_flag': "The specified user flag isn't recognized.",
'urls.invalid_url_format': 'Invalid URL format.',
'urls.invalid_url_or_attachment_reference': 'Invalid URL format or attachment reference.',
+ 'urls.url_hostname_not_resolvable':
+ "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
'urls.url_length_invalid': 'URL must be between {min} and {max} characters.',
'urls.url_must_use_https': 'URL must start with https://.',
'urls.url_not_publicly_routable': 'URL must resolve to a publicly routable address.',
diff --git a/packages/errors/src/i18n/weblate/locales/ar.json b/packages/errors/src/i18n/weblate/locales/ar.json
index dd0fd4ca0..8fa0b2cf9 100644
--- a/packages/errors/src/i18n/weblate/locales/ar.json
+++ b/packages/errors/src/i18n/weblate/locales/ar.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "هذا التسجيل في انتظار موافقة المسؤول.",
"auth_and_oauth.registration_rejected": "تم رفض طلب التسجيل هذا.",
"auth_and_oauth.registration_url_invalid": "رابط التسجيل هذا غير صالح أو انتهت صلاحيته.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "هذا الحساب مرتبط بالفعل بهوية SSO مختلفة.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "لم يتحقق مزوّد SSO من عنوان بريدك الإلكتروني.",
"auth_and_oauth.sso_identity_linked_to_another_account": "هوية SSO هذه مرتبطة بالفعل بحساب مختلف.",
"auth_and_oauth.sso_identity_mismatch": "عدم تطابق هوية SSO بين id_token وuserinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "تم إعداد SSO بشكل غير صحيح. تواصل مع المسؤول.",
"auth_and_oauth.sso_provider_did_not_return_email": "لم يُرجع مزوّد SSO عنوان بريد إلكتروني.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {يتطلب هذا المثيل تسجيل الدخول الموحد، لذا يدير مزوّد SSO بريدك الإلكتروني وكلمة مرورك.} no_account {يسمح هذا المثيل للحسابات الموجودة فقط بتسجيل الدخول عبر SSO، ولا يوجد حساب لك بعد. اطلب الوصول من أحد مسؤولي هذا المثيل.} managed_username {يتطلب هذا المثيل تسجيل الدخول الموحد، لذا يأتي اسم المستخدم الخاص بك من مزوّد SSO.} other {يتطلب هذا المثيل تسجيل الدخول الموحد. سجّل الدخول باستخدام زر SSO في صفحة تسجيل الدخول.}}",
"auth_and_oauth.sso_test_code_missing_email": "رمز اختبار SSO يفتقر إلى حمولة البريد الإلكتروني.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "لم نتمكن من تخصيص مميّز لحساب SSO الخاص بك. حاول مجددًا.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "وضع Sudo مطلوب.",
"auth_and_oauth.unknown_application": "تطبيق غير معروف.",
"auth_and_oauth.unknown_origin_handoff": "انتهت صلاحية عملية نقل تسجيل الدخول هذه أو تم استخدامها بالفعل.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "علامة المستخدم المحددة غير معروفة.",
"urls.invalid_url_format": "صيغة الرابط غير صالحة.",
"urls.invalid_url_or_attachment_reference": "صيغة الرابط غير صالحة أو مرجع المرفق غير صالح.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "يجب أن يكون الرابط بين {min} و{max} حرفًا.",
"urls.url_must_use_https": "يجب أن يبدأ عنوان URL بـ https://.",
"urls.url_not_publicly_routable": "يجب أن يشير الرابط إلى عنوان IP عام يمكن الوصول إليه عبر الإنترنت.",
diff --git a/packages/errors/src/i18n/weblate/locales/bg.json b/packages/errors/src/i18n/weblate/locales/bg.json
index 400e9eb35..b2e8a8bdc 100644
--- a/packages/errors/src/i18n/weblate/locales/bg.json
+++ b/packages/errors/src/i18n/weblate/locales/bg.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Тази регистрация чака одобрение от администратор.",
"auth_and_oauth.registration_rejected": "Тази заявка за регистрация беше отхвърлена.",
"auth_and_oauth.registration_url_invalid": "Този линк за регистрация е невалиден или е изтекъл.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Този акаунт вече е свързан с друга SSO самоличност.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Твоят SSO доставчик не е потвърдил имейл адреса ти.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Тази SSO самоличност вече е свързана с друг акаунт.",
"auth_and_oauth.sso_identity_mismatch": "Несъответствие на SSO самоличността между id_token и userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO е конфигуриран неправилно. Свържи се с администратора си.",
"auth_and_oauth.sso_provider_did_not_return_email": "Твоят SSO доставчик не върна имейл адрес.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Тази инстанция изисква SSO вход, затова твоят SSO доставчик управлява имейла и паролата ти.} no_account {Тази инстанция позволява SSO вход само на съществуващи акаунти, а ти все още нямаш акаунт. Поискай достъп от администратор на тази инстанция.} managed_username {Тази инстанция изисква SSO вход, затова потребителското ти име идва от твоя SSO доставчик.} other {Тази инстанция изисква SSO вход. Влез с бутона за SSO на страницата за вход.}}",
"auth_and_oauth.sso_test_code_missing_email": "Тестовият SSO код няма имейл в данните.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Не успяхме да присвоим дискриминатор за твоя SSO акаунт. Опитай отново.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Изисква се sudo режим.",
"auth_and_oauth.unknown_application": "Неизвестно приложение.",
"auth_and_oauth.unknown_origin_handoff": "Това прехвърляне на влизането е изтекло или вече е използвано.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Посоченият потребителски флаг не е разпознат.",
"urls.invalid_url_format": "Невалиден URL формат.",
"urls.invalid_url_or_attachment_reference": "Невалиден URL формат или препратка към прикачен файл.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL адресът трябва да е между {min} и {max} знака.",
"urls.url_must_use_https": "URL адресът трябва да започва с https://.",
"urls.url_not_publicly_routable": "URL адресът трябва да сочи към публичен IP адрес, достъпен през интернет.",
diff --git a/packages/errors/src/i18n/weblate/locales/cs.json b/packages/errors/src/i18n/weblate/locales/cs.json
index 10c8287a8..5ae60feb5 100644
--- a/packages/errors/src/i18n/weblate/locales/cs.json
+++ b/packages/errors/src/i18n/weblate/locales/cs.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Tato registrace čeká na schválení administrátorem.",
"auth_and_oauth.registration_rejected": "Tato žádost o registraci byla zamítnuta.",
"auth_and_oauth.registration_url_invalid": "Tento odkaz k registraci je neplatný nebo vypršel.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Tento účet je už propojen s jinou identitou SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Váš poskytovatel SSO neověřil vaši e-mailovou adresu.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Tato identita SSO je už propojena s jiným účtem.",
"auth_and_oauth.sso_identity_mismatch": "Nesoulad SSO identity mezi id_token a userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO je nesprávně nakonfigurováno. Kontaktujte svého správce.",
"auth_and_oauth.sso_provider_did_not_return_email": "Váš poskytovatel SSO nevrátil e-mailovou adresu.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Tato instance vyžaduje jednotné přihlášení, takže váš e-mail a heslo spravuje váš poskytovatel SSO.} no_account {Tato instance umožňuje přihlášení přes SSO jen existujícím účtům a vy zatím účet nemáte. Požádejte o přístup správce této instance.} managed_username {Tato instance vyžaduje jednotné přihlášení, takže vaše uživatelské jméno pochází od vašeho poskytovatele SSO.} other {Tato instance vyžaduje jednotné přihlášení. Přihlaste se tlačítkem SSO na přihlašovací stránce.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO testovací kód neobsahuje e-mailovou adresu.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Nepodařilo se přidělit čtyřmístný identifikátor pro váš účet SSO. Zkuste to znovu.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Je vyžadován režim sudo.",
"auth_and_oauth.unknown_application": "Neznámá aplikace.",
"auth_and_oauth.unknown_origin_handoff": "Platnost tohoto přenosu přihlášení vypršela nebo už byl použit.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Zadaný uživatelský příznak není rozpoznán.",
"urls.invalid_url_format": "Neplatný formát adresy URL.",
"urls.invalid_url_or_attachment_reference": "Neplatný formát adresy URL nebo odkaz přílohy.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "Adresa URL musí být dlouhá {min} až {max} znaků.",
"urls.url_must_use_https": "URL musí začínat na https://.",
"urls.url_not_publicly_routable": "Adresa URL musí odkazovat na veřejnou IP adresu dostupnou z internetu.",
diff --git a/packages/errors/src/i18n/weblate/locales/da.json b/packages/errors/src/i18n/weblate/locales/da.json
index 9fee5bad2..3492688c4 100644
--- a/packages/errors/src/i18n/weblate/locales/da.json
+++ b/packages/errors/src/i18n/weblate/locales/da.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Denne tilmelding afventer godkendelse fra administratoren.",
"auth_and_oauth.registration_rejected": "Denne anmodning om tilmelding blev afvist.",
"auth_and_oauth.registration_url_invalid": "Dette tilmeldingslink er ugyldigt eller er udløbet.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Denne konto er allerede knyttet til en anden SSO-identitet.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Din SSO-udbyder har ikke bekræftet din e-mailadresse.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Denne SSO-identitet er allerede knyttet til en anden konto.",
"auth_and_oauth.sso_identity_mismatch": "SSO-identiteten stemmer ikke overens mellem id_token og userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO er forkert konfigureret. Kontakt din administrator.",
"auth_and_oauth.sso_provider_did_not_return_email": "Din SSO-udbyder returnerede ikke en e-mailadresse.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Denne instans kræver single sign-on, så din SSO-udbyder styrer din e-mail og adgangskode.} no_account {Denne instans lader kun eksisterende konti logge ind med SSO, og der er endnu ingen konto til dig. Bed en administrator af denne instans om adgang.} managed_username {Denne instans kræver single sign-on, så dit brugernavn kommer fra din SSO-udbyder.} other {Denne instans kræver single sign-on. Log ind med SSO-knappen på login-siden.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO-testkoden mangler e-mail-payloadet.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Vi kunne ikke tildele et tag til din SSO-konto. Prøv igen.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo-tilstand er påkrævet.",
"auth_and_oauth.unknown_application": "Ukendt applikation.",
"auth_and_oauth.unknown_origin_handoff": "Denne overførsel af login er udløbet eller allerede brugt.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Det angivne brugerflag genkendes ikke.",
"urls.invalid_url_format": "Ugyldigt URL-format.",
"urls.invalid_url_or_attachment_reference": "Ugyldigt URL-format eller reference til vedhæftet fil.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL’en skal være på mellem {min} og {max} tegn.",
"urls.url_must_use_https": "URL'en skal starte med https://.",
"urls.url_not_publicly_routable": "URL'en skal pege på en offentlig IP-adresse, der kan tilgås fra internettet.",
diff --git a/packages/errors/src/i18n/weblate/locales/de.json b/packages/errors/src/i18n/weblate/locales/de.json
index d90514f5d..09def8275 100644
--- a/packages/errors/src/i18n/weblate/locales/de.json
+++ b/packages/errors/src/i18n/weblate/locales/de.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Diese Registrierung wartet auf die Genehmigung durch einen Administrator.",
"auth_and_oauth.registration_rejected": "Diese Registrierungsanfrage wurde abgelehnt.",
"auth_and_oauth.registration_url_invalid": "Dieser Registrierungslink ist ungültig oder abgelaufen.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Dieses Konto ist bereits mit einer anderen SSO-Identität verknüpft.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Dein SSO-Anbieter hat deine E-Mail-Adresse nicht bestätigt.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Diese SSO-Identität ist bereits mit einem anderen Konto verknüpft.",
"auth_and_oauth.sso_identity_mismatch": "SSO-Identität zwischen id_token und userinfo stimmt nicht überein.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO ist falsch konfiguriert. Bitte kontaktiere deinen Administrator.",
"auth_and_oauth.sso_provider_did_not_return_email": "Dein SSO-Anbieter hat keine E-Mail-Adresse zurückgegeben.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Diese Instanz erfordert Single Sign-on, deshalb verwaltet dein SSO-Anbieter deine E-Mail-Adresse und dein Passwort.} no_account {Auf dieser Instanz können sich nur bestehende Konten per SSO anmelden, und für dich gibt es noch kein Konto. Bitte einen Admin dieser Instanz um Zugang.} managed_username {Diese Instanz erfordert Single Sign-on, deshalb kommt dein Benutzername von deinem SSO-Anbieter.} other {Diese Instanz erfordert Single Sign-on. Melde dich über den SSO-Button auf der Anmeldeseite an.}}",
"auth_and_oauth.sso_test_code_missing_email": "Im SSO-Testcode fehlen die E-Mail-Nutzdaten.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Wir konnten keinen Discriminator für deinen SSO-Account vergeben. Versuche es noch einmal.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo-Modus ist erforderlich.",
"auth_and_oauth.unknown_application": "Unbekannte Anwendung.",
"auth_and_oauth.unknown_origin_handoff": "Diese Anmeldeübertragung ist abgelaufen oder wurde bereits verwendet.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Das angegebene Benutzer-Flag wird nicht erkannt.",
"urls.invalid_url_format": "Ungültiges Format der URL.",
"urls.invalid_url_or_attachment_reference": "Ungültiges URL-Format oder ungültiger Verweis auf einen Anhang.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "Die URL muss zwischen {min} und {max} Zeichen lang sein.",
"urls.url_must_use_https": "Die URL muss mit https:// beginnen.",
"urls.url_not_publicly_routable": "Die URL muss auf eine öffentliche, über das Internet erreichbare IP-Adresse verweisen.",
diff --git a/packages/errors/src/i18n/weblate/locales/el.json b/packages/errors/src/i18n/weblate/locales/el.json
index a52dbe67a..8bb0f2c80 100644
--- a/packages/errors/src/i18n/weblate/locales/el.json
+++ b/packages/errors/src/i18n/weblate/locales/el.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Αυτή η εγγραφή περιμένει έγκριση από τον διαχειριστή.",
"auth_and_oauth.registration_rejected": "Αυτό το αίτημα εγγραφής απορρίφθηκε.",
"auth_and_oauth.registration_url_invalid": "Αυτός ο σύνδεσμος εγγραφής είναι άκυρος ή έχει λήξει.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Αυτός ο λογαριασμός είναι ήδη συνδεδεμένος με διαφορετική ταυτότητα SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Ο πάροχος SSO σου δεν έχει επαληθεύσει τη διεύθυνση email σου.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Αυτή η ταυτότητα SSO είναι ήδη συνδεδεμένη με διαφορετικό λογαριασμό.",
"auth_and_oauth.sso_identity_mismatch": "Αναντιστοιχία ταυτότητας SSO μεταξύ id_token και userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "Το SSO δεν έχει ρυθμιστεί σωστά. Επικοινώνησε με τον διαχειριστή σου.",
"auth_and_oauth.sso_provider_did_not_return_email": "Ο πάροχος SSO σου δεν επέστρεψε διεύθυνση email.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Αυτή η παρουσία απαιτεί ενιαία σύνδεση (SSO), οπότε ο πάροχος SSO σου διαχειρίζεται το email και τον κωδικό πρόσβασής σου.} no_account {Αυτή η παρουσία επιτρέπει σύνδεση μέσω SSO μόνο σε υπάρχοντες λογαριασμούς και δεν έχεις ακόμη λογαριασμό. Ζήτησε πρόσβαση από έναν διαχειριστή αυτής της παρουσίας.} managed_username {Αυτή η παρουσία απαιτεί ενιαία σύνδεση (SSO), οπότε το όνομα χρήστη σου προέρχεται από τον πάροχο SSO σου.} other {Αυτή η παρουσία απαιτεί ενιαία σύνδεση (SSO). Συνδέσου με το κουμπί SSO στη σελίδα σύνδεσης.}}",
"auth_and_oauth.sso_test_code_missing_email": "Στον δοκιμαστικό κωδικό SSO λείπουν τα δεδομένα email.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Δεν μπορέσαμε να εκχωρήσουμε διακριτικό για τον λογαριασμό σου SSO. Δοκίμασε ξανά.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Απαιτείται η λειτουργία sudo.",
"auth_and_oauth.unknown_application": "Άγνωστη εφαρμογή.",
"auth_and_oauth.unknown_origin_handoff": "Αυτή η μεταφορά σύνδεσης έχει λήξει ή έχει ήδη χρησιμοποιηθεί.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Η σημαία χρήστη που καθορίστηκε δεν αναγνωρίζεται.",
"urls.invalid_url_format": "Μη έγκυρη μορφή URL.",
"urls.invalid_url_or_attachment_reference": "Μη έγκυρη μορφή URL ή αναφορά συνημμένου.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "Το URL πρέπει να είναι μεταξύ {min} και {max} χαρακτήρων.",
"urls.url_must_use_https": "Η διεύθυνση URL πρέπει να ξεκινά με https://.",
"urls.url_not_publicly_routable": "Το URL πρέπει να παραπέμπει σε δημόσια διεύθυνση IP, προσβάσιμη από το διαδίκτυο.",
diff --git a/packages/errors/src/i18n/weblate/locales/en-GB.json b/packages/errors/src/i18n/weblate/locales/en-GB.json
index faedc6766..6e9dc4cf0 100644
--- a/packages/errors/src/i18n/weblate/locales/en-GB.json
+++ b/packages/errors/src/i18n/weblate/locales/en-GB.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "This registration is waiting for admin approval.",
"auth_and_oauth.registration_rejected": "This registration request was rejected.",
"auth_and_oauth.registration_url_invalid": "This registration link is invalid or has expired.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "This account is already linked to a different SSO identity.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Your SSO provider hasn't verified your email address.",
"auth_and_oauth.sso_identity_linked_to_another_account": "This SSO identity is already linked to a different account.",
"auth_and_oauth.sso_identity_mismatch": "SSO identity mismatch between id_token and userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO is misconfigured. Please contact your administrator.",
"auth_and_oauth.sso_provider_did_not_return_email": "Your SSO provider didn't return an email address.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {This instance requires single sign-on, so your SSO provider manages your email and password.} no_account {This instance only lets existing accounts sign in with SSO, and there's no account for you yet. Ask an admin of this instance for access.} managed_username {This instance requires single sign-on, so your username comes from your SSO provider.} other {This instance requires single sign-on. Sign in with the SSO button on the sign-in page.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO test code is missing the email payload.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "We couldn't allocate a discriminator for your SSO account. Please try again.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo mode is required.",
"auth_and_oauth.unknown_application": "Unknown application.",
"auth_and_oauth.unknown_origin_handoff": "This sign-in transfer has expired or was already used.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "The specified user flag isn't recognised.",
"urls.invalid_url_format": "Invalid URL format.",
"urls.invalid_url_or_attachment_reference": "Invalid URL format or attachment reference.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL must be between {min} and {max} characters.",
"urls.url_must_use_https": "URL must start with https://.",
"urls.url_not_publicly_routable": "URL must resolve to a publicly routable address.",
diff --git a/packages/errors/src/i18n/weblate/locales/es-419.json b/packages/errors/src/i18n/weblate/locales/es-419.json
index 20874a514..b9f4c4f10 100644
--- a/packages/errors/src/i18n/weblate/locales/es-419.json
+++ b/packages/errors/src/i18n/weblate/locales/es-419.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Este registro está esperando la aprobación del administrador.",
"auth_and_oauth.registration_rejected": "Esta solicitud de registro fue rechazada.",
"auth_and_oauth.registration_url_invalid": "Este enlace de registro es inválido o ha expirado.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Esta cuenta ya está vinculada a otra identidad de SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Tu proveedor de SSO no ha verificado tu dirección de correo electrónico.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Esta identidad de SSO ya está vinculada a otra cuenta.",
"auth_and_oauth.sso_identity_mismatch": "La identidad de SSO no coincide entre id_token y userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO está mal configurado. Contacta a tu administrador.",
"auth_and_oauth.sso_provider_did_not_return_email": "Tu proveedor de SSO no devolvió una dirección de correo electrónico.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Esta instancia requiere inicio de sesión único, así que tu proveedor de SSO administra tu correo electrónico y tu contraseña.} no_account {Esta instancia solo permite iniciar sesión con SSO a cuentas existentes, y todavía no tienes una cuenta. Pide acceso a un administrador de esta instancia.} managed_username {Esta instancia requiere inicio de sesión único, así que tu nombre de usuario viene de tu proveedor de SSO.} other {Esta instancia requiere inicio de sesión único. Inicia sesión con el botón de SSO en la página de inicio de sesión.}}",
"auth_and_oauth.sso_test_code_missing_email": "Al código de prueba de SSO le falta la carga útil de correo electrónico.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "No pudimos asignar un discriminador para tu cuenta de SSO. Inténtalo de nuevo.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Se requiere el modo sudo.",
"auth_and_oauth.unknown_application": "Aplicación desconocida.",
"auth_and_oauth.unknown_origin_handoff": "Esta transferencia de inicio de sesión caducó o ya se usó.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "El indicador de usuario especificado no se reconoce.",
"urls.invalid_url_format": "Formato de URL inválido.",
"urls.invalid_url_or_attachment_reference": "Formato de URL o referencia de archivo adjunto inválido.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "La URL debe tener entre {min} y {max} caracteres.",
"urls.url_must_use_https": "La URL debe empezar con https://.",
"urls.url_not_publicly_routable": "La URL debe resolverse a una dirección IP pública accesible desde internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/es-ES.json b/packages/errors/src/i18n/weblate/locales/es-ES.json
index 6ff896c8c..686114db3 100644
--- a/packages/errors/src/i18n/weblate/locales/es-ES.json
+++ b/packages/errors/src/i18n/weblate/locales/es-ES.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Este registro está pendiente de aprobación por parte del administrador.",
"auth_and_oauth.registration_rejected": "Esta solicitud de registro ha sido rechazada.",
"auth_and_oauth.registration_url_invalid": "Este enlace de registro no es válido o ha caducado.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Esta cuenta ya está vinculada a otra identidad de SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Tu proveedor SSO no ha verificado tu dirección de correo electrónico.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Esta identidad de SSO ya está vinculada a otra cuenta.",
"auth_and_oauth.sso_identity_mismatch": "La identidad SSO no coincide entre id_token y userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "La configuración de SSO es incorrecta. Ponte en contacto con tu administrador.",
"auth_and_oauth.sso_provider_did_not_return_email": "Tu proveedor SSO no devolvió una dirección de correo electrónico.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Esta instancia requiere inicio de sesión único, así que tu proveedor SSO gestiona tu correo electrónico y tu contraseña.} no_account {Esta instancia solo permite iniciar sesión con SSO a cuentas existentes, y aún no tienes cuenta. Pide acceso a un administrador de esta instancia.} managed_username {Esta instancia requiere inicio de sesión único, así que tu nombre de usuario viene de tu proveedor SSO.} other {Esta instancia requiere inicio de sesión único. Inicia sesión con el botón SSO de la página de inicio de sesión.}}",
"auth_and_oauth.sso_test_code_missing_email": "Al código de prueba SSO le falta la carga útil de correo electrónico.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "No se pudo asignar un discriminador para tu cuenta SSO. Inténtalo de nuevo.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Se requiere el modo sudo.",
"auth_and_oauth.unknown_application": "Aplicación desconocida.",
"auth_and_oauth.unknown_origin_handoff": "Esta transferencia de inicio de sesión ha caducado o ya se ha usado.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "El indicador de usuario especificado no se reconoce.",
"urls.invalid_url_format": "Formato de URL no válido.",
"urls.invalid_url_or_attachment_reference": "Formato de URL o referencia de adjunto no válidos.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "La URL debe tener entre {min} y {max} caracteres.",
"urls.url_must_use_https": "La URL debe empezar por https://.",
"urls.url_not_publicly_routable": "La URL debe resolverse en una dirección IP pública accesible desde internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/fi.json b/packages/errors/src/i18n/weblate/locales/fi.json
index d180eac25..abf956ad3 100644
--- a/packages/errors/src/i18n/weblate/locales/fi.json
+++ b/packages/errors/src/i18n/weblate/locales/fi.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Tämä rekisteröinti odottaa järjestelmänvalvojan hyväksyntää.",
"auth_and_oauth.registration_rejected": "Tämä rekisteröintipyyntö hylättiin.",
"auth_and_oauth.registration_url_invalid": "Tämä rekisteröintilinkki on virheellinen tai vanhentunut.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Tämä tili on jo yhdistetty toiseen SSO-identiteettiin.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "SSO-tarjoajasi ei ole vahvistanut sähköpostiosoitettasi.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Tämä SSO-identiteetti on jo yhdistetty toiseen tiliin.",
"auth_and_oauth.sso_identity_mismatch": "`id_token`- ja `userinfo`-tietojen SSO-identiteetit eivät täsmää.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO on määritetty väärin. Ota yhteyttä ylläpitäjään.",
"auth_and_oauth.sso_provider_did_not_return_email": "SSO-tarjoajasi ei palauttanut sähköpostiosoitetta.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Tämä instanssi vaatii kertakirjautumisen, joten SSO-tarjoajasi hallinnoi sähköpostiosoitettasi ja salasanaasi.} no_account {Tämä instanssi sallii SSO-kirjautumisen vain olemassa oleville tileille, eikä sinulla ole vielä tiliä. Pyydä pääsyä tämän instanssin ylläpitäjältä.} managed_username {Tämä instanssi vaatii kertakirjautumisen, joten käyttäjänimesi tulee SSO-tarjoajaltasi.} other {Tämä instanssi vaatii kertakirjautumisen. Kirjaudu sisään kirjautumissivun SSO-painikkeella.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO-testikoodista puuttuu sähköpostisisältö.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "SSO-tilillesi ei voitu varata nelinumeroista tunnistetta. Yritä uudelleen.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo-tila vaaditaan.",
"auth_and_oauth.unknown_application": "Tuntematon sovellus.",
"auth_and_oauth.unknown_origin_handoff": "Tämä kirjautumisen siirto on vanhentunut tai jo käytetty.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Määritettyä käyttäjälippua ei tunnisteta.",
"urls.invalid_url_format": "Virheellinen URL-osoite.",
"urls.invalid_url_or_attachment_reference": "Virheellinen URL-osoite tai liitteen viittaus.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL-osoitteen on oltava {min}–{max} merkkiä pitkä.",
"urls.url_must_use_https": "URL-osoitteen on alettava https://.",
"urls.url_not_publicly_routable": "URL-osoitteen on osoitettava julkiseen, internetistä tavoitettavaan IP-osoitteeseen.",
diff --git a/packages/errors/src/i18n/weblate/locales/fr.json b/packages/errors/src/i18n/weblate/locales/fr.json
index 054a70468..e329feb28 100644
--- a/packages/errors/src/i18n/weblate/locales/fr.json
+++ b/packages/errors/src/i18n/weblate/locales/fr.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Cette inscription est en attente d'approbation par un administrateur.",
"auth_and_oauth.registration_rejected": "Cette demande d'inscription a été rejetée.",
"auth_and_oauth.registration_url_invalid": "Ce lien d'inscription est invalide ou a expiré.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Ce compte est déjà associé à une autre identité SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Votre fournisseur SSO n’a pas vérifié votre adresse e-mail.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Cette identité SSO est déjà associée à un autre compte.",
"auth_and_oauth.sso_identity_mismatch": "Incohérence d'identité SSO entre id_token et userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "Le SSO est mal configuré. Contactez votre administrateur.",
"auth_and_oauth.sso_provider_did_not_return_email": "Votre fournisseur SSO n’a pas renvoyé d’adresse e-mail.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Cette instance exige l’authentification unique, votre fournisseur SSO gère donc votre adresse e-mail et votre mot de passe.} no_account {Cette instance n’autorise la connexion SSO qu’aux comptes existants, et vous n’avez pas encore de compte. Demandez l’accès à un administrateur de cette instance.} managed_username {Cette instance exige l’authentification unique, votre nom d’utilisateur vient donc de votre fournisseur SSO.} other {Cette instance exige l’authentification unique. Connectez-vous avec le bouton SSO de la page de connexion.}}",
"auth_and_oauth.sso_test_code_missing_email": "Il manque l'e-mail dans la charge utile du code de test SSO.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Impossible d’attribuer un discriminateur à votre compte SSO. Réessayez.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Le mode Sudo est requis.",
"auth_and_oauth.unknown_application": "Application inconnue.",
"auth_and_oauth.unknown_origin_handoff": "Ce transfert de connexion a expiré ou a déjà été utilisé.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "L’indicateur utilisateur spécifié n’est pas reconnu.",
"urls.invalid_url_format": "Format d'URL invalide.",
"urls.invalid_url_or_attachment_reference": "Format d'URL invalide ou référence de pièce jointe invalide.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "L'URL doit comporter entre {min} et {max} caractères.",
"urls.url_must_use_https": "L'URL doit commencer par https://.",
"urls.url_not_publicly_routable": "L'URL doit pointer vers une adresse IP publique accessible depuis Internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/he.json b/packages/errors/src/i18n/weblate/locales/he.json
index af8c6cadc..3f54f3339 100644
--- a/packages/errors/src/i18n/weblate/locales/he.json
+++ b/packages/errors/src/i18n/weblate/locales/he.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "הרשמה זו ממתינה לאישור מנהל.",
"auth_and_oauth.registration_rejected": "בקשת הרשמה זו נדחתה.",
"auth_and_oauth.registration_url_invalid": "קישור ההרשמה הזה שגוי או שפג תוקפו.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "החשבון הזה כבר מקושר לזהות SSO אחרת.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "ספק ה-SSO שלך לא אימת את כתובת האימייל שלך.",
"auth_and_oauth.sso_identity_linked_to_another_account": "זהות ה-SSO הזו כבר מקושרת לחשבון אחר.",
"auth_and_oauth.sso_identity_mismatch": "אי-התאמה בזהות SSO בין id_token ל-userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "ה-SSO מוגדר באופן שגוי. יש לפנות למנהל.",
"auth_and_oauth.sso_provider_did_not_return_email": "ספק ה-SSO שלך לא החזיר כתובת אימייל.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {מופע זה דורש כניסה יחידה (SSO), ולכן ספק ה-SSO שלך מנהל את האימייל והסיסמה שלך.} no_account {מופע זה מאפשר כניסה דרך SSO רק לחשבונות קיימים, ועדיין אין לך חשבון. בקש גישה ממנהל של מופע זה.} managed_username {מופע זה דורש כניסה יחידה (SSO), ולכן שם המשתמש שלך מגיע מספק ה-SSO שלך.} other {מופע זה דורש כניסה יחידה (SSO). התחבר באמצעות כפתור ה-SSO בדף הכניסה.}}",
"auth_and_oauth.sso_test_code_missing_email": "בקוד הבדיקה של SSO חסר מטען האימייל.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "לא הצלחנו להקצות מזהה לחשבון ה-SSO שלך. ניתן לנסות שוב.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "נדרש מצב sudo.",
"auth_and_oauth.unknown_application": "אפליקציה לא ידועה.",
"auth_and_oauth.unknown_origin_handoff": "פג תוקפה של העברת ההתחברות הזו או שכבר נעשה בה שימוש.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "דגל המשתמש שצוין אינו מזוהה.",
"urls.invalid_url_format": "פורמט כתובת אתר שגוי.",
"urls.invalid_url_or_attachment_reference": "פורמט כתובת אתר שגוי או הפניה לקובץ מצורף.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "כתובת האתר חייבת להיות באורך של {min} עד {max} תווים.",
"urls.url_must_use_https": "כתובת ה-URL חייבת להתחיל ב-https://.",
"urls.url_not_publicly_routable": "כתובת האתר חייבת להצביע על כתובת IP ציבורית הנגישה מהאינטרנט.",
diff --git a/packages/errors/src/i18n/weblate/locales/hi.json b/packages/errors/src/i18n/weblate/locales/hi.json
index 65be12de0..9c0976bae 100644
--- a/packages/errors/src/i18n/weblate/locales/hi.json
+++ b/packages/errors/src/i18n/weblate/locales/hi.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "यह रजिस्ट्रेशन एडमिन अप्रूवल का इंतज़ार कर रहा है।",
"auth_and_oauth.registration_rejected": "यह रजिस्ट्रेशन रिक्वेस्ट रिजेक्ट कर दी गई है।",
"auth_and_oauth.registration_url_invalid": "यह रजिस्ट्रेशन लिंक अमान्य है या एक्सपायर हो गया है।",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "यह खाता पहले से किसी दूसरी SSO पहचान से जुड़ा है।",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "आपके SSO प्रोवाइडर ने आपका ईमेल पता सत्यापित नहीं किया है।",
"auth_and_oauth.sso_identity_linked_to_another_account": "यह SSO पहचान पहले से किसी दूसरे खाते से जुड़ी है।",
"auth_and_oauth.sso_identity_mismatch": "id_token और userinfo के बीच SSO आइडेंटिटी मेल नहीं खाती।",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO गलत तरीके से कॉन्फ़िगर किया गया है। कृपया अपने एडमिन से संपर्क करें।",
"auth_and_oauth.sso_provider_did_not_return_email": "आपके SSO प्रोवाइडर ने ईमेल पता नहीं लौटाया।",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {इस इंस्टेंस में सिंगल साइन-ऑन ज़रूरी है, इसलिए आपका SSO प्रोवाइडर आपका ईमेल और पासवर्ड मैनेज करता है।} no_account {यह इंस्टेंस केवल मौजूदा खातों को SSO से साइन इन करने देता है, और अभी आपका कोई खाता नहीं है। इस इंस्टेंस के किसी एडमिन से एक्सेस मांगें।} managed_username {इस इंस्टेंस में सिंगल साइन-ऑन ज़रूरी है, इसलिए आपका यूज़रनेम आपके SSO प्रोवाइडर से आता है।} other {इस इंस्टेंस में सिंगल साइन-ऑन ज़रूरी है। साइन-इन पेज पर SSO बटन से साइन इन करें।}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO टेस्ट कोड में ईमेल पेलोड गायब है।",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "हम आपके SSO अकाउंट के लिए डिस्क्रिमिनेटर अलॉट नहीं कर सके। फिर से कोशिश करें।",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "सुडो मोड ज़रूरी है।",
"auth_and_oauth.unknown_application": "अज्ञात एप्लीकेशन।",
"auth_and_oauth.unknown_origin_handoff": "यह साइन-इन ट्रांसफ़र समाप्त हो गया है या पहले ही उपयोग किया जा चुका है।",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "यह यूज़र फ़्लैग पहचाना नहीं गया।",
"urls.invalid_url_format": "अमान्य URL फ़ॉर्मेट।",
"urls.invalid_url_or_attachment_reference": "अमान्य URL फ़ॉर्मेट या अटैचमेंट रेफ़रेंस।",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL {min} और {max} कैरेक्टर के बीच होना चाहिए।",
"urls.url_must_use_https": "URL https:// से शुरू होना चाहिए।",
"urls.url_not_publicly_routable": "URL ऐसे पते पर रिज़ॉल्व होना चाहिए जो सार्वजनिक रूप से रूट किया जा सके।",
diff --git a/packages/errors/src/i18n/weblate/locales/hr.json b/packages/errors/src/i18n/weblate/locales/hr.json
index a0f63bec9..9700c631e 100644
--- a/packages/errors/src/i18n/weblate/locales/hr.json
+++ b/packages/errors/src/i18n/weblate/locales/hr.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Ova registracija čeka odobrenje administratora.",
"auth_and_oauth.registration_rejected": "Ovaj zahtjev za registraciju je odbijen.",
"auth_and_oauth.registration_url_invalid": "Ova poveznica za registraciju je nevažeća ili je istekla.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Ovaj je račun već povezan s drugim SSO identitetom.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Tvoj SSO davatelj nije potvrdio tvoju e-mail adresu.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Ovaj je SSO identitet već povezan s drugim računom.",
"auth_and_oauth.sso_identity_mismatch": "Nepodudaranje SSO identiteta između id_token i userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO je pogrešno konfiguriran. Javi se administratoru.",
"auth_and_oauth.sso_provider_did_not_return_email": "Tvoj SSO davatelj nije vratio e-mail adresu.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Ova instanca zahtijeva jedinstvenu prijavu, pa tvoj SSO davatelj upravlja tvojom e-mail adresom i lozinkom.} no_account {Ova instanca dopušta prijavu putem SSO-a samo postojećim računima, a ti još nemaš račun. Zatraži pristup od administratora ove instance.} managed_username {Ova instanca zahtijeva jedinstvenu prijavu, pa tvoje korisničko ime dolazi od tvog SSO davatelja.} other {Ova instanca zahtijeva jedinstvenu prijavu. Prijavi se gumbom SSO na stranici za prijavu.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO testnom kodu nedostaje e-mail adresa.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Nismo mogli dodijeliti diskriminator tvom SSO računu. Pokušaj ponovno.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Potreban je sudo način rada.",
"auth_and_oauth.unknown_application": "Nepoznata aplikacija.",
"auth_and_oauth.unknown_origin_handoff": "Ovaj prijenos prijave je istekao ili je već iskorišten.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Navedena korisnička zastavica nije prepoznata.",
"urls.invalid_url_format": "Nevažeći format URL-a.",
"urls.invalid_url_or_attachment_reference": "Nevažeći format URL-a ili referenca privitka.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL mora biti između {min} i {max} znakova.",
"urls.url_must_use_https": "URL mora počinjati s https://.",
"urls.url_not_publicly_routable": "URL mora upućivati na javnu IP adresu dostupnu s interneta.",
diff --git a/packages/errors/src/i18n/weblate/locales/hu.json b/packages/errors/src/i18n/weblate/locales/hu.json
index c95c85779..e08978b53 100644
--- a/packages/errors/src/i18n/weblate/locales/hu.json
+++ b/packages/errors/src/i18n/weblate/locales/hu.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Ez a regisztráció rendszergazdai jóváhagyásra vár.",
"auth_and_oauth.registration_rejected": "Ez a regisztrációs kérelem el lett utasítva.",
"auth_and_oauth.registration_url_invalid": "Ez a regisztrációs link érvénytelen vagy lejárt.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Ez a fiók már egy másik SSO-identitáshoz van kapcsolva.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Az SSO-szolgáltatód nem erősítette meg az e-mail-címedet.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Ez az SSO-identitás már egy másik fiókhoz van kapcsolva.",
"auth_and_oauth.sso_identity_mismatch": "Az id_token és a userinfo eltérő SSO-azonosságot jelez.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "Az SSO rosszul van beállítva. Lépj kapcsolatba az adminisztrátoroddal.",
"auth_and_oauth.sso_provider_did_not_return_email": "Az SSO-szolgáltatód nem adott vissza e-mail-címet.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Ez a példány egységes bejelentkezést (SSO) igényel, ezért az e-mail-címedet és a jelszavadat az SSO-szolgáltatód kezeli.} no_account {Ez a példány csak meglévő fiókoknak engedi az SSO-s bejelentkezést, neked pedig még nincs fiókod. Kérj hozzáférést a példány egyik adminisztrátorától.} managed_username {Ez a példány egységes bejelentkezést (SSO) igényel, ezért a felhasználónevedet az SSO-szolgáltatód adja meg.} other {Ez a példány egységes bejelentkezést (SSO) igényel. Jelentkezz be a bejelentkezési oldalon az SSO gombbal.}}",
"auth_and_oauth.sso_test_code_missing_email": "Az SSO-tesztkódból hiányzik az e-mail-adat.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Nem sikerült számazonosítót kiosztani az SSO-fiókodhoz. Próbáld újra.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo mód szükséges.",
"auth_and_oauth.unknown_application": "Ismeretlen alkalmazás.",
"auth_and_oauth.unknown_origin_handoff": "Ez a bejelentkezés-átvitel lejárt, vagy már felhasználták.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "A megadott felhasználói jelző nem ismert.",
"urls.invalid_url_format": "Az URL formátuma érvénytelen.",
"urls.invalid_url_or_attachment_reference": "Az URL formátuma vagy a mellékletre mutató hivatkozás érvénytelen.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "Az URL {min}–{max} karakter hosszú lehet.",
"urls.url_must_use_https": "Az URL-nek https:// előtaggal kell kezdődnie.",
"urls.url_not_publicly_routable": "Az URL-nek nyilvános, interneten elérhető IP-címre kell mutatnia.",
diff --git a/packages/errors/src/i18n/weblate/locales/id.json b/packages/errors/src/i18n/weblate/locales/id.json
index 87fb578ab..e7b384b7a 100644
--- a/packages/errors/src/i18n/weblate/locales/id.json
+++ b/packages/errors/src/i18n/weblate/locales/id.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Pendaftaran ini menunggu persetujuan admin.",
"auth_and_oauth.registration_rejected": "Permintaan pendaftaran ini ditolak.",
"auth_and_oauth.registration_url_invalid": "Tautan pendaftaran ini tidak valid atau telah kedaluwarsa.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Akun ini sudah ditautkan ke identitas SSO lain.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Penyedia SSO kamu belum memverifikasi alamat email kamu.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Identitas SSO ini sudah ditautkan ke akun lain.",
"auth_and_oauth.sso_identity_mismatch": "Ketidakcocokan identitas SSO antara id_token dan userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO tidak dikonfigurasi dengan benar. Silakan hubungi admin.",
"auth_and_oauth.sso_provider_did_not_return_email": "Penyedia SSO kamu tidak mengembalikan alamat email.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Instans ini mewajibkan SSO, jadi email dan kata sandi kamu dikelola oleh penyedia SSO kamu.} no_account {Instans ini hanya mengizinkan akun yang sudah ada untuk masuk dengan SSO, dan kamu belum punya akun. Minta akses ke admin instans ini.} managed_username {Instans ini mewajibkan SSO, jadi nama pengguna kamu berasal dari penyedia SSO kamu.} other {Instans ini mewajibkan SSO. Masuk dengan tombol SSO di halaman masuk.}}",
"auth_and_oauth.sso_test_code_missing_email": "Kode uji SSO tidak menyertakan payload email.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Tidak bisa mengalokasikan diskriminator untuk akun SSO kamu. Silakan coba lagi.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Mode sudo diperlukan.",
"auth_and_oauth.unknown_application": "Aplikasi tidak dikenal.",
"auth_and_oauth.unknown_origin_handoff": "Transfer masuk ini sudah kedaluwarsa atau sudah digunakan.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Flag pengguna yang ditentukan tidak dikenali.",
"urls.invalid_url_format": "Format URL tidak valid.",
"urls.invalid_url_or_attachment_reference": "Format URL atau referensi lampiran tidak valid.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL harus antara {min} dan {max} karakter.",
"urls.url_must_use_https": "URL harus diawali dengan https://.",
"urls.url_not_publicly_routable": "URL harus mengarah ke alamat IP publik yang dapat diakses dari internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/it.json b/packages/errors/src/i18n/weblate/locales/it.json
index 33499b0b4..f8f616342 100644
--- a/packages/errors/src/i18n/weblate/locales/it.json
+++ b/packages/errors/src/i18n/weblate/locales/it.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Questa registrazione è in attesa dell'approvazione dell'amministratore.",
"auth_and_oauth.registration_rejected": "Questa richiesta di registrazione è stata rifiutata.",
"auth_and_oauth.registration_url_invalid": "Questo link di registrazione non è valido o è scaduto.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Questo account è già collegato a un'altra identità SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Il tuo provider SSO non ha verificato il tuo indirizzo email.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Questa identità SSO è già collegata a un altro account.",
"auth_and_oauth.sso_identity_mismatch": "Mancata corrispondenza dell'identità SSO tra id_token e userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO configurato in modo errato. Contatta l'amministratore.",
"auth_and_oauth.sso_provider_did_not_return_email": "Il tuo provider SSO non ha restituito un indirizzo email.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Questa istanza richiede il single sign-on, quindi la tua email e la tua password sono gestite dal tuo provider SSO.} no_account {Questa istanza consente l'accesso con SSO solo agli account esistenti e non hai ancora un account. Chiedi l'accesso a un amministratore di questa istanza.} managed_username {Questa istanza richiede il single sign-on, quindi il tuo nome utente arriva dal tuo provider SSO.} other {Questa istanza richiede il single sign-on. Accedi con il pulsante SSO nella pagina di accesso.}}",
"auth_and_oauth.sso_test_code_missing_email": "Il codice di test SSO non contiene il payload email.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Non è stato possibile assegnare un discriminatore al tuo account SSO. Riprova.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "La modalità Sudo è richiesta.",
"auth_and_oauth.unknown_application": "Applicazione sconosciuta.",
"auth_and_oauth.unknown_origin_handoff": "Questo trasferimento di accesso è scaduto o è già stato usato.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Il flag utente specificato non è riconosciuto.",
"urls.invalid_url_format": "Formato URL non valido.",
"urls.invalid_url_or_attachment_reference": "Formato URL o riferimento allegato non valido.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "L’URL deve contenere da {min} a {max} caratteri.",
"urls.url_must_use_https": "L'URL deve iniziare con https://.",
"urls.url_not_publicly_routable": "L'URL deve puntare a un indirizzo IP pubblico raggiungibile da internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/ja.json b/packages/errors/src/i18n/weblate/locales/ja.json
index 2d9e425ab..a569772c0 100644
--- a/packages/errors/src/i18n/weblate/locales/ja.json
+++ b/packages/errors/src/i18n/weblate/locales/ja.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "この登録は管理者による承認待ちです。",
"auth_and_oauth.registration_rejected": "この登録リクエストは拒否されました。",
"auth_and_oauth.registration_url_invalid": "この登録リンクは無効または期限切れです。",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "このアカウントは既に別のSSO IDにリンクされています。",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "SSOプロバイダーでメールアドレスが確認されていません。",
"auth_and_oauth.sso_identity_linked_to_another_account": "このSSO IDは既に別のアカウントにリンクされています。",
"auth_and_oauth.sso_identity_mismatch": "id_tokenとuserinfo間でSSO情報が一致しません。",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSOの設定に誤りがあります。管理者にお問い合わせください。",
"auth_and_oauth.sso_provider_did_not_return_email": "SSOプロバイダーからメールアドレスが返されませんでした。",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {このインスタンスではシングルサインオンが必要なため、メールアドレスとパスワードはSSOプロバイダーで管理されています。} no_account {このインスタンスでは既存のアカウントのみSSOでサインインできますが、あなたのアカウントはまだありません。このインスタンスの管理者にアクセスを依頼してください。} managed_username {このインスタンスではシングルサインオンが必要なため、ユーザー名はSSOプロバイダーから設定されます。} other {このインスタンスではシングルサインオンが必要です。サインインページのSSOボタンからサインインしてください。}}",
"auth_and_oauth.sso_test_code_missing_email": "SSOテストコードにメールのペイロードがありません。",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "SSOアカウントの識別子を割り当てられませんでした。もう一度お試しください。",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudoモードが必要です。",
"auth_and_oauth.unknown_application": "不明なアプリケーションです。",
"auth_and_oauth.unknown_origin_handoff": "このサインインの引き継ぎは期限切れか、すでに使用されています。",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "指定されたユーザーフラグは認識されません。",
"urls.invalid_url_format": "URLの形式が無効です。",
"urls.invalid_url_or_attachment_reference": "URLの形式または添付ファイルの参照が無効です。",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URLは{min}~{max}文字である必要があります。",
"urls.url_must_use_https": "URLはhttps://で始まる必要があります。",
"urls.url_not_publicly_routable": "URLはインターネットから到達可能なパブリックIPアドレスに解決される必要があります。",
diff --git a/packages/errors/src/i18n/weblate/locales/ko.json b/packages/errors/src/i18n/weblate/locales/ko.json
index 086e1c891..ceb1ce442 100644
--- a/packages/errors/src/i18n/weblate/locales/ko.json
+++ b/packages/errors/src/i18n/weblate/locales/ko.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "이 가입 신청은 관리자 승인을 기다리고 있어요.",
"auth_and_oauth.registration_rejected": "이 가입 요청은 거부되었어요.",
"auth_and_oauth.registration_url_invalid": "이 가입 링크는 유효하지 않거나 만료되었어요.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "이 계정은 이미 다른 SSO ID에 연결되어 있습니다.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "SSO 제공자가 이메일 주소를 인증하지 않았어요.",
"auth_and_oauth.sso_identity_linked_to_another_account": "이 SSO ID는 이미 다른 계정에 연결되어 있습니다.",
"auth_and_oauth.sso_identity_mismatch": "id_token과 userinfo 사이의 SSO 신원이 일치하지 않아요.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO 구성이 잘못되었어요. 관리자에게 문의해 주세요.",
"auth_and_oauth.sso_provider_did_not_return_email": "SSO 제공자가 이메일 주소를 반환하지 않았어요.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {이 인스턴스는 싱글 사인온이 필요해서 이메일과 비밀번호는 SSO 제공자가 관리해요.} no_account {이 인스턴스는 기존 계정만 SSO로 로그인할 수 있는데, 아직 계정이 없어요. 이 인스턴스 관리자에게 접근 권한을 요청하세요.} managed_username {이 인스턴스는 싱글 사인온이 필요해서 사용자 이름은 SSO 제공자에서 가져와요.} other {이 인스턴스는 싱글 사인온이 필요해요. 로그인 페이지의 SSO 버튼으로 로그인하세요.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO 테스트 코드에 이메일 페이로드가 없어요.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "SSO 계정에 디스크리미네이터를 할당하지 못했어요. 다시 시도해 주세요.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo 모드가 필요해요.",
"auth_and_oauth.unknown_application": "알 수 없는 애플리케이션이에요.",
"auth_and_oauth.unknown_origin_handoff": "이 로그인 이전 요청이 만료되었거나 이미 사용되었습니다.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "지정된 사용자 플래그를 인식하지 못했어요.",
"urls.invalid_url_format": "URL 형식이 올바르지 않아요.",
"urls.invalid_url_or_attachment_reference": "URL 형식 또는 첨부 파일 참조가 올바르지 않아요.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL은 {min}자에서 {max}자 사이여야 해요.",
"urls.url_must_use_https": "URL은 https://로 시작해야 합니다.",
"urls.url_not_publicly_routable": "URL은 인터넷에서 접근할 수 있는 공인 IP 주소를 가리켜야 해요.",
diff --git a/packages/errors/src/i18n/weblate/locales/lt.json b/packages/errors/src/i18n/weblate/locales/lt.json
index 2ce3cb448..ab1b1c50c 100644
--- a/packages/errors/src/i18n/weblate/locales/lt.json
+++ b/packages/errors/src/i18n/weblate/locales/lt.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Ši registracija laukia administratoriaus patvirtinimo.",
"auth_and_oauth.registration_rejected": "Šis registracijos prašymas buvo atmestas.",
"auth_and_oauth.registration_url_invalid": "Ši registracijos nuoroda yra neteisinga arba baigėsi jos galiojimas.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Ši paskyra jau susieta su kita SSO tapatybe.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Tavo SSO teikėjas nepatvirtino tavo el. pašto adreso.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Ši SSO tapatybė jau susieta su kita paskyra.",
"auth_and_oauth.sso_identity_mismatch": "SSO tapatybė tarp id_token ir userinfo nesutampa.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO neteisingai sukonfigūruotas. Susisiek su administratoriumi.",
"auth_and_oauth.sso_provider_did_not_return_email": "Tavo SSO teikėjas negrąžino el. pašto adreso.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Šiai instancijai reikia prisijungimo per SSO, todėl tavo el. paštą ir slaptažodį tvarko tavo SSO teikėjas.} no_account {Ši instancija leidžia prisijungti per SSO tik esamoms paskyroms, o tu dar neturi paskyros. Paprašyk šios instancijos administratoriaus prieigos.} managed_username {Šiai instancijai reikia prisijungimo per SSO, todėl tavo naudotojo vardą nustato tavo SSO teikėjas.} other {Šiai instancijai reikia prisijungimo per SSO. Prisijunk prisijungimo puslapyje esančiu SSO mygtuku.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO bandomajame kode trūksta el. pašto duomenų.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Nepavyko priskirti diskriminatoriaus tavo SSO paskyrai. Pabandyk dar kartą.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Reikalingas sudo režimas.",
"auth_and_oauth.unknown_application": "Nežinoma programa.",
"auth_and_oauth.unknown_origin_handoff": "Šio prisijungimo perkėlimo galiojimas baigėsi arba jis jau panaudotas.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Nurodyta naudotojo vėliavėlė neatpažįstama.",
"urls.invalid_url_format": "Netinkamas URL formatas.",
"urls.invalid_url_or_attachment_reference": "Netinkamas URL formatas arba priedo nuoroda.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL turi būti {min}–{max} simbolių.",
"urls.url_must_use_https": "URL turi prasidėti https://.",
"urls.url_not_publicly_routable": "URL turi nurodyti viešai pasiekiamą adresą.",
diff --git a/packages/errors/src/i18n/weblate/locales/nl.json b/packages/errors/src/i18n/weblate/locales/nl.json
index 24a54ef5e..92f67a6dd 100644
--- a/packages/errors/src/i18n/weblate/locales/nl.json
+++ b/packages/errors/src/i18n/weblate/locales/nl.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Deze registratie wacht op goedkeuring van de beheerder.",
"auth_and_oauth.registration_rejected": "Dit registratieverzoek is afgewezen.",
"auth_and_oauth.registration_url_invalid": "Deze registratielink is ongeldig of verlopen.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Dit account is al gekoppeld aan een andere SSO-identiteit.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Je SSO-provider heeft je e-mailadres niet geverifieerd.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Deze SSO-identiteit is al gekoppeld aan een ander account.",
"auth_and_oauth.sso_identity_mismatch": "SSO-identiteit komt niet overeen tussen id_token en userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO is foutief geconfigureerd. Neem contact op met je beheerder.",
"auth_and_oauth.sso_provider_did_not_return_email": "Je SSO-provider heeft geen e-mailadres geretourneerd.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Deze instantie vereist single sign-on, dus je SSO-provider beheert je e-mailadres en wachtwoord.} no_account {Op deze instantie kunnen alleen bestaande accounts inloggen met SSO, en er is nog geen account voor je. Vraag een beheerder van deze instantie om toegang.} managed_username {Deze instantie vereist single sign-on, dus je gebruikersnaam komt van je SSO-provider.} other {Deze instantie vereist single sign-on. Log in met de SSO-knop op de inlogpagina.}}",
"auth_and_oauth.sso_test_code_missing_email": "De SSO-testcode mist de e-mailpayload.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "We konden geen discriminator toewijzen aan je SSO-account. Probeer het nog eens.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo-modus is vereist.",
"auth_and_oauth.unknown_application": "Onbekende app.",
"auth_and_oauth.unknown_origin_handoff": "Deze aanmeldoverdracht is verlopen of al gebruikt.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "De opgegeven gebruikersvlag is niet herkend.",
"urls.invalid_url_format": "Ongeldig URL-formaat.",
"urls.invalid_url_or_attachment_reference": "Ongeldig URL-formaat of ongeldige bijlageverwijzing.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL moet tussen {min} en {max} tekens lang zijn.",
"urls.url_must_use_https": "De URL moet beginnen met https://.",
"urls.url_not_publicly_routable": "URL moet verwijzen naar een openbaar IP-adres dat bereikbaar is via internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/no.json b/packages/errors/src/i18n/weblate/locales/no.json
index 8674e6e85..e7fa5b29e 100644
--- a/packages/errors/src/i18n/weblate/locales/no.json
+++ b/packages/errors/src/i18n/weblate/locales/no.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Denne registreringen venter på administratorgodkjenning.",
"auth_and_oauth.registration_rejected": "Denne registreringsforespørselen ble avvist.",
"auth_and_oauth.registration_url_invalid": "Denne registreringslenken er ugyldig eller har utløpt.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Denne kontoen er allerede koblet til en annen SSO-identitet.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "SSO-leverandøren din har ikke bekreftet e-postadressen din.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Denne SSO-identiteten er allerede koblet til en annen konto.",
"auth_and_oauth.sso_identity_mismatch": "SSO-identiteten samsvarer ikke mellom id_token og userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO er feilkonfigurert. Kontakt administratoren din.",
"auth_and_oauth.sso_provider_did_not_return_email": "SSO-leverandøren din returnerte ikke en e-postadresse.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Denne instansen krever enkeltpålogging, så SSO-leverandøren din styrer e-postadressen og passordet ditt.} no_account {Denne instansen lar bare eksisterende kontoer logge inn med SSO, og det finnes ingen konto for deg ennå. Be en administrator for denne instansen om tilgang.} managed_username {Denne instansen krever enkeltpålogging, så brukernavnet ditt kommer fra SSO-leverandøren din.} other {Denne instansen krever enkeltpålogging. Logg inn med SSO-knappen på innloggingssiden.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO-testkoden mangler e-postdataene.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Vi klarte ikke å tildele en diskriminator til SSO-kontoen din. Prøv igjen.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo-modus er påkrevd.",
"auth_and_oauth.unknown_application": "Ukjent app.",
"auth_and_oauth.unknown_origin_handoff": "Denne overføringen av påloggingen er utløpt eller allerede brukt.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Det angitte brukerflagget gjenkjennes ikke.",
"urls.invalid_url_format": "Ugyldig URL-format.",
"urls.invalid_url_or_attachment_reference": "Ugyldig URL-format eller vedleggsreferanse.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL-en må inneholde mellom {min} og {max} tegn.",
"urls.url_must_use_https": "URL-en må starte med https://.",
"urls.url_not_publicly_routable": "URL-en må peke til en offentlig rutbar adresse.",
diff --git a/packages/errors/src/i18n/weblate/locales/pl.json b/packages/errors/src/i18n/weblate/locales/pl.json
index ad7ac0db0..f6f18d050 100644
--- a/packages/errors/src/i18n/weblate/locales/pl.json
+++ b/packages/errors/src/i18n/weblate/locales/pl.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Ta rejestracja czeka na zatwierdzenie przez administratora.",
"auth_and_oauth.registration_rejected": "Ten wniosek o rejestrację został odrzucony.",
"auth_and_oauth.registration_url_invalid": "Ten link rejestracyjny jest nieprawidłowy lub wygasł.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "To konto jest już połączone z inną tożsamością SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Twój dostawca SSO nie zweryfikował Twojego adresu e-mail.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Ta tożsamość SSO jest już połączona z innym kontem.",
"auth_and_oauth.sso_identity_mismatch": "Niezgodność tożsamości SSO w id_token i userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO jest nieprawidłowo skonfigurowane. Skontaktuj się z administratorem.",
"auth_and_oauth.sso_provider_did_not_return_email": "Twój dostawca SSO nie zwrócił adresu e-mail.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Ta instancja wymaga logowania jednokrotnego, więc Twoim adresem e-mail i hasłem zarządza Twój dostawca SSO.} no_account {Ta instancja pozwala logować się przez SSO tylko istniejącym kontom, a Ty nie masz jeszcze konta. Poproś administratora tej instancji o dostęp.} managed_username {Ta instancja wymaga logowania jednokrotnego, więc Twoja nazwa użytkownika pochodzi od Twojego dostawcy SSO.} other {Ta instancja wymaga logowania jednokrotnego. Zaloguj się przyciskiem SSO na stronie logowania.}}",
"auth_and_oauth.sso_test_code_missing_email": "Testowy kod SSO nie zawiera danych adresu e-mail.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Nie udało się przydzielić dyskryminatora dla Twojego konta SSO. Spróbuj ponownie.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Wymagany tryb sudo.",
"auth_and_oauth.unknown_application": "Nieznana aplikacja.",
"auth_and_oauth.unknown_origin_handoff": "To przeniesienie logowania wygasło lub zostało już użyte.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Określona flaga użytkownika nie jest rozpoznawana.",
"urls.invalid_url_format": "Nieprawidłowy format adresu URL.",
"urls.invalid_url_or_attachment_reference": "Nieprawidłowy format adresu URL lub odwołanie do załącznika.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "Adres URL musi mieć od {min} do {max} znaków.",
"urls.url_must_use_https": "Adres URL musi zaczynać się od https://.",
"urls.url_not_publicly_routable": "URL musi wskazywać na publicznie dostępny adres IP.",
diff --git a/packages/errors/src/i18n/weblate/locales/pt-BR.json b/packages/errors/src/i18n/weblate/locales/pt-BR.json
index aa55463fe..0d58d7ab9 100644
--- a/packages/errors/src/i18n/weblate/locales/pt-BR.json
+++ b/packages/errors/src/i18n/weblate/locales/pt-BR.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Este cadastro está aguardando a aprovação de um administrador.",
"auth_and_oauth.registration_rejected": "Esta solicitação de cadastro foi rejeitada.",
"auth_and_oauth.registration_url_invalid": "Este link de cadastro é inválido ou expirou.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Esta conta já está vinculada a outra identidade de SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Seu provedor SSO não verificou seu endereço de e-mail.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Esta identidade de SSO já está vinculada a outra conta.",
"auth_and_oauth.sso_identity_mismatch": "Incompatibilidade de identidade SSO entre id_token e userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "O SSO está mal configurado. Entre em contato com seu administrador.",
"auth_and_oauth.sso_provider_did_not_return_email": "Seu provedor SSO não retornou um endereço de e-mail.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Esta instância exige login único (SSO), então seu provedor SSO gerencia seu e-mail e sua senha.} no_account {Esta instância só permite entrar com SSO em contas existentes, e você ainda não tem uma conta. Peça acesso a um administrador desta instância.} managed_username {Esta instância exige login único (SSO), então seu nome de usuário vem do seu provedor SSO.} other {Esta instância exige login único (SSO). Entre com o botão de SSO na página de login.}}",
"auth_and_oauth.sso_test_code_missing_email": "O código de teste do SSO está sem o payload de e-mail.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Não foi possível alocar um discriminador para sua conta SSO. Tente novamente.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "O modo sudo é obrigatório.",
"auth_and_oauth.unknown_application": "Aplicativo desconhecido.",
"auth_and_oauth.unknown_origin_handoff": "Esta transferência de login expirou ou já foi usada.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "A flag de usuário especificada não é reconhecida.",
"urls.invalid_url_format": "Formato de URL inválido.",
"urls.invalid_url_or_attachment_reference": "Formato de URL ou referência de anexo inválido.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "A URL deve ter entre {min} e {max} caracteres.",
"urls.url_must_use_https": "A URL deve começar com https://.",
"urls.url_not_publicly_routable": "A URL deve apontar para um endereço IP público acessível pela internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/ro.json b/packages/errors/src/i18n/weblate/locales/ro.json
index 36432b8d2..7ec6fefd8 100644
--- a/packages/errors/src/i18n/weblate/locales/ro.json
+++ b/packages/errors/src/i18n/weblate/locales/ro.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Această înregistrare așteaptă aprobarea administratorului.",
"auth_and_oauth.registration_rejected": "Această cerere de înregistrare a fost respinsă.",
"auth_and_oauth.registration_url_invalid": "Acest link de înregistrare este invalid sau a expirat.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Acest cont este deja asociat cu o altă identitate SSO.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Furnizorul tău SSO nu ți-a verificat adresa de e-mail.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Această identitate SSO este deja asociată cu alt cont.",
"auth_and_oauth.sso_identity_mismatch": "Nepotrivire de identitate SSO între id_token și userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO este configurat incorect. Contactează administratorul.",
"auth_and_oauth.sso_provider_did_not_return_email": "Furnizorul tău SSO nu a returnat o adresă de e-mail.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Această instanță necesită autentificare unică, așa că furnizorul tău SSO îți gestionează adresa de e-mail și parola.} no_account {Această instanță permite conectarea prin SSO doar conturilor existente, iar tu nu ai încă un cont. Cere acces unui administrator al acestei instanțe.} managed_username {Această instanță necesită autentificare unică, așa că numele tău de utilizator vine de la furnizorul tău SSO.} other {Această instanță necesită autentificare unică. Conectează-te cu butonul SSO de pe pagina de conectare.}}",
"auth_and_oauth.sso_test_code_missing_email": "Codului de test SSO îi lipsește payload-ul de e-mail.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Nu s-a putut aloca un discriminator pentru contul tău SSO. Încearcă din nou.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Modul Sudo este necesar.",
"auth_and_oauth.unknown_application": "Aplicație necunoscută.",
"auth_and_oauth.unknown_origin_handoff": "Acest transfer de autentificare a expirat sau a fost deja folosit.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Indicatorul de utilizator specificat nu este recunoscut.",
"urls.invalid_url_format": "Formatul URL-ului este invalid.",
"urls.invalid_url_or_attachment_reference": "Formatul URL-ului este invalid sau referința atașamentului este invalidă.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL-ul trebuie să aibă între {min} și {max} caractere.",
"urls.url_must_use_https": "URL-ul trebuie să înceapă cu https://.",
"urls.url_not_publicly_routable": "URL-ul trebuie să indice o adresă IP publică, accesibilă de pe internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/ru.json b/packages/errors/src/i18n/weblate/locales/ru.json
index 8ff543227..ec6b0960c 100644
--- a/packages/errors/src/i18n/weblate/locales/ru.json
+++ b/packages/errors/src/i18n/weblate/locales/ru.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Эта регистрация ожидает одобрения администратора.",
"auth_and_oauth.registration_rejected": "Заявка на регистрацию отклонена.",
"auth_and_oauth.registration_url_invalid": "Эта ссылка для регистрации недействительна или её срок действия истёк.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Этот аккаунт уже привязан к другому SSO-профилю.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Твой провайдер SSO не подтвердил твой email.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Этот SSO-профиль уже привязан к другому аккаунту.",
"auth_and_oauth.sso_identity_mismatch": "Идентификаторы SSO в id_token и userinfo не совпадают.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO настроен некорректно. Обратись к администратору.",
"auth_and_oauth.sso_provider_did_not_return_email": "Твой провайдер SSO не вернул email.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Этот экземпляр требует входа через SSO, поэтому твоим email и паролем управляет твой провайдер SSO.} no_account {На этом экземпляре войти через SSO могут только существующие учётные записи, а у тебя её пока нет. Попроси доступ у администратора этого экземпляра.} managed_username {Этот экземпляр требует входа через SSO, поэтому твоё имя пользователя задаёт твой провайдер SSO.} other {Этот экземпляр требует входа через SSO. Войди с помощью кнопки SSO на странице входа.}}",
"auth_and_oauth.sso_test_code_missing_email": "В тестовом коде SSO отсутствуют данные email.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Не удалось назначить дискриминатор для твоего аккаунта SSO. Попробуй ещё раз.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Требуется режим sudo.",
"auth_and_oauth.unknown_application": "Неизвестное приложение.",
"auth_and_oauth.unknown_origin_handoff": "Срок действия этого переноса входа истёк, или он уже использован.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Указанный флаг пользователя не распознан.",
"urls.invalid_url_format": "Неверный формат URL.",
"urls.invalid_url_or_attachment_reference": "Неверный формат URL или ссылка на вложение.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL должен содержать от {min} до {max} символов.",
"urls.url_must_use_https": "URL должен начинаться с https://.",
"urls.url_not_publicly_routable": "URL должен указывать на публичный IP-адрес, доступный из интернета.",
diff --git a/packages/errors/src/i18n/weblate/locales/sv-SE.json b/packages/errors/src/i18n/weblate/locales/sv-SE.json
index 190d04230..7e6f2cc09 100644
--- a/packages/errors/src/i18n/weblate/locales/sv-SE.json
+++ b/packages/errors/src/i18n/weblate/locales/sv-SE.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Den här registreringen väntar på administratörsgodkännande.",
"auth_and_oauth.registration_rejected": "Den här registreringsbegäran avslogs.",
"auth_and_oauth.registration_url_invalid": "Den här registreringslänken är ogiltig eller har gått ut.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Det här kontot är redan kopplat till en annan SSO-identitet.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Din SSO-leverantör har inte verifierat din e-postadress.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Den här SSO-identiteten är redan kopplad till ett annat konto.",
"auth_and_oauth.sso_identity_mismatch": "SSO-identiteten i id_token stämmer inte överens med den i userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO är felkonfigurerat. Kontakta din administratör.",
"auth_and_oauth.sso_provider_did_not_return_email": "Din SSO-leverantör returnerade ingen e-postadress.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Den här instansen kräver enkel inloggning (SSO), så din SSO-leverantör hanterar din e-postadress och ditt lösenord.} no_account {Den här instansen låter bara befintliga konton logga in med SSO, och det finns inget konto för dig än. Be en administratör för den här instansen om åtkomst.} managed_username {Den här instansen kräver enkel inloggning (SSO), så ditt användarnamn kommer från din SSO-leverantör.} other {Den här instansen kräver enkel inloggning (SSO). Logga in med SSO-knappen på inloggningssidan.}}",
"auth_and_oauth.sso_test_code_missing_email": "E-postinformationen saknas i SSO-testkoden.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Vi kunde inte tilldela en diskriminator för ditt SSO-konto. Försök igen.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo-läge krävs.",
"auth_and_oauth.unknown_application": "Okänd applikation.",
"auth_and_oauth.unknown_origin_handoff": "Den här inloggningsöverföringen har gått ut eller har redan använts.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Den angivna användarflaggan känns inte igen.",
"urls.invalid_url_format": "Ogiltigt URL-format.",
"urls.invalid_url_or_attachment_reference": "Ogiltigt URL-format eller ogiltig bilagereferens.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL:en måste vara mellan {min} och {max} tecken lång.",
"urls.url_must_use_https": "URL:en måste börja med https://.",
"urls.url_not_publicly_routable": "URL:en måste peka på en publik IP-adress som är nåbar från internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/th.json b/packages/errors/src/i18n/weblate/locales/th.json
index 25299fd48..cbbc01ecf 100644
--- a/packages/errors/src/i18n/weblate/locales/th.json
+++ b/packages/errors/src/i18n/weblate/locales/th.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "การลงทะเบียนนี้กำลังรอการอนุมัติจากผู้ดูแลระบบ",
"auth_and_oauth.registration_rejected": "คำขอลงทะเบียนนี้ถูกปฏิเสธ",
"auth_and_oauth.registration_url_invalid": "ลิงก์ลงทะเบียนนี้ไม่ถูกต้องหรือหมดอายุแล้ว",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "บัญชีนี้เชื่อมโยงกับข้อมูลระบุตัวตน SSO อื่นอยู่แล้ว",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "ผู้ให้บริการ SSO ของคุณยังไม่ได้ยืนยันที่อยู่อีเมลของคุณ",
"auth_and_oauth.sso_identity_linked_to_another_account": "ข้อมูลระบุตัวตน SSO นี้เชื่อมโยงกับบัญชีอื่นอยู่แล้ว",
"auth_and_oauth.sso_identity_mismatch": "ข้อมูลประจำตัว SSO ไม่ตรงกันระหว่าง id_token และ userinfo",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO ตั้งค่าไม่ถูกต้อง โปรดติดต่อผู้ดูแลระบบ",
"auth_and_oauth.sso_provider_did_not_return_email": "ผู้ให้บริการ SSO ของคุณไม่ได้ส่งคืนที่อยู่อีเมล",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {อินสแตนซ์นี้กำหนดให้เข้าสู่ระบบแบบ SSO ผู้ให้บริการ SSO ของคุณจึงเป็นผู้จัดการอีเมลและรหัสผ่านของคุณ} no_account {อินสแตนซ์นี้อนุญาตให้เฉพาะบัญชีที่มีอยู่แล้วเข้าสู่ระบบด้วย SSO และคุณยังไม่มีบัญชี โปรดขอสิทธิ์เข้าถึงจากผู้ดูแลอินสแตนซ์นี้} managed_username {อินสแตนซ์นี้กำหนดให้เข้าสู่ระบบแบบ SSO ชื่อผู้ใช้ของคุณจึงมาจากผู้ให้บริการ SSO ของคุณ} other {อินสแตนซ์นี้กำหนดให้เข้าสู่ระบบแบบ SSO โปรดเข้าสู่ระบบด้วยปุ่ม SSO ในหน้าเข้าสู่ระบบ}}",
"auth_and_oauth.sso_test_code_missing_email": "รหัสทดสอบ SSO ไม่มีเพย์โหลดอีเมล",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "ไม่สามารถสร้าง discriminator สำหรับบัญชี SSO ของคุณได้ โปรดลองอีกครั้ง",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "ต้องใช้โหมด sudo",
"auth_and_oauth.unknown_application": "ไม่พบแอปพลิเคชัน",
"auth_and_oauth.unknown_origin_handoff": "การโอนการลงชื่อเข้าใช้นี้หมดอายุแล้วหรือถูกใช้ไปแล้ว",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "ไม่รู้จักแฟล็กผู้ใช้ที่ระบุ",
"urls.invalid_url_format": "รูปแบบ URL ไม่ถูกต้อง",
"urls.invalid_url_or_attachment_reference": "รูปแบบ URL หรือการอ้างอิงไฟล์แนบไม่ถูกต้อง",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL ต้องมีความยาวระหว่าง {min} ถึง {max} ตัวอักษร",
"urls.url_must_use_https": "URL ต้องขึ้นต้นด้วย https://",
"urls.url_not_publicly_routable": "URL ต้องชี้ไปยังที่อยู่ IP สาธารณะที่เข้าถึงได้จากอินเทอร์เน็ต",
diff --git a/packages/errors/src/i18n/weblate/locales/tr.json b/packages/errors/src/i18n/weblate/locales/tr.json
index dc61ba41c..7729b0151 100644
--- a/packages/errors/src/i18n/weblate/locales/tr.json
+++ b/packages/errors/src/i18n/weblate/locales/tr.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Bu kayıt yönetici onayını bekliyor.",
"auth_and_oauth.registration_rejected": "Bu kayıt isteği reddedildi.",
"auth_and_oauth.registration_url_invalid": "Bu kayıt bağlantısı geçersiz veya süresi dolmuş.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Bu hesap zaten başka bir SSO kimliğine bağlı.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "SSO sağlayıcın e-posta adresini doğrulamadı.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Bu SSO kimliği zaten başka bir hesaba bağlı.",
"auth_and_oauth.sso_identity_mismatch": "id_token ile userinfo arasında SSO kimlik uyuşmazlığı.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO yanlış yapılandırılmış. Lütfen yöneticinle iletişime geç.",
"auth_and_oauth.sso_provider_did_not_return_email": "SSO sağlayıcın bir e-posta adresi döndürmedi.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Bu örnek tek oturum açma gerektiriyor, bu yüzden e-posta adresini ve parolanı SSO sağlayıcın yönetiyor.} no_account {Bu örnek yalnızca mevcut hesapların SSO ile giriş yapmasına izin veriyor ve henüz bir hesabın yok. Bu örneğin bir yöneticisinden erişim iste.} managed_username {Bu örnek tek oturum açma gerektiriyor, bu yüzden kullanıcı adın SSO sağlayıcından geliyor.} other {Bu örnek tek oturum açma gerektiriyor. Giriş sayfasındaki SSO düğmesiyle giriş yap.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO test kodunda e-posta verisi eksik.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "SSO hesabın için bir etiket atayamadık. Lütfen tekrar dene.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo modu gerekli.",
"auth_and_oauth.unknown_application": "Bilinmeyen uygulama.",
"auth_and_oauth.unknown_origin_handoff": "Bu oturum açma aktarımının süresi doldu veya zaten kullanıldı.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Belirtilen kullanıcı bayrağı tanınmıyor.",
"urls.invalid_url_format": "Geçersiz URL biçimi.",
"urls.invalid_url_or_attachment_reference": "Geçersiz URL biçimi veya ek referansı.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL {min} ile {max} karakter arasında olmalı.",
"urls.url_must_use_https": "URL https:// ile başlamalıdır.",
"urls.url_not_publicly_routable": "URL, internet üzerinden erişilebilen genel bir IP adresine çözümlenmeli.",
diff --git a/packages/errors/src/i18n/weblate/locales/uk.json b/packages/errors/src/i18n/weblate/locales/uk.json
index 9ba5b5583..30394ed5f 100644
--- a/packages/errors/src/i18n/weblate/locales/uk.json
+++ b/packages/errors/src/i18n/weblate/locales/uk.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Ця реєстрація очікує на схвалення адміністратором.",
"auth_and_oauth.registration_rejected": "Цей запит на реєстрацію було відхилено.",
"auth_and_oauth.registration_url_invalid": "Це посилання для реєстрації недійсне або термін його дії минув.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Цей обліковий запис уже пов'язано з іншим SSO-профілем.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Твій SSO-провайдер не підтвердив твою електронну адресу.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Цей SSO-профіль уже пов'язано з іншим обліковим записом.",
"auth_and_oauth.sso_identity_mismatch": "Невідповідність ідентифікації SSO між id_token та userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO налаштовано неправильно. Звернись до свого адміністратора.",
"auth_and_oauth.sso_provider_did_not_return_email": "Твій SSO-провайдер не повернув електронну адресу.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Цей екземпляр вимагає єдиного входу (SSO), тому твоєю електронною адресою й паролем керує твій SSO-провайдер.} no_account {Цей екземпляр дозволяє входити через SSO лише наявним обліковим записам, а в тебе його ще немає. Попроси доступ в адміністратора цього екземпляра.} managed_username {Цей екземпляр вимагає єдиного входу (SSO), тому твоє ім’я користувача надходить від твого SSO-провайдера.} other {Цей екземпляр вимагає єдиного входу (SSO). Увійди за допомогою кнопки SSO на сторінці входу.}}",
"auth_and_oauth.sso_test_code_missing_email": "У тестовому коді SSO відсутні дані електронної пошти.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Не вдалося призначити дискримінатор для твого акаунта SSO. Спробуй ще раз.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Потрібен режим sudo.",
"auth_and_oauth.unknown_application": "Невідомий застосунок.",
"auth_and_oauth.unknown_origin_handoff": "Термін дії цього перенесення входу минув, або його вже використано.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Зазначений прапорець користувача не розпізнано.",
"urls.invalid_url_format": "Неправильний формат URL.",
"urls.invalid_url_or_attachment_reference": "Неправильний формат URL або посилання на вкладення.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL має містити від {min} до {max} символів.",
"urls.url_must_use_https": "URL має починатися з https://.",
"urls.url_not_publicly_routable": "URL має вказувати на публічну IP-адресу, доступну з інтернету.",
diff --git a/packages/errors/src/i18n/weblate/locales/vi.json b/packages/errors/src/i18n/weblate/locales/vi.json
index eaa27f71b..4bb9b36d8 100644
--- a/packages/errors/src/i18n/weblate/locales/vi.json
+++ b/packages/errors/src/i18n/weblate/locales/vi.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "Đăng ký này đang chờ quản trị viên phê duyệt.",
"auth_and_oauth.registration_rejected": "Yêu cầu đăng ký này đã bị từ chối.",
"auth_and_oauth.registration_url_invalid": "Liên kết đăng ký này không hợp lệ hoặc đã hết hạn.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "Tài khoản này đã được liên kết với một danh tính SSO khác.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Nhà cung cấp SSO của bạn chưa xác minh địa chỉ email của bạn.",
"auth_and_oauth.sso_identity_linked_to_another_account": "Danh tính SSO này đã được liên kết với một tài khoản khác.",
"auth_and_oauth.sso_identity_mismatch": "Thông tin nhận dạng SSO không khớp giữa id_token và userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO bị cấu hình sai. Vui lòng liên hệ quản trị viên.",
"auth_and_oauth.sso_provider_did_not_return_email": "Nhà cung cấp SSO của bạn không trả về địa chỉ email.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {Phiên bản này yêu cầu đăng nhập một lần, nên nhà cung cấp SSO của bạn quản lý email và mật khẩu của bạn.} no_account {Phiên bản này chỉ cho phép tài khoản hiện có đăng nhập bằng SSO và bạn chưa có tài khoản. Hãy xin quyền truy cập từ quản trị viên của phiên bản này.} managed_username {Phiên bản này yêu cầu đăng nhập một lần, nên tên người dùng của bạn đến từ nhà cung cấp SSO của bạn.} other {Phiên bản này yêu cầu đăng nhập một lần. Hãy đăng nhập bằng nút SSO trên trang đăng nhập.}}",
"auth_and_oauth.sso_test_code_missing_email": "Mã kiểm tra SSO thiếu dữ liệu email.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "Chúng tôi không thể cấp phát mã phân biệt cho tài khoản SSO của bạn. Vui lòng thử lại.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Yêu cầu chế độ sudo.",
"auth_and_oauth.unknown_application": "Ứng dụng không xác định.",
"auth_and_oauth.unknown_origin_handoff": "Lần chuyển đăng nhập này đã hết hạn hoặc đã được sử dụng.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "Không nhận dạng được flag người dùng đã chỉ định.",
"urls.invalid_url_format": "Định dạng URL không hợp lệ.",
"urls.invalid_url_or_attachment_reference": "Định dạng URL hoặc tham chiếu tệp đính kèm không hợp lệ.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL phải có độ dài từ {min} đến {max} ký tự.",
"urls.url_must_use_https": "URL phải bắt đầu bằng https://.",
"urls.url_not_publicly_routable": "URL phải phân giải thành một địa chỉ IP công khai truy cập được từ internet.",
diff --git a/packages/errors/src/i18n/weblate/locales/zh-CN.json b/packages/errors/src/i18n/weblate/locales/zh-CN.json
index 248583aaa..97155a6d2 100644
--- a/packages/errors/src/i18n/weblate/locales/zh-CN.json
+++ b/packages/errors/src/i18n/weblate/locales/zh-CN.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "此注册正在等待管理员批准。",
"auth_and_oauth.registration_rejected": "此注册请求已被拒绝。",
"auth_and_oauth.registration_url_invalid": "此注册链接无效或已过期。",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "此账号已关联到其他 SSO 身份。",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "你的 SSO 提供商尚未验证你的邮箱地址。",
"auth_and_oauth.sso_identity_linked_to_another_account": "此 SSO 身份已关联到其他账号。",
"auth_and_oauth.sso_identity_mismatch": "id_token 与 userinfo 之间的 SSO 身份不匹配。",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO 配置错误。请联系你的管理员。",
"auth_and_oauth.sso_provider_did_not_return_email": "你的 SSO 提供商未返回邮箱地址。",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {此实例要求使用单点登录,因此你的邮箱和密码由你的 SSO 提供商管理。} no_account {此实例只允许已有帐户通过 SSO 登录,而你还没有帐户。请向此实例的管理员申请访问权限。} managed_username {此实例要求使用单点登录,因此你的用户名来自你的 SSO 提供商。} other {此实例要求使用单点登录。请使用登录页面上的 SSO 按钮登录。}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO 测试码缺少邮箱负载。",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "无法为你的 SSO 账号分配识别码。请重试。",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "需要 Sudo 模式。",
"auth_and_oauth.unknown_application": "未知应用。",
"auth_and_oauth.unknown_origin_handoff": "此登录转移已过期或已被使用。",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "无法识别指定的用户标记。",
"urls.invalid_url_format": "URL 格式无效。",
"urls.invalid_url_or_attachment_reference": "URL 格式或附件引用无效。",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL 长度必须在 {min} 到 {max} 个字符之间。",
"urls.url_must_use_https": "URL 必须以 https:// 开头。",
"urls.url_not_publicly_routable": "URL 必须解析为可公网路由的地址。",
diff --git a/packages/errors/src/i18n/weblate/locales/zh-TW.json b/packages/errors/src/i18n/weblate/locales/zh-TW.json
index 97da0a99d..5561514d8 100644
--- a/packages/errors/src/i18n/weblate/locales/zh-TW.json
+++ b/packages/errors/src/i18n/weblate/locales/zh-TW.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "此註冊正在等待管理員核准。",
"auth_and_oauth.registration_rejected": "此註冊要求已被拒絕。",
"auth_and_oauth.registration_url_invalid": "此註冊連結無效或已過期。",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "此帳號已連結至其他 SSO 身分。",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "你的 SSO 提供者尚未驗證你的電子郵件地址。",
"auth_and_oauth.sso_identity_linked_to_another_account": "此 SSO 身分已連結至其他帳號。",
"auth_and_oauth.sso_identity_mismatch": "id_token 與 userinfo 之間的 SSO 身分不一致。",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO 設定錯誤。請聯絡你的管理員。",
"auth_and_oauth.sso_provider_did_not_return_email": "你的 SSO 提供者未傳回電子郵件地址。",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {此執行個體要求使用單一登入,因此你的電子郵件和密碼由你的 SSO 提供者管理。} no_account {此執行個體只允許現有帳號透過 SSO 登入,而你還沒有帳號。請向此執行個體的管理員申請存取權限。} managed_username {此執行個體要求使用單一登入,因此你的使用者名稱來自你的 SSO 提供者。} other {此執行個體要求使用單一登入。請使用登入頁面上的 SSO 按鈕登入。}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO 測試碼缺少電子郵件酬載。",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "無法為你的 SSO 帳號分配識別碼。請再試一次。",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "需要 Sudo 模式。",
"auth_and_oauth.unknown_application": "不明應用程式。",
"auth_and_oauth.unknown_origin_handoff": "此登入轉移已過期或已被使用。",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "無法辨識指定的使用者標誌。",
"urls.invalid_url_format": "無效的 URL 格式。",
"urls.invalid_url_or_attachment_reference": "無效的 URL 格式或附件參照。",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL 必須介於 {min} 到 {max} 個字元之間。",
"urls.url_must_use_https": "URL 必須以 https:// 開頭。",
"urls.url_not_publicly_routable": "URL 必須解析到可從網際網路存取的公開 IP 位址。",
diff --git a/packages/errors/src/i18n/weblate/messages.json b/packages/errors/src/i18n/weblate/messages.json
index 2bde7f95b..1d2a0f45c 100644
--- a/packages/errors/src/i18n/weblate/messages.json
+++ b/packages/errors/src/i18n/weblate/messages.json
@@ -149,15 +149,21 @@
"auth_and_oauth.registration_pending_approval": "This registration is waiting for admin approval.",
"auth_and_oauth.registration_rejected": "This registration request was rejected.",
"auth_and_oauth.registration_url_invalid": "This registration link is invalid or has expired.",
+ "auth_and_oauth.sso_account_link_requires_sign_in": "An account with this email already exists. Sign in to it another way, then connect single sign-on from your account settings in the web app. If you can't, ask an admin of this instance.",
"auth_and_oauth.sso_account_linked_to_another_identity": "This account is already linked to a different SSO identity.",
+ "auth_and_oauth.sso_discovery_failed": "Couldn't connect to the sign-in provider at its issuer URL. Check the issuer URL, or wait until the provider is back before you turn on Require SSO.",
"auth_and_oauth.sso_email_not_verified": "Your SSO provider has not verified your email address.",
"auth_and_oauth.sso_identity_linked_to_another_account": "This SSO identity is already linked to a different account.",
"auth_and_oauth.sso_identity_mismatch": "SSO identity mismatch between id_token and userinfo.",
+ "auth_and_oauth.sso_issuer_change_has_identities": "{count, plural, =1 {# account is} other {# accounts are}} linked to the old issuer. Choose whether to move those links to the new issuer or leave them behind.",
+ "auth_and_oauth.sso_issuer_required": "Enter the issuer URL of your sign-in provider. SSO needs it to check who signed in.",
"auth_and_oauth.sso_misconfigured": "SSO is misconfigured. Please contact your administrator.",
"auth_and_oauth.sso_provider_did_not_return_email": "Your SSO provider didn't return an email address.",
+ "auth_and_oauth.sso_provider_unavailable": "Your sign-in provider didn't answer. Try again in a moment.",
"auth_and_oauth.sso_required": "{reason, select, managed_credentials {This instance requires single sign-on, so your SSO provider manages your email and password.} no_account {This instance only lets existing accounts sign in with SSO, and there's no account for you yet. Ask an admin of this instance for access.} managed_username {This instance requires single sign-on, so your username comes from your SSO provider.} other {This instance requires single sign-on. Sign in with the SSO button on the sign-in page.}}",
"auth_and_oauth.sso_test_code_missing_email": "SSO test code is missing the email payload.",
"auth_and_oauth.sso_unable_to_allocate_discriminator": "We couldn't allocate a discriminator for your SSO account. Please try again.",
+ "auth_and_oauth.sso_user_info_signed_response_unsupported": "Your sign-in provider sent your profile in a signed format that Fluxer can't use. Ask an admin of this instance to turn off signed userinfo responses at the provider.",
"auth_and_oauth.sudo_mode_required": "Sudo mode is required.",
"auth_and_oauth.unknown_application": "Unknown application.",
"auth_and_oauth.unknown_origin_handoff": "This sign-in transfer has expired or was already used.",
@@ -570,6 +576,7 @@
"unknown_entities.unknown_user_flag": "The specified user flag isn't recognized.",
"urls.invalid_url_format": "Invalid URL format.",
"urls.invalid_url_or_attachment_reference": "Invalid URL format or attachment reference.",
+ "urls.url_hostname_not_resolvable": "Fluxer couldn't look up the hostname in this URL. Check it's spelled right and resolves from the Fluxer server.",
"urls.url_length_invalid": "URL must be between {min} and {max} characters.",
"urls.url_must_use_https": "URL must start with https://.",
"urls.url_not_publicly_routable": "URL must resolve to a publicly routable address.",
diff --git a/packages/schema/src/domains/admin/AdminSchemas.ts b/packages/schema/src/domains/admin/AdminSchemas.ts
index 23c476e70..a9fa4ade9 100644
--- a/packages/schema/src/domains/admin/AdminSchemas.ts
+++ b/packages/schema/src/domains/admin/AdminSchemas.ts
@@ -833,6 +833,9 @@ export const InstanceConfigResponse = z.object({
media: InstanceMediaResponse,
billing: InstanceBillingResponse,
notice: InstanceNoticeSchema.nullable().describe('Notice shown to everyone on the instance, or null'),
+ warnings: z
+ .array(z.string())
+ .describe('Problems the save found that did not stop it. Always empty outside a save response'),
});
export type InstanceConfigResponse = z.infer<typeof InstanceConfigResponse>;
@@ -918,6 +921,12 @@ export const InstanceConfigUpdateRequest = z.object({
),
groups_claim: SsoGroupsClaimSchema.nullish(),
group_role_mappings: SsoGroupRoleMappingsSchema.optional(),
+ migrate_identities: z
+ .boolean()
+ .optional()
+ .describe(
+ 'Only for a save that changes the issuer while accounts are linked to the old one. True moves those links to the new issuer, false leaves them on the old one. Applies to this save only and is never stored',
+ ),
})
.nullish(),
app_public: AppPublicConfigUpdateRequest.nullish(),
diff --git a/packages/schema/src/domains/auth/AuthSchemas.ts b/packages/schema/src/domains/auth/AuthSchemas.ts
index 535921371..491f8e48a 100644
--- a/packages/schema/src/domains/auth/AuthSchemas.ts
+++ b/packages/schema/src/domains/auth/AuthSchemas.ts
@@ -194,6 +194,9 @@ export const SsoStartResponse = z.object({
authorization_url: z.string().describe('URL to redirect user to for SSO authentication'),
state: z.string().describe('State parameter for CSRF protection'),
redirect_uri: z.string().describe('OAuth redirect URI used for the SSO provider callback'),
+ client_binding: z
+ .string()
+ .describe('Secret the client keeps and sends back with the code and state to complete this sign-in'),
});
export type SsoStartResponse = z.infer<typeof SsoStartResponse>;
@@ -239,6 +242,11 @@ const SsoRedirectField = {
export const SsoCompleteResponse = z.union([
AuthTokenWithUserIdResponse.extend(SsoRedirectField),
AuthMfaRequiredResponse.extend(SsoRedirectField),
+ z
+ .object({
+ linked: z.literal(true).describe('The SSO identity is now connected to the account that started the link'),
+ })
+ .extend(SsoRedirectField),
]);
export type SsoCompleteResponse = z.infer<typeof SsoCompleteResponse>;
@@ -390,6 +398,9 @@ export type SsoStartRequest = z.infer<typeof SsoStartRequest>;
export const SsoCompleteRequest = z.object({
code: createStringType(1, 4096).describe('Authorization code from the SSO provider'),
state: createStringType(1, 4096).describe('State parameter for CSRF protection'),
+ client_binding: createStringType(1, 128)
+ .nullish()
+ .describe('The client_binding returned by SSO start. Required except for the mobile app callback'),
});
export type SsoCompleteRequest = z.infer<typeof SsoCompleteRequest>;
diff --git a/tools/dev/cassandra_target_schema.json b/tools/dev/cassandra_target_schema.json
index 36528d31b..2ee246ad4 100644
--- a/tools/dev/cassandra_target_schema.json
+++ b/tools/dev/cassandra_target_schema.json
@@ -1448,6 +1448,10 @@
"name": "app_beta_number",
"type": "int"
},
+ {
+ "name": "auth_method",
+ "type": "text"
+ },
{
"name": "version",
"type": "int"
diff --git a/tools/f5b.py b/tools/f5b.py
new file mode 100644
index 000000000..4225373c8
--- /dev/null
+++ b/tools/f5b.py
@@ -0,0 +1 @@
+REPL=[("if (isLinkedToSsoProvider(user, config.providerId) && !user.traits.has(ssoIdentityTrait(config.providerId, sub))) {","if (isLinkedToSsoProvider(user, config.providerId) === isLinkedToSsoProvider(user, config.providerId) && Array.from(user.traits).some((trait) => trait.startsWith('sso_identity:')) && !user.traits.has(ssoIdentityTrait(config.providerId, sub))) {")]