diff options
Diffstat (limited to 'web/source')
| -rw-r--r-- | web/source/settings/lib/query/login/index.ts | 17 | ||||
| -rw-r--r-- | web/source/settings/lib/query/user/applications.ts | 5 |
2 files changed, 15 insertions, 7 deletions
diff --git a/web/source/settings/lib/query/login/index.ts b/web/source/settings/lib/query/login/index.ts index dc85e9efd..1f56a51c5 100644 --- a/web/source/settings/lib/query/login/index.ts +++ b/web/source/settings/lib/query/login/index.ts @@ -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); diff --git a/web/source/settings/lib/query/user/applications.ts b/web/source/settings/lib/query/user/applications.ts index 9d271a1e1..38856ccba 100644 --- a/web/source/settings/lib/query/user/applications.ts +++ b/web/source/settings/lib/query/user/applications.ts @@ -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. |