diff --git a/dashboard/src/components/PostInstallDialog.vue b/dashboard/src/components/PostInstallDialog.vue index 1e0e1034c..c8fb4beb6 100644 --- a/dashboard/src/components/PostInstallDialog.vue +++ b/dashboard/src/components/PostInstallDialog.vue @@ -3,6 +3,7 @@ import { ref, useTemplateRef } from 'vue'; import { marked } from 'marked'; import { Dialog } from '@cloudron/pankow'; +import { stripSsoInfo } from '../utils.js'; const dialog = useTemplateRef('dialog'); const app = ref(null); @@ -45,7 +46,7 @@ defineExpose({ -
+
diff --git a/dashboard/src/components/app/Info.vue b/dashboard/src/components/app/Info.vue index e5ec3d0a3..7f3f6dba1 100644 --- a/dashboard/src/components/app/Info.vue +++ b/dashboard/src/components/app/Info.vue @@ -3,6 +3,7 @@ import { onMounted, ref, useTemplateRef, inject } from 'vue'; import { Button } from '@cloudron/pankow'; import { prettyDate } from '@cloudron/pankow/utils'; +import { stripSsoInfo } from '../../utils.js'; import { marked } from 'marked'; import AppsModel from '../../models/AppsModel.js'; @@ -66,6 +67,7 @@ function onDismiss() { onMounted(() => { hasOldChecklist.value = !!Object.keys(props.app.checklist).find((k) => { return props.app.checklist[k].acknowledged; }); noteContent.value = props.app.notes === null ? props.app.manifest.postInstallMessage : props.app.notes; + editing.value = false; busy.value = false; }); @@ -131,7 +133,7 @@ onMounted(() => {
-
+
{{ placeholder }}
diff --git a/dashboard/src/utils.js b/dashboard/src/utils.js index 2f3ba0998..6f787b1f7 100644 --- a/dashboard/src/utils.js +++ b/dashboard/src/utils.js @@ -577,6 +577,12 @@ function redirectIfNeeded(status, currentView) { return false; } +// strip potential sso tags in postinstall notes +function stripSsoInfo(notes, sso) { + if (sso) return notes.replace(/.*?<\/nosso>/gs, '').replace(//gs, '').replace(/<\/sso>/gs, ''); + return notes.replace(/.*?<\/sso>/gs, '').replace(//gs, '').replace(/<\/nosso>/gs, ''); +} + // named exports export { download, @@ -586,6 +592,7 @@ export { eventlogSource, taskNameFromInstallationState, redirectIfNeeded, + stripSsoInfo, }; // default export @@ -597,4 +604,5 @@ export default { eventlogSource, taskNameFromInstallationState, redirectIfNeeded, + stripSsoInfo, };