From ce3b8aacf73b841887f3eec631851d086a7578f1 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 7 Jun 2024 16:21:57 +0200
Subject: [chore] Warn about email/password change when using OIDC (#2975)
* [chore] Warn about email/password change when using OIDC
* go fmt
---
web/source/settings/lib/types/instance.ts | 1 +
web/source/settings/views/user/settings.tsx | 72 ++++++++++++++++++++++++++---
2 files changed, 66 insertions(+), 7 deletions(-)
(limited to 'web/source')
diff --git a/web/source/settings/lib/types/instance.ts b/web/source/settings/lib/types/instance.ts
index 4c6f5061b..11f75032c 100644
--- a/web/source/settings/lib/types/instance.ts
+++ b/web/source/settings/lib/types/instance.ts
@@ -49,6 +49,7 @@ export interface InstanceConfiguration {
polls: InstancePolls;
accounts: InstanceAccounts;
emojis: InstanceEmojis;
+ oidc_enabled?: boolean;
}
export interface InstanceAccounts {
diff --git a/web/source/settings/views/user/settings.tsx b/web/source/settings/views/user/settings.tsx
index a27cc1ba3..5696144a0 100644
--- a/web/source/settings/views/user/settings.tsx
+++ b/web/source/settings/views/user/settings.tsx
@@ -28,6 +28,7 @@ import { useVerifyCredentialsQuery } from "../../lib/query/oauth";
import { useEmailChangeMutation, usePasswordChangeMutation, useUpdateCredentialsMutation, useUserQuery } from "../../lib/query/user";
import Loading from "../../components/loading";
import { User } from "../../lib/types/user";
+import { useInstanceV1Query } from "../../lib/query/gts-api";
export default function UserSettings() {
return (
@@ -106,6 +107,24 @@ function UserSettingsForm({ data }) {
}
function PasswordChange() {
+ // Load instance data.
+ const {
+ data: instance,
+ isFetching: isFetchingInstance,
+ isLoading: isLoadingInstance
+ } = useInstanceV1Query();
+ if (isFetchingInstance || isLoadingInstance) {
+ return