From 9c0a3049260d1579572a1d483a3f2752c40c3618 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 16 Mar 2022 22:44:30 -0500 Subject: [PATCH] External auth: normalize instance --- app/soapbox/actions/external_auth.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/soapbox/actions/external_auth.js b/app/soapbox/actions/external_auth.js index f4058cba2..8bf0bba3f 100644 --- a/app/soapbox/actions/external_auth.js +++ b/app/soapbox/actions/external_auth.js @@ -6,11 +6,10 @@ * @see module:soapbox/actions/oauth */ -import { Map as ImmutableMap, fromJS } from 'immutable'; - import { createApp } from 'soapbox/actions/apps'; import { authLoggedIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth'; import { obtainOAuthToken } from 'soapbox/actions/oauth'; +import { normalizeInstance } from 'soapbox/normalizers'; import { parseBaseURL } from 'soapbox/utils/auth'; import sourceCode from 'soapbox/utils/code'; import { getWalletAndSign } from 'soapbox/utils/ethereum'; @@ -22,12 +21,12 @@ import { baseClient } from '../api'; const fetchExternalInstance = baseURL => { return baseClient(null, baseURL) .get('/api/v1/instance') - .then(({ data: instance }) => fromJS(instance)) + .then(({ data: instance }) => normalizeInstance(instance)) .catch(error => { if (error.response?.status === 401) { // Authenticated fetch is enabled. // Continue with a limited featureset. - return ImmutableMap({ version: '0.0.0' }); + return normalizeInstance({}); } else { throw error; }