diff options
Diffstat (limited to 'web/source/settings/components/authorization')
-rw-r--r-- | web/source/settings/components/authorization/index.tsx | 7 | ||||
-rw-r--r-- | web/source/settings/components/authorization/login.tsx | 15 |
2 files changed, 9 insertions, 13 deletions
diff --git a/web/source/settings/components/authorization/index.tsx b/web/source/settings/components/authorization/index.tsx index 321bb03eb..22a0d24b7 100644 --- a/web/source/settings/components/authorization/index.tsx +++ b/web/source/settings/components/authorization/index.tsx @@ -25,6 +25,7 @@ import React from "react"; import Login from "./login"; import Loading from "../loading"; import { Error } from "../error"; +import { NoArg } from "../../lib/types/query"; export function Authorization({ App }) { const { loginState, expectingRedirect } = store.getState().oauth; @@ -35,15 +36,15 @@ export function Authorization({ App }) { isSuccess, data: account, error, - } = useVerifyCredentialsQuery(null, { skip: skip }); + } = useVerifyCredentialsQuery(NoArg, { skip: skip }); let showLogin = true; - let content = null; + let content: React.JSX.Element | null = null; if (isLoading) { showLogin = false; - let loadingInfo; + let loadingInfo = ""; if (loginState == "callback") { loadingInfo = "Processing OAUTH callback."; } else if (loginState == "login") { diff --git a/web/source/settings/components/authorization/login.tsx b/web/source/settings/components/authorization/login.tsx index 76bfccf43..870e9c343 100644 --- a/web/source/settings/components/authorization/login.tsx +++ b/web/source/settings/components/authorization/login.tsx @@ -22,26 +22,21 @@ import React from "react"; import { useAuthorizeFlowMutation } from "../../lib/query/oauth"; import { useTextInput, useValue } from "../../lib/form"; import useFormSubmit from "../../lib/form/submit"; -import { TextInput } from "../form/inputs"; import MutationButton from "../form/mutation-button"; import Loading from "../loading"; +import { TextInput } from "../form/inputs"; export default function Login({ }) { const form = { instance: useTextInput("instance", { defaultValue: window.location.origin }), - scopes: useValue("scopes", "user admin") + scopes: useValue("scopes", "user admin"), }; - const [formSubmit, result] = useFormSubmit( - form, - useAuthorizeFlowMutation(), - { - changedOnly: false, - onFinish: undefined, - } - ); + const [formSubmit, result] = useFormSubmit(form, useAuthorizeFlowMutation(), { + changedOnly: false, + }); if (result.isLoading) { return ( |