Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Login hint fixes #68

Merged
merged 4 commits into from
Sep 17, 2024
Merged

Login hint fixes #68

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
923a1d5
dedupe custom authz server, cleanup
rohanharikr Sep 17, 2024
e7d3708
comment
rohanharikr Sep 17, 2024
61a0a51
placeholder for login_hint and error text if login_hint does not star…
rohanharikr Sep 17, 2024
b9602b4
normalize custom authz server before saving
rohanharikr Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 13 additions & 28 deletions src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,6 @@
greenfield: 'app_GreenfieldFitnessDemoApp_s9z'
};

const opendidConfigEndpoint = '.well-known/openid-configuration';
const helloIssuers = [
'https://issuer.hello.coop',
'https://issuer.hello-staging.net',
'https://issuer.hello-beta.net',
'https://issuer.hello-dev.net',
'https://issuer.hello-local.net'
];
const betaAuthzServer = 'https://wallet.hello-beta.net/authorize';

// const updateScopes = ['name', 'email', 'picture', 'phone', 'profile'];
Expand Down Expand Up @@ -351,33 +343,21 @@
const error = protocolParams.get('error');
if (error) {
errorNotification = error?.replaceAll('_', ' ');
//tbd show error description?
}
if (iss) {
let authorization_endpoint;
if (helloIssuers.includes(iss)) {
const wallet = iss.replace('issuer', 'wallet');
authorization_endpoint = new URL('/authorize', wallet).href;
} else {
const openidConfig = new URL(opendidConfigEndpoint, iss);
try {
const res = await fetch(openidConfig.href);
const json = await res.json();
authorization_endpoint = json.authorization_endpoint;
} catch (err) {
console.error(err);
errorNotification = 'Error fetching ' + openidConfig.href;
}
}
if (iss && iss.startsWith('https://issuer.hello')) {
const wallet = iss.replace('issuer', 'wallet');
const authorization_endpoint = new URL('/authorize', wallet).href;

//reset all params and settings
resetAll();

//add issuer authz endpoint to existing authz servers
states.custom_authorization_servers = [
...states.custom_authorization_servers,
authorization_endpoint
...new Set([...states.custom_authorization_servers, authorization_endpoint.toLowerCase()]) //dedupe
];
states.selected_authorization_server = authorization_endpoint;

let _requestUrl = makeRequestURL({
server: authorization_endpoint,
scopes: states.scopes,
Expand Down Expand Up @@ -625,7 +605,7 @@
url = new URL(custom_authorization_server);
}
states.custom_authorization_servers = [
...new Set([...states.custom_authorization_servers, url.href])
...new Set([...states.custom_authorization_servers, url.href.toLowerCase()]) //dedupe
];
states.selected_authorization_server = url.href;
custom_authorization_server = '';
Expand Down Expand Up @@ -1126,7 +1106,11 @@
states.protocol_params.includes('response_mode') &&
states.protocol_param_values.response_mode === 'query' &&
states.protocol_params.includes('response_type') &&
states.protocol_param_values.response_type === 'id_token')}
states.protocol_param_values.response_type === 'id_token') ||
//login_hint should start with mailto:
(param === 'login_hint' &&
states.protocol_params.includes('login_hint') &&
!states.protocol_param_values.login_hint.startsWith('mailto:'))}
>
{param}
{required ? '*' : ''}
Expand Down Expand Up @@ -1193,6 +1177,7 @@
>
<input
type="text"
placeholder={param === 'login_hint' ? 'mailto:[email protected]' : ''}
name={param}
class="h-6 px-2 w-full form-input"
autocomplete="off"
Expand Down
Loading