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

Jump to bottom

Fill in SAMLResponse nameId for pre-populated users #3946

Merged
merged 3 commits into from Dec 15, 2021
Merged

Fill in SAMLResponse nameId for pre-populated users #3946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b890d34
Fill in SAMLResponse nameId for pre-populated users
lisajian Dec 14, 2021
85eef07
Grab email from id_token
lisajian Dec 14, 2021
1baf996
Change from email to claims.email
lisajian Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/emulator/auth/handlers.ts
View file
Open in desktop
Expand Up @@ -201,7 +201,7 @@ export function registerHandlers(
<span class="mdc-list-item__text"><span class="mdc-list-item__primary-text">${
info.displayName || "(No display name)"
}</span>
<span class="mdc-list-item__secondary-text fallback-secondary-text">${
<span class="mdc-list-item__secondary-text fallback-secondary-text" id="reuse-email">${
lisajian marked this conversation as resolved.
Show resolved Hide resolved
info.email || ""
}</span>
</li>`
Expand Down
8 changes: 4 additions & 4 deletions src/emulator/auth/widget_ui.ts
View file
Open in desktop
Expand Up @@ -158,16 +158,17 @@ var reuseAccountEls = document.querySelectorAll('.js-reuse-account');
if (reuseAccountEls.length) {
[].forEach.call(reuseAccountEls, function (el) {
var urlEncodedIdToken = el.dataset.idToken;
const decoded = JSON.parse(decodeURIComponent(urlEncodedIdToken));
el.addEventListener('click', function (e) {
e.preventDefault();
finishWithUser(urlEncodedIdToken);
finishWithUser(urlEncodedIdToken, decoded.email);
});
});
} else {
document.querySelector('.js-accounts-help-text').textContent = "No " + formattedProviderId + " accounts exist in the Auth Emulator.";
}

function finishWithUser(urlEncodedIdToken) {
function finishWithUser(urlEncodedIdToken, email) {
// Use widget URL, but replace all query parameters (no apiKey etc.).
var url = window.location.href.split('?')[0];
// Avoid URLSearchParams for browser compatibility.
Expand All @@ -176,7 +177,6 @@ function finishWithUser(urlEncodedIdToken) {

// Save reasonable defaults for SAML providers
if (isSamlProvider) {
var email = document.getElementById('email-input').value;
url += '&SAMLResponse=' + encodeURIComponent(JSON.stringify({
assertion: {
subject: {
Expand Down Expand Up @@ -234,7 +234,7 @@ document.getElementById('main-form').addEventListener('submit', function(e) {
if (screenName) claims.screenName = screenName;
if (photoUrl) claims.photoUrl = photoUrl;

finishWithUser(createFakeClaims(claims));
finishWithUser(createFakeClaims(claims), claims.email);
}
});

Expand Down