SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[bugfix] Fix '+'-separated scopes not being recognized (#4028)

Browse Source 
* [bugfix] Fix '+'-separated scopes not being recognized

* comment
This commit is contained in:
tobi
2025-04-19 21:57:50 +02:00
committed by GitHub
parent d308fd0d0a
commit e9f6d186dc
6 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/source/settings/lib/query/login/index.ts
View File

@ -28,6 +28,7 @@ import {
import { RootState } from '../../../redux/store';
import { Account } from '../../types/account';
import { OAuthAccessTokenRequestBody } from '../../types/oauth';
import { App } from '../../types/application';
function getSettingsURL() {
/*
@ -129,7 +130,7 @@ const extended = gtsApi.injectEndpoints({
}
}),
authorizeFlow: build.mutation({
authorizeFlow: build.mutation<any, { instance: string, scopes: string }>({
async queryFn(formData, api, _extraOpts, fetchWithBQ) {
const state = api.getState() as RootState;
const loginState = state.login;
@ -159,22 +160,26 @@ const extended = gtsApi.injectEndpoints({
return { error: appResult.error as FetchBaseQueryError };
}
const app = appResult.data as any;
app.scopes = formData.scopes;
const app = appResult.data as App;
api.dispatch(oauthAuthorize({
instanceUrl: instanceUrl,
app: app,
app: {
client_id: app.client_id,
client_secret: app.client_secret,
},
current: "awaitingcallback",
expectingRedirect: true
}));
// Parse instance URL + set params on it.
//
// Note that scopes are '+'-separated to fit the API.
const url = new URL(instanceUrl);
url.pathname = "/oauth/authorize";
url.searchParams.set("client_id", app.client_id);
url.searchParams.set("redirect_uri", SETTINGS_URL);
url.searchParams.set("response_type", "code");
url.searchParams.set("scope", app.scopes);
url.searchParams.set("scope", app.scopes.join("+"));
const redirectURL = url.toString();
window.location.assign(redirectURL);

5
web/source/settings/lib/query/user/applications.ts
View File

@ -107,12 +107,15 @@ const extended = gtsApi.injectEndpoints({
const instanceUrl = state.login.instanceUrl;
// Parse instance URL + set params on it.
//
// Note that any space-separated scopes are
// replaced by '+'-separated, to fit the API.
const url = new URL(instanceUrl);
url.pathname = "/oauth/authorize";
url.searchParams.set("client_id", app.client_id);
url.searchParams.set("redirect_uri", redirectURI);
url.searchParams.set("response_type", "code");
url.searchParams.set("scope", scope);
url.searchParams.set("scope", scope.replace(" ", "+"));
// Set the app ID in state so we know which
// app to get out of our store after redirect.