Skip to content

Commit 3bc407c

Browse files
committed
feat: remove sso if disabled on Unraid-API start
1 parent 6513fc4 commit 3bc407c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

api/src/index.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { WebSocket } from 'ws';
1515
import { logger } from '@app/core/log';
1616
import { setupLogRotation } from '@app/core/logrotate/setup-logrotate';
1717
import { setupAuthRequest } from '@app/core/sso/auth-request-setup';
18+
import { removeSso } from '@app/core/sso/sso-remove';
1819
import { setupSso } from '@app/core/sso/sso-setup';
1920
import { fileExistsSync } from '@app/core/utils/files/file-exists';
2021
import { environment, PORT } from '@app/environment';
@@ -100,15 +101,18 @@ try {
100101
startMiddlewareListeners();
101102

102103
// If the config contains SSO IDs, enable SSO
103-
if (store.getState().config.remote.ssoSubIds) {
104-
try {
104+
try {
105+
if (store.getState().config.remote.ssoSubIds) {
105106
await setupAuthRequest();
106107
await setupSso();
107-
} catch (err) {
108-
logger.error(err, 'Failed to setup SSO');
108+
logger.info('SSO setup complete');
109+
} else {
110+
await removeSso();
111+
logger.info('SSO removed');
109112
}
113+
} catch (err) {
114+
logger.error('Failed to setup SSO with error: %o', err);
110115
}
111-
112116
// On process exit stop HTTP server
113117
exitHook((signal) => {
114118
console.log('exithook', signal);

web/components/DownloadApiLogs.ce.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
import { ArrowDownTrayIcon, ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/solid';
33
import { BrandButton } from '@unraid/ui';
44
import { CONNECT_FORUMS, CONTACT, DISCORD, WEBGUI_GRAPHQL } from '~/helpers/urls';
5-
import { useServerStore } from '~/store/server';
6-
import { storeToRefs } from 'pinia';
75
import { useI18n } from 'vue-i18n';
86
97
const { t } = useI18n();

0 commit comments

Comments
 (0)