diff options
| author | 2023-10-17 12:46:06 +0200 | |
|---|---|---|
| committer | 2023-10-17 12:46:06 +0200 | |
| commit | 637f188ebec71fe4b0b80bbab4592d4c269d7d93 (patch) | |
| tree | 6e1136dee4d854af021e0a571a67038d32083e4b /web/source/settings/components/authorization | |
| parent | [chore]: Bump github.com/microcosm-cc/bluemonday from 1.0.25 to 1.0.26 (#2266) (diff) | |
| download | gotosocial-637f188ebec71fe4b0b80bbab4592d4c269d7d93.tar.xz | |
[feature] Allow import/export/creation of domain allows via admin panel (#2264)v0.12.0-rc1
* it's happening!
* aaa
* fix silly whoopsie
* it's working pa! it's working ma!
* model report parameters
* shuffle some more stuff around
* getting there
* oo hoo
* finish tidying up for now
* aaa
* fix use form submit errors
* peepee poo poo
* aaaaa
* ffff
* they see me typin', they hatin'
* boop
* aaa
* oooo
* typing typing tappa tappa
* almost done typing
* weee
* alright
* push it push it real good doo doo doo doo doo doo
* thingy no worky
* almost done
* mutation modifers not quite right
* hmm
* it works
* view blocks + allows nicely
* it works!
* typia install
* the old linterino
* linter plz
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 ( | 
