From 0430db513816c114196dd6a0fd3aeac83b1fdc7d Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Sun, 4 Aug 2024 11:40:05 +0200
Subject: [PATCH] Clean-up unused login/logout code in app.vue (#2693)

Removes unused code from app.vue and other occurrences. This code would
be a security issue if used and generates security warnings.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../org.openhab.ui/web/src/components/app.vue | 43 +------------------
 .../web/src/components/auth-mixin.js          |  6 +--
 .../org.openhab.ui/web/src/pages/profile.vue  |  3 --
 .../src/pages/settings/items/item-details.vue |  2 +-
 4 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/components/app.vue b/bundles/org.openhab.ui/web/src/components/app.vue
index e3700471f..151e7f289 100644
--- a/bundles/org.openhab.ui/web/src/components/app.vue
+++ b/bundles/org.openhab.ui/web/src/components/app.vue
@@ -353,11 +353,6 @@ export default {
         // }
       },
 
-      // Login screen data
-      serverUrl: '',
-      username: '',
-      password: '',
-
       user: null,
 
       sitemaps: null,
@@ -385,12 +380,8 @@ export default {
     messages: loadLocaleMessages(require.context('@/assets/i18n/about'))
   },
   computed: {
-    isAdmin () {
-      if (!this.$store.getters.apiEndpoint('auth')) return true
-      return this.ready && this.user && this.user.roles && this.user.roles.indexOf('administrator') >= 0
-    },
     serverDisplayUrl () {
-      return (this.serverUrl || window.location.origin)
+      return window.location.origin
     }
   },
   watch: {
@@ -541,38 +532,6 @@ export default {
           return 'f7:tv'
       }
     },
-    login () {
-      localStorage.setItem('openhab.ui:serverUrl', this.serverUrl)
-      localStorage.setItem('openhab.ui:username', this.username)
-      localStorage.setItem('openhab.ui:password', this.password)
-      this.loadData().then(() => {
-        this.loggedIn = true
-      }).catch((err) => {
-        localStorage.removeItem('openhab.ui:serverUrl')
-        localStorage.removeItem('openhab.ui:username')
-        localStorage.removeItem('openhab.ui:password')
-        this.$f7.dialog.alert('Cannot login, please try again: ' + err)
-      })
-    },
-    logout () {
-      this.$f7.preloader.show()
-      this.ready = false
-      localStorage.removeItem('openhab.ui:serverUrl')
-      localStorage.removeItem('openhab.ui:username')
-      localStorage.removeItem('openhab.ui:password')
-      this.user = null
-      this.serverUrl = ''
-      this.username = ''
-      this.password = ''
-      this.cleanSession().then(() => {
-        this.loggedIn = false
-        this.$f7.views.main.router.navigate('/', { animate: false, clearPreviousHistory: true })
-        window.location = window.location.origin
-      }).catch((err) => {
-        this.$f7.preloader.hide()
-        this.$f7.dialog.alert('Error while signing out: ' + err)
-      })
-    },
     updateThemeOptions () {
       this.themeOptions.dark = localStorage.getItem('openhab.ui:theme.dark') || ((window.OHApp && window.OHApp.preferDarkMode) ? window.OHApp.preferDarkMode().toString() : (this.$f7.darkTheme ? 'dark' : 'light'))
       this.themeOptions.bars = localStorage.getItem('openhab.ui:theme.bars') || 'light'
diff --git a/bundles/org.openhab.ui/web/src/components/auth-mixin.js b/bundles/org.openhab.ui/web/src/components/auth-mixin.js
index 7d9c6920e..d654c532c 100644
--- a/bundles/org.openhab.ui/web/src/components/auth-mixin.js
+++ b/bundles/org.openhab.ui/web/src/components/auth-mixin.js
@@ -52,7 +52,7 @@ export default {
               resolve(resp.user)
             })
           }).catch((err) => {
-            console.log(err)
+            console.log('Exchanging authorization code failed', err)
             reject(err)
           })
         } else {
@@ -83,7 +83,7 @@ export default {
             resolve(resp)
           })
         }).catch((err) => {
-          console.log(err)
+          console.log('Refreshing access token failed', err)
           reject(err)
         })
       })
@@ -107,7 +107,7 @@ export default {
           this.$store.commit('setUser', { user: null })
           resolve()
         }).catch((err) => {
-          console.log(err)
+          console.log('Failed to log out', err)
           this.$oh.auth.clearAccessToken()
           this.$store.commit('setUser', { user: null })
           reject(err)
diff --git a/bundles/org.openhab.ui/web/src/pages/profile.vue b/bundles/org.openhab.ui/web/src/pages/profile.vue
index 468811261..2f59e0fcb 100644
--- a/bundles/org.openhab.ui/web/src/pages/profile.vue
+++ b/bundles/org.openhab.ui/web/src/pages/profile.vue
@@ -222,9 +222,6 @@ export default {
     },
     logout () {
       this.$f7.preloader.show()
-      localStorage.removeItem('openhab.ui:serverUrl')
-      localStorage.removeItem('openhab.ui:username')
-      localStorage.removeItem('openhab.ui:password')
       this.cleanSession().then(() => {
         this.loggedIn = false
         this.$f7.views.main.router.navigate('/', { animate: false, clearPreviousHistory: true })
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue b/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue
index 9e48c0666..5745a5591 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue
@@ -199,7 +199,7 @@ export default {
       this.$oh.api.get(`/rest/items/${this.itemName}?metadata=.+`).then((data) => {
         this.item = data
         this.ready = true
-        this.iconUrl = (localStorage.getItem('openhab.ui:serverUrl') || '') + '/icon/' + this.item.category + '?format=svg'
+        this.iconUrl = '/icon/' + this.item.category + '?format=svg'
       })
     },
     deleteItem () {