bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly normalize singleUserModeProfile if it has an @

Browse source
This commit is contained in:
Alex Gleason 2023-01-13 18:54:25 -06:00
parent d64f4edf61
commit 29bf78d09b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts
View file

@ -37,6 +37,7 @@ describe('normalizeSoapboxConfig()', () => {
it('upgrades singleUserModeProfile to redirectRootNoLogin', () => { it('upgrades singleUserModeProfile to redirectRootNoLogin', () => {
expect(normalizeSoapboxConfig({ singleUserMode: true, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe('/@alex'); expect(normalizeSoapboxConfig({ singleUserMode: true, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe('/@alex');
expect(normalizeSoapboxConfig({ singleUserMode: true, singleUserModeProfile: '@alex' }).redirectRootNoLogin).toBe('/@alex');
expect(normalizeSoapboxConfig({ singleUserMode: false, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe(''); expect(normalizeSoapboxConfig({ singleUserMode: false, singleUserModeProfile: 'alex' }).redirectRootNoLogin).toBe('');
}); });

8
app/soapbox/normalizers/soapbox/soapbox-config.ts
View file

@ -198,13 +198,13 @@ const normalizeAdsAlgorithm = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMa
/** Single user mode is now managed by `redirectRootNoLogin`. */ /** Single user mode is now managed by `redirectRootNoLogin`. */
const upgradeSingleUserMode = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => { const upgradeSingleUserMode = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
const singleUserMode = soapboxConfig.get('singleUserMode'); const singleUserMode = soapboxConfig.get('singleUserMode') as boolean | undefined;
const singleUserModeProfile = soapboxConfig.get('singleUserModeProfile'); const singleUserModeProfile = soapboxConfig.get('singleUserModeProfile') as string | undefined;
const redirectRootNoLogin = soapboxConfig.get('redirectRootNoLogin'); const redirectRootNoLogin = soapboxConfig.get('redirectRootNoLogin') as string | undefined;
if (!redirectRootNoLogin && singleUserMode && singleUserModeProfile) { if (!redirectRootNoLogin && singleUserMode && singleUserModeProfile) {
return soapboxConfig return soapboxConfig
.set('redirectRootNoLogin', `/@${singleUserModeProfile}`) .set('redirectRootNoLogin', `/@${singleUserModeProfile.replaceAll('@', '')}`)
.deleteAll(['singleUserMode', 'singleUserModeProfile']); .deleteAll(['singleUserMode', 'singleUserModeProfile']);
} else { } else {
return soapboxConfig return soapboxConfig