From 2d9e2e81ae729f081d1fe7c266d0200c0ecdc351 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 16 Jun 2023 13:05:00 +0200
Subject: [PATCH 01/10] Load common theme into store

---
 packages/web-runtime/src/container/bootstrap.ts |  6 +++---
 packages/web-runtime/src/helpers/theme.ts       |  4 ++--
 packages/web-runtime/src/pages/accessDenied.vue |  2 +-
 packages/web-runtime/src/store/config.ts        | 11 ++++++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index fffc60f5879..e5ca501e831 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -217,13 +217,13 @@ export const announceTheme = async ({
   designSystem: any
   runtimeConfiguration?: RuntimeConfiguration
 }): Promise<void> => {
-  const { theme } = await loadTheme(runtimeConfiguration?.theme)
-  await store.dispatch('loadThemes', { theme })
+  const { web, common } = await loadTheme(runtimeConfiguration?.theme)
+  await store.dispatch('loadThemes', { theme: web, common })
   const currentThemeName = useLocalStorage('oc_currentThemeName', null) // note: use null as default so that we can fall back to system preferences
   if (unref(currentThemeName) === null) {
     currentThemeName.value = useDefaultThemeName()
   }
-  await store.dispatch('loadTheme', { theme: theme[unref(currentThemeName)] || theme.default })
+  await store.dispatch('loadTheme', { theme: web[unref(currentThemeName)] || web.default })
 
   app.use(designSystem, {
     tokens: store.getters.theme.designTokens
diff --git a/packages/web-runtime/src/helpers/theme.ts b/packages/web-runtime/src/helpers/theme.ts
index 7ff062c2fb3..1595b98fd35 100644
--- a/packages/web-runtime/src/helpers/theme.ts
+++ b/packages/web-runtime/src/helpers/theme.ts
@@ -3,7 +3,7 @@ import defaultTheme from '../../themes/owncloud/theme.json'
 import { v4 as uuidV4 } from 'uuid'
 
 export const loadTheme = async (location = '') => {
-  const defaults = { theme: defaultTheme.web || defaultTheme }
+  const defaults = { web: defaultTheme.web || defaultTheme, common: defaultTheme.common || {} }
 
   if (location.split('.').pop() !== 'json') {
     if (isEqual(process.env.NODE_ENV, 'development')) {
@@ -18,7 +18,7 @@ export const loadTheme = async (location = '') => {
       return defaults
     }
     const theme = await response.json()
-    return { theme: theme.web || theme }
+    return { web: theme.web || theme, common: theme.common || {} }
   } catch (e) {
     console.error(
       `Failed to load theme '${location}' is not a valid json file, using default theme.`
diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index 00a843c7d38..d3461f72128 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -40,7 +40,7 @@ export default defineComponent({
       return store.getters.configuration.currentTheme.logo.login
     })
     const cardTitle = computed(() => {
-      return $gettext('Logged out')
+      return $gettext('Not logged in')
     })
     const cardHint = computed(() => {
       return $gettext('You were automatically logged out for security reasons.')
diff --git a/packages/web-runtime/src/store/config.ts b/packages/web-runtime/src/store/config.ts
index aece2d8efa7..4c57b01d481 100644
--- a/packages/web-runtime/src/store/config.ts
+++ b/packages/web-runtime/src/store/config.ts
@@ -15,6 +15,11 @@ const state = {
     authority: ''
   },
   themes: [],
+  commonTheme: {
+    name: '',
+    solgan: '',
+    logo: ''
+  },
   currentTheme: {
     general: {
       name: '',
@@ -81,8 +86,9 @@ const actions = {
   loadTheme(context, { theme }) {
     context.commit('LOAD_THEME', theme)
   },
-  loadThemes(context, { theme }) {
+  loadThemes(context, { theme, common }) {
     context.commit('LOAD_THEMES', theme)
+    context.commit('LOAD_COMMON', common)
   }
 }
 
@@ -106,6 +112,9 @@ const mutations = {
   },
   LOAD_THEMES(state, theme) {
     state.themes = theme
+  },
+  LOAD_COMMON(state, common) {
+    state.commonTheme = common
   }
 }
 

From 12fd39eeb46fd41e0d3e6e182dc8f067def46fd2 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 10:36:43 +0200
Subject: [PATCH 02/10] Implement url in access denied page

---
 .../web-runtime/src/pages/accessDenied.vue    | 20 +++++++++++++++++--
 packages/web-runtime/src/store/config.ts      |  6 ++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index d3461f72128..a56500c60b9 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -5,6 +5,14 @@
       <div class="oc-login-card-body oc-width-medium">
         <h2 class="oc-login-card-title" v-text="cardTitle" />
         <p v-text="cardHint" />
+        <oc-button
+          v-if="loggedOutHelpUrl"
+          type="a"
+          appearance="raw"
+          :href="loggedOutHelpUrl"
+          target="_blank"
+          ><span v-text="$gettext('More')"
+        /></oc-button>
       </div>
       <div class="oc-login-card-footer oc-pt-rm">
         <p>
@@ -39,11 +47,18 @@ export default defineComponent({
     const logoImg = computed(() => {
       return store.getters.configuration.currentTheme.logo.login
     })
+
+    const loggedOutHelpUrl = computed(() => {
+      store.getters.configuration.commonTheme.loggedOutHelpUrl ||
+        store.getters.configuration.options.loggedOutHelpUrl
+    })
     const cardTitle = computed(() => {
       return $gettext('Not logged in')
     })
     const cardHint = computed(() => {
-      return $gettext('You were automatically logged out for security reasons.')
+      return $gettext(
+        'This could be because of a routine safety log out, or because your account is either inactive or not yet authorized for use. Please try logging in after a while or seek help from your Administraton.'
+      )
     })
     const footerSlogan = computed(() => {
       return store.getters.configuration.currentTheme.general.slogan
@@ -57,7 +72,8 @@ export default defineComponent({
       cardTitle,
       cardHint,
       footerSlogan,
-      navigateToLoginText
+      navigateToLoginText,
+      loggedOutHelpUrl
     }
   }
 })
diff --git a/packages/web-runtime/src/store/config.ts b/packages/web-runtime/src/store/config.ts
index 4c57b01d481..000b53d9f47 100644
--- a/packages/web-runtime/src/store/config.ts
+++ b/packages/web-runtime/src/store/config.ts
@@ -18,7 +18,8 @@ const state = {
   commonTheme: {
     name: '',
     solgan: '',
-    logo: ''
+    logo: '',
+    loggedOutHelpUrl: ''
   },
   currentTheme: {
     general: {
@@ -63,7 +64,8 @@ const state = {
     runningOnEos: false,
     cernFeatures: false,
     sharingRecipientsPerPage: 200,
-    contextHelpersReadMore: true
+    contextHelpersReadMore: true,
+    loggedOutHelpUrl: ''
   }
 }
 

From 877cb902816434c73147a6bc36d2e05f20f972da Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 10:42:22 +0200
Subject: [PATCH 03/10] Fix add return

---
 packages/web-runtime/src/pages/accessDenied.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index a56500c60b9..8a3c4a8e8ad 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -49,8 +49,10 @@ export default defineComponent({
     })
 
     const loggedOutHelpUrl = computed(() => {
-      store.getters.configuration.commonTheme.loggedOutHelpUrl ||
+      return (
+        store.getters.configuration.commonTheme.loggedOutHelpUrl ||
         store.getters.configuration.options.loggedOutHelpUrl
+      )
     })
     const cardTitle = computed(() => {
       return $gettext('Not logged in')

From 8c9578aa7c15c21c06aeab8f360d82a70ae18be1 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 10:56:40 +0200
Subject: [PATCH 04/10] Add changelog

---
 .../enhancement-access-denied-page-change-message           | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-access-denied-page-change-message

diff --git a/changelog/unreleased/enhancement-access-denied-page-change-message b/changelog/unreleased/enhancement-access-denied-page-change-message
new file mode 100644
index 00000000000..ed7fda36c67
--- /dev/null
+++ b/changelog/unreleased/enhancement-access-denied-page-change-message
@@ -0,0 +1,6 @@
+Enhancement: Access denied page update message
+
+We've updated the access denied page message to be more specific and give the user a link to a help page.
+
+https://github.com/owncloud/web/pull/9263
+https://github.com/owncloud/web/issues/9051

From 4d2e775179cce346abfd3bc638b02769b03a39f9 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 11:19:10 +0200
Subject: [PATCH 05/10] Update/add unittests

---
 .../tests/unit/helpers/theme.spec.ts          | 29 +++++++++++--------
 .../web-runtime/themes/owncloud/theme.json    |  7 +++--
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/packages/web-runtime/tests/unit/helpers/theme.spec.ts b/packages/web-runtime/tests/unit/helpers/theme.spec.ts
index e7ee0667668..0022756602f 100644
--- a/packages/web-runtime/tests/unit/helpers/theme.spec.ts
+++ b/packages/web-runtime/tests/unit/helpers/theme.spec.ts
@@ -7,32 +7,37 @@ jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
 describe('theme loading and error reporting', () => {
   it('should load the default theme if location is empty', async () => {
-    const { theme } = await loadTheme()
-    expect(theme).toMatchObject(defaultTheme.web)
+    const { web, common } = await loadTheme()
+    expect(web).toMatchObject(defaultTheme.web)
+    expect(common).toMatchObject(defaultTheme.common)
   })
 
   it('should load the default theme if location is not a json file extension', async () => {
-    const { theme } = await loadTheme('some_location_without_json_file_ending.xml')
-    expect(theme).toMatchObject(defaultTheme.web)
+    const { web, common } = await loadTheme('some_location_without_json_file_ending.xml')
+    expect(web).toMatchObject(defaultTheme.web)
+    expect(common).toMatchObject(defaultTheme.common)
   })
 
   it('should load the default theme if location is not found', async () => {
     fetchMock.mockResponse(new Error() as any, { status: 404 })
-    const { theme } = await loadTheme('http://www.owncloud.com/unknown.json')
-    expect(theme).toMatchObject(defaultTheme.web)
+    const { web, common } = await loadTheme('http://www.owncloud.com/unknown.json')
+    expect(web).toMatchObject(defaultTheme.web)
+    expect(common).toMatchObject(defaultTheme.common)
   })
 
   it('should load the default theme if location is not a valid json file', async () => {
     const customTheme = merge({}, defaultTheme, { default: { logo: { login: 'custom.svg' } } })
     fetchMock.mockResponse(JSON.stringify(customTheme) + '-invalid')
-    const { theme } = await loadTheme('http://www.owncloud.com/invalid.json')
-    expect(theme).toMatchObject(defaultTheme.web)
+    const { web, common } = await loadTheme('http://www.owncloud.com/invalid.json')
+    expect(web).toMatchObject(defaultTheme.web)
+    expect(common).toMatchObject(defaultTheme.common)
   })
 
   it('should load the default theme if server errors', async () => {
     fetchMock.mockReject(new Error())
-    const { theme } = await loadTheme('http://www.owncloud.com')
-    expect(theme).toMatchObject(defaultTheme.web)
+    const { web, common } = await loadTheme('http://www.owncloud.com')
+    expect(web).toMatchObject(defaultTheme.web)
+    expect(common).toMatchObject(defaultTheme.common)
   })
 
   it('should load the custom theme if a custom location is given', async () => {
@@ -40,8 +45,8 @@ describe('theme loading and error reporting', () => {
 
     fetchMock.mockResponse(JSON.stringify(customTheme))
 
-    const { theme: theme1 } = await loadTheme('http://www.owncloud.com/custom.json')
-    const { theme: theme2 } = await loadTheme('/custom.json')
+    const { web: theme1 } = await loadTheme('http://www.owncloud.com/custom.json')
+    const { web: theme2 } = await loadTheme('/custom.json')
 
     expect(theme1).toMatchObject(customTheme)
     expect(theme2).toMatchObject(customTheme)
diff --git a/packages/web-runtime/themes/owncloud/theme.json b/packages/web-runtime/themes/owncloud/theme.json
index 4906ea4267f..9ccee46d93b 100644
--- a/packages/web-runtime/themes/owncloud/theme.json
+++ b/packages/web-runtime/themes/owncloud/theme.json
@@ -1,8 +1,9 @@
 {
   "common": {
-      "name": "ownCloud",
-      "slogan": "ownCloud – A safe home for all your data",
-      "logo": "themes/owncloud/assets/logo.svg"
+    "name": "ownCloud",
+    "slogan": "ownCloud – A safe home for all your data",
+    "logo": "themes/owncloud/assets/logo.svg",
+    "loggedOutHelpUrl": "https://www.github.com"
   },
   "ios": {},
   "web": {

From 7bbc8063291e92cd4796305a39bd6d955fde0c50 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 11:26:23 +0200
Subject: [PATCH 06/10] Update config.spec.ts

---
 packages/web-runtime/tests/unit/store/config.spec.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/web-runtime/tests/unit/store/config.spec.ts b/packages/web-runtime/tests/unit/store/config.spec.ts
index 2f39baee9a2..5a25b5d46f1 100644
--- a/packages/web-runtime/tests/unit/store/config.spec.ts
+++ b/packages/web-runtime/tests/unit/store/config.spec.ts
@@ -9,20 +9,20 @@ import { cloneDeep } from 'lodash-es'
 describe('config theme bootstrap', () => {
   it('should be able to loadTheme', async () => {
     const store = getStoreInstance(cloneDeep(Store))
-    const { theme } = await loadTheme()
-    const defaultTheme = theme.default
+    const { web } = await loadTheme()
+    const defaultTheme = web.default
 
     await store.dispatch('loadTheme', { defaultTheme })
     objectKeys(defaultTheme).forEach((k) => {
-      expect(get(store.getters.configuration.theme, k)).toBe(get(theme, k))
+      expect(get(store.getters.configuration.theme, k)).toBe(get(web, k))
     })
   })
 
   it('should not overwrite keys that are not part of theme', async () => {
     const store = getStoreInstance(cloneDeep(Store))
     const initialStoreTheme = { ...store.getters.configuration.theme }
-    const { theme } = await loadTheme()
-    const defaultTheme = theme.default
+    const { web } = await loadTheme()
+    const defaultTheme = web.default
 
     const storeThemeKeys = objectKeys(store.getters.configuration.currentTheme)
     const loadedThemeKeys = objectKeys(defaultTheme)

From 07a4e5a06b79e96bfeb380935c88d9277b73a080 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 12:10:29 +0200
Subject: [PATCH 07/10] Fix typo

---
 packages/web-runtime/src/pages/accessDenied.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index 8a3c4a8e8ad..c1881e0521c 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -59,7 +59,7 @@ export default defineComponent({
     })
     const cardHint = computed(() => {
       return $gettext(
-        'This could be because of a routine safety log out, or because your account is either inactive or not yet authorized for use. Please try logging in after a while or seek help from your Administraton.'
+        'This could be because of a routine safety log out, or because your account is either inactive or not yet authorized for use. Please try logging in after a while or seek help from your Administrator.'
       )
     })
     const footerSlogan = computed(() => {

From c5dd5e0f24432a34562d9b07fe964e442c4da59c Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 19 Jun 2023 12:36:58 +0200
Subject: [PATCH 08/10] Rename accessDeniedHelpUrl

---
 packages/web-runtime/src/pages/accessDenied.vue | 12 ++++++------
 packages/web-runtime/src/store/config.ts        |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index c1881e0521c..4595fd24448 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -6,10 +6,10 @@
         <h2 class="oc-login-card-title" v-text="cardTitle" />
         <p v-text="cardHint" />
         <oc-button
-          v-if="loggedOutHelpUrl"
+          v-if="accessDeniedHelpUrl"
           type="a"
           appearance="raw"
-          :href="loggedOutHelpUrl"
+          :href="accessDeniedHelpUrl"
           target="_blank"
           ><span v-text="$gettext('More')"
         /></oc-button>
@@ -48,10 +48,10 @@ export default defineComponent({
       return store.getters.configuration.currentTheme.logo.login
     })
 
-    const loggedOutHelpUrl = computed(() => {
+    const accessDeniedHelpUrl = computed(() => {
       return (
-        store.getters.configuration.commonTheme.loggedOutHelpUrl ||
-        store.getters.configuration.options.loggedOutHelpUrl
+        store.getters.configuration.commonTheme.accessDeniedHelpUrl ||
+        store.getters.configuration.options.accessDeniedHelpUrl
       )
     })
     const cardTitle = computed(() => {
@@ -75,7 +75,7 @@ export default defineComponent({
       cardHint,
       footerSlogan,
       navigateToLoginText,
-      loggedOutHelpUrl
+      accessDeniedHelpUrl
     }
   }
 })
diff --git a/packages/web-runtime/src/store/config.ts b/packages/web-runtime/src/store/config.ts
index 000b53d9f47..9f7fb18379e 100644
--- a/packages/web-runtime/src/store/config.ts
+++ b/packages/web-runtime/src/store/config.ts
@@ -19,7 +19,7 @@ const state = {
     name: '',
     solgan: '',
     logo: '',
-    loggedOutHelpUrl: ''
+    accessDeniedHelpUrl: ''
   },
   currentTheme: {
     general: {
@@ -65,7 +65,7 @@ const state = {
     cernFeatures: false,
     sharingRecipientsPerPage: 200,
     contextHelpersReadMore: true,
-    loggedOutHelpUrl: ''
+    accessDeniedHelpUrl: ''
   }
 }
 

From 4aef988644191e45bd62e87ae253341d41f11956 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 23 Jun 2023 13:02:35 +0200
Subject: [PATCH 09/10] Fix acceptance tests, remove dev leftover

---
 packages/web-runtime/themes/owncloud/theme.json | 3 +--
 tests/acceptance/pageObjects/loginErrorPage.js  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/web-runtime/themes/owncloud/theme.json b/packages/web-runtime/themes/owncloud/theme.json
index 9ccee46d93b..ad875341d08 100644
--- a/packages/web-runtime/themes/owncloud/theme.json
+++ b/packages/web-runtime/themes/owncloud/theme.json
@@ -2,8 +2,7 @@
   "common": {
     "name": "ownCloud",
     "slogan": "ownCloud – A safe home for all your data",
-    "logo": "themes/owncloud/assets/logo.svg",
-    "loggedOutHelpUrl": "https://www.github.com"
+    "logo": "themes/owncloud/assets/logo.svg"
   },
   "ios": {},
   "web": {
diff --git a/tests/acceptance/pageObjects/loginErrorPage.js b/tests/acceptance/pageObjects/loginErrorPage.js
index b6d4d7061cc..f38314e50ec 100644
--- a/tests/acceptance/pageObjects/loginErrorPage.js
+++ b/tests/acceptance/pageObjects/loginErrorPage.js
@@ -8,7 +8,7 @@ module.exports = {
     body: 'body',
     loginErrorMessage: {
       locateStrategy: 'xpath',
-      selector: '//h2[text()="Logged out"]'
+      selector: '//h2[text()="Not logged in"]'
     },
     exitButton: {
       selector: '#exitAnchor'

From 2ca32c890dbebd83d1a361bff3c47e069c1930f3 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 23 Jun 2023 13:39:13 +0200
Subject: [PATCH 10/10] Rename more to readmore

---
 packages/web-runtime/src/pages/accessDenied.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index 4595fd24448..d3c162999e5 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -11,7 +11,7 @@
           appearance="raw"
           :href="accessDeniedHelpUrl"
           target="_blank"
-          ><span v-text="$gettext('More')"
+          ><span v-text="$gettext('Read more')"
         /></oc-button>
       </div>
       <div class="oc-login-card-footer oc-pt-rm">