Skip to content

[WIP]SDB-2119 improvement for SAML integration #13

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

Open
carrasquel wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[WIP]SDB-2119 improvement for SAML integration #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fc0078
saml and jwt methods separated
carrasquel Aug 26, 2024
dd79f28
variables renamed
carrasquel Aug 26, 2024
c062ff8
ssoCredentials renamed to jwtCredentials
carrasquel Aug 26, 2024
a360b31
redirect handling improved
carrasquel Aug 27, 2024
5a05922
redirect handling improved for popup
carrasquel Aug 27, 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
6 changes: 3 additions & 3 deletions examples/login_demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,11 @@ <h1>SDK - SSO Login Demo</h1>
<div class="config">
<div class="txtField">
<label>Host</label>
<input name="host" type="text" value="http://host.docker.internal:8000">
<input name="host" type="text" value="http://localhost:6543">
</div>
<div class="txtField">
<label>Redirect URI</label>
<input name="redirect" type="text" value="http://localhost:8081/examples/success.html">
<input name="redirect" type="text" value="http://localhost:8081/examples/popup_success.html">
</div>
<div class="txtField">
<label>Identity Provider</label>
Expand Down Expand Up @@ -296,7 +296,7 @@ <h1>SDK - SSO Login Demo</h1>
const sdbClient = new SlashDBClient(sdbConfig);
let status = await sdbClient.login();
</pre>
<textarea id="loginTxt" class="outTxt" spellcheck="false">Click Run Demo button...</textarea>
<textarea id="loginTxt" style="height: 6rem" class="outTxt" spellcheck="false">Click Run Demo button...</textarea>
</div>

<div id="apiDesc" class="codeBlock">
Expand Down
13 changes: 13 additions & 0 deletions examples/popup_success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<html>
<head>
<title>SlashDB JavaScript SDK Demo</title>
</head>
<body>

<div>
<p>Login was successful, you can close this window...</p>
</div>

</body>

</html>
134 changes: 133 additions & 1 deletion examples/success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,145 @@
<html>
<head>
<title>SlashDB JavaScript SDK Demo</title>
<style>
.codeBlock {
margin: 25px 15px;
padding: 10px;
font-family: sans-serif;
background: #EEE;
box-shadow: 0 0 10px #000;
border-radius: 10px;
}

#splitConfig {
display: flex;
}


.outTxt { width: 100%; padding: 10px;}

.config {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: end;

}

.txtField {
padding: 5px 10px;
}
.config .txtField input {
border-radius: 5px;
margin: 2px;
padding: 5px;
}

.config .txtField select {
border-radius: 5px;
margin: 2px;
padding: 5px;
}

.config .txtField label {
display: block;
font-size: 0.8rem;
padding-left: 5px;
}

.config .tbl input {
display: inline;
}
.config .tbl select {
display: inline;
}
.config .tbl label {
display: block;
margin-right: 5px;
}

.config .buttons {
background: #FFF;
margin: 6px;
height: 30px;
border-radius: 5px;
}

.config .buttons:hover {
background: #0AF;
color: #FFF;
}


</style>
<script type="module">
import { SlashDBClient } from '../src/index.js';

var host;
var redirectUri;
var idpId;

host = "http://localhost:6543";
idpId = "keycloak";
redirectUri = "http://localhost:8081/examples/success.html";

const sdbConfig = {
host: host,
sso: {
idpId: idpId,
redirectUri: redirectUri,
popUp: false
}
}

let outTxt = '';

try {
const sdbClient = new SlashDBClient(sdbConfig);
outTxt += `* const sdbClient = new SlashDBClient() - creating client\n`;
document.querySelector('#loginTxt').innerHTML = outTxt;

outTxt += `* sdbClient.buildSSORedirect() - SSO parameters status: `;
const success = await sdbClient.buildSSORedirect();
outTxt += `${success}\n`;
document.querySelector('#loginTxt').innerHTML = outTxt;

outTxt += `* sdbClient.isAuthenticated() - Logged in status: `;
let status = await sdbClient.isAuthenticated();
outTxt += `${status}\n`;
document.querySelector('#loginTxt').innerHTML = outTxt;

}
catch(e) {
document.querySelector('#loginTxt').style.color = '#F00';
outTxt += `\n^^^^ Error ${e.message} - see console for details`;
document.querySelector('#loginTxt').innerHTML = outTxt;
}
</script>
</head>
<body>

<div>
<p>Login was successful, you can close this window...</p>
</div>
</div>

<div id="clientDesc" class="codeBlock">
SlashDB Single Sign-On redirect page <br>
<em style="font-size: 0.85rem">Requires a proper build of redirect parameters</em>
<pre> const sdbConfig = {
host: 'http://localhost:6543',
sso: {
idpId: 'keycloak',
redirectUri: 'http://localhost:8081/examples/success.html',
popUp: true
}
}
const sdbClient = new SlashDBClient(sdbConfig);
const success = await sdbClient.buildSSORedirect();
const isAuthenticated = await sdbClient.isAuthenticated();
</pre>
<textarea id="loginTxt" style="height: 6rem" class="outTxt" spellcheck="false">Click Run Demo button...</textarea>
</div>

</body>

Expand Down
4 changes: 2 additions & 2 deletions src/baserequesthandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ class BaseRequestHandler {
'Content-Type': this.contentTypeHeader,
...this.extraHeaders
};
} else if (this.sdbClient.ssoCredentials) {
const token = btoa(this.sdbClient.ssoCredentials.id_token)
} else if (this.sdbClient.jwtCredentials) {
const token = btoa(this.sdbClient.jwtCredentials.id_token)
headers = {
Authorization: "Bearer " + token,
"X-Identity-Provider-Id": this.sdbClient.sso.idpId,
Expand Down
Loading