From 69d15e4998017e419fd51a078361dc031c07fcbc Mon Sep 17 00:00:00 2001 From: rohanharikr Date: Wed, 4 Dec 2024 15:37:26 +0000 Subject: [PATCH] more ui fixes --- src/App.svelte | 16 +++++++++++++--- src/lib/components/AuthorizationResponse.svelte | 3 ++- src/lib/components/Notification.svelte | 7 +++++-- src/lib/components/Request/ProtocolParams.svelte | 2 +- src/lib/components/Request/ScopeParam.svelte | 10 +++++----- src/lib/utils.js | 8 +++++++- 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index ab05332..ac5ccbf 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -12,7 +12,8 @@ handleLegacyState, removeLoader, generatePkce, - sendPlausibleEvent + sendPlausibleEvent, + focusAuthzResponseSection } from '$lib/utils.js'; import { makeAuthzUrl, makeInviteUrl } from '$lib/request.js'; import { parseToken, validateToken } from '@hellocoop/helper-browser'; @@ -29,7 +30,7 @@ let customScope = $state(''); let isHelloMode = $state(true); // this only matters if hello dev flag is set let mounted = $state(false); - let showErrorNotification = $state(false); + let showErrorNotification = $state(true); let authzResponse = $state({ url: null, token: null, @@ -89,7 +90,7 @@ if (params.has('id_token')) await processIdToken(params); else if (params.has('code')) await processCode(params); else if (params.has('error')) processError(params); - else if (params.has('beta')) selectedAuthzServer = BETA_SERVER; + else if (params.has('beta')) selectBetaServer(); cleanUrl(); removeLoader(); @@ -229,6 +230,8 @@ } catch (err) { console.error(err); showErrorNotification = true; + } finally { + focusAuthzResponseSection(); } } @@ -251,6 +254,8 @@ } catch (err) { console.error(err); showErrorNotification = true; + } finally { + focusAuthzResponseSection(); } } @@ -258,6 +263,11 @@ authzResponse.url = params.toString(); showErrorNotification = true; } + + function selectBetaServer() { + selectedAuthzServer = BETA_SERVER; + dropdowns.server = true; // expand to show selected beta server + } {#if mounted} diff --git a/src/lib/components/AuthorizationResponse.svelte b/src/lib/components/AuthorizationResponse.svelte index 24ed2d1..3df1ccc 100644 --- a/src/lib/components/AuthorizationResponse.svelte +++ b/src/lib/components/AuthorizationResponse.svelte @@ -6,7 +6,8 @@
- Authorization Error - Please see Response section below + Authorization Error
Please see Response + section below
- {#if isOverwritten} + {#if isOverridden}

- Overwritten with 'scope' in Protocol Parameters section + Overridden with 'scope' in Protocol Parameters section

{/if} @@ -45,8 +45,8 @@
    {#each ALL_STANDARD_SCOEPS as stdScope} diff --git a/src/lib/utils.js b/src/lib/utils.js index a4ea9e9..d18a104 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -78,6 +78,11 @@ async function sendPlausibleEvent() { } } +function focusAuthzResponseSection() { + const ele = document.querySelector('#authz-response-container'); + if (ele) ele.scrollIntoView(); +} + export { cleanUrl, removeLoader, @@ -85,5 +90,6 @@ export { reset, handleLegacyState, generatePkce, - sendPlausibleEvent + sendPlausibleEvent, + focusAuthzResponseSection };