OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[MainUI] Fix redirection for reverse proxy with authentication not working (#1670) 

When the /rest/ call fails with 302 and the client is redirected to the login page, the login page should redirect the client back to the openHAB UI and not the REST API.
Therefore the URL param of the redirect URL needs to be modified to remove the rest/ from it.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
(cherry picked from commit 343eda78ed)
3.4.x
Florian Hotze 2023-02-12 14:34:13 +01:00
parent 05394454da
commit 6ce395b9ed
No known key found for this signature in database
GPG Key ID: 0C0090A3214BC147
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bundles/org.openhab.ui/web/src/components/app.vue
View File

@ -251,6 +251,8 @@
</style>
<script>
import Framework7 from 'framework7/framework7-lite.esm.bundle.js'
import cordovaApp from '../js/cordova-app.js'
import routes from '../js/routes.js'
import PanelRight from '../pages/panel-right.vue'
@ -402,9 +404,11 @@ export default {
loadData (useCredentials) {
const useCredentialsPromise = (useCredentials) ? this.setBasicCredentials() : Promise.resolve()
return useCredentialsPromise
.then(() => { return this.$oh.api.get('/rest/') })
.then(() => { return Framework7.request.promise.json('/rest/') })
.catch((err) => {
if (err === 'Unauthorized' || err === 401) {
console.error('openHAB REST API connection failed with error:')
console.info(err)
if (err.message === 'Unauthorized' || err.status === 401) {
if (!useCredentials) {
// try again with credentials
this.loadData(true)
@ -434,8 +438,34 @@ export default {
)
})
return Promise.reject()
// Redirection handling (e.g. when using auth_request in nginx)
} else if (err.message === 'Found' || err.status === 302) {
// technically correct way, but unreliable because XhrHttpRequest follows the redirect itself and fails because of CORS policy
if (err.xhr.HEADERS_RECEIVED > 0) {
const headersObj = {}
err.xhr.getAllResponseHeaders().trim().split(/[\r\n]+/).forEach((line) => {
const parts = line.split(':\t')
headersObj[parts[0]] = parts[1]
})
// Redirect according to location header but modify URL arguments to redirect back to the UI and not the REST API after authentication
window.location.replace(headersObj['location'].replace(window.location.href + 'rest', window.location.href))
}
} else if (err.message === 0 || err.status === 0) {
// XhrHttpRequest has message & status 0 if the redirected request failed due to CORS policy
// Follow the authentication redirect by unloading service-worker and reloading PWA
if ('serviceWorker' in window.navigator) {
window.navigator.serviceWorker.getRegistration().then((reg) => {
reg.unregister().then(() => {
console.info('Unregistered service-worker, reloading now.')
window.location.reload()
})
})
}
} else {
this.$f7.dialog.alert('openHAB REST API connection failed with error ' + err.message || err.status)
}
})
.then((res) => res.data)
.then((rootResponse) => {
// store the REST API services present on the system
this.$store.dispatch('loadRootResource', { rootResponse })