matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl-fe: remove support for custom apps

Browse Source 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
This commit is contained in:
nicole mikołajczyk
2025-06-20 19:48:58 +02:00
parent 9be3c781c8
commit ff215c5a25
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/pl-fe/src/actions/auth.ts
View File

@ -23,7 +23,6 @@ import { fetchMeSuccess, fetchMeFail } from 'pl-fe/actions/me';
import { obtainOAuthToken, revokeOAuthToken } from 'pl-fe/actions/oauth';
import { startOnboarding } from 'pl-fe/actions/onboarding';
import * as BuildConfig from 'pl-fe/build-config';
import { custom } from 'pl-fe/custom';
import { queryClient } from 'pl-fe/queries/client';
import { selectAccount } from 'pl-fe/selectors';
import { unsetSentryAccount } from 'pl-fe/sentry';
@ -55,8 +54,6 @@ const VERIFY_CREDENTIALS_FAIL = 'VERIFY_CREDENTIALS_FAIL' as const;
const AUTH_ACCOUNT_REMEMBER_SUCCESS = 'AUTH_ACCOUNT_REMEMBER_SUCCESS' as const;
const customApp = custom('app');
const messages = defineMessages({
loggedOut: { id: 'auth.logged_out', defaultMessage: 'Logged out.' },
awaitingApproval: { id: 'auth.awaiting_approval', defaultMessage: 'Your account is awaiting approval' },
@ -67,7 +64,7 @@ const noOp = () => new Promise(f => f(undefined));
const createAppAndToken = () =>
(dispatch: AppDispatch) =>
dispatch(getAuthApp()).then(() =>
dispatch(createAuthApp()).then(() =>
dispatch(createAppToken()),
);
@ -76,16 +73,6 @@ interface AuthAppCreatedAction {
app: CredentialApplication;
}
/** Create an auth app, or use it from build config */
const getAuthApp = () =>
(dispatch: AppDispatch) => {
if (customApp?.client_secret) {
return noOp().then(() => dispatch<AuthAppCreatedAction>({ type: AUTH_APP_CREATED, app: customApp }));
} else {
return dispatch(createAuthApp());
}
};
const createAuthApp = () =>
(dispatch: AppDispatch, getState: () => RootState) => {
const params = {
@ -227,7 +214,7 @@ const loadCredentials = (token: string, accountUrl: string) =>
.finally(() => dispatch(verifyCredentials(token, accountUrl)));
const logIn = (username: string, password: string) =>
(dispatch: AppDispatch) => dispatch(getAuthApp()).then(() =>
(dispatch: AppDispatch) => dispatch(createAuthApp()).then(() =>
dispatch(createUserToken(normalizeUsername(username), password)),
).catch((error: { response: PlfeResponse }) => {
if ((error.response?.json as any)?.error === 'mfa_required') {

16
packages/pl-fe/src/custom.ts
View File

@ -1,16 +0,0 @@
/**
* Functions for dealing with custom build configuration.
*/
import * as BuildConfig from 'pl-fe/build-config';
/** Require a custom JSON file if it exists */
const custom = (filename: string, fallback: any = {}): any => {
if (BuildConfig.NODE_ENV === 'test') return fallback;
const modules = import.meta.glob('../custom/*.json', { eager: true });
const key = `../../custom/${filename}.json`;
return modules[key] ? modules[key] : fallback;
};
export { custom };