Skip to content
Snippets Groups Projects
Commit ffc585ad authored by Alfredo Chissotti's avatar Alfredo Chissotti
Browse files

update

parent b0733f79
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 40 deletions
WebServer/bin/code/Resources.class
+ 0
− 0
View file @ ffc585ad
No preview for this file type
WebServer/bin/code/Server.class
+ 0
− 0
View file @ ffc585ad
No preview for this file type
WebServer/src/code/Resources.java
+ 1
− 1
View file @ ffc585ad
......@@ -39,7 +39,7 @@ public class Resources implements HttpHandler {
case "js/" : strlist.add("text/javascript"); break;
case "css" : strlist.add("text/css"); break;
// case "con" : strlist.add("text/plain"); break;
case "con" : strlist.add("application/json"); break;
// case "con" : strlist.add("application/json"); break;
// default : strlist.add("text/plain"); break;
default: strlist.add("text"); break;
}
......
WebServer/src/code/Server.java
+ 1
− 1
View file @ ffc585ad
......@@ -87,7 +87,7 @@ public class Server {
server.createContext("/js/authentication/",new Resources());
server.createContext("/js/templates/",new Resources());
server.createContext("/css/",new Resources());
server.createContext("/conf/",new Resources());
// server.createContext("/conf/",new Resources());
server.createContext("/res/",new ImageRes());
server.createContext("/secured/home/js/",new Resources());
server.createContext("/secured/home/css/",new Resources());
......
keycloak-19.0.1/data/h2/keycloakdb.lock.db
+ 3
− 3
View file @ ffc585ad
#FileLock
#Wed Sep 14 16:24:41 CEST 2022
server=localhost\:44755
#Wed Sep 14 17:26:24 CEST 2022
hostName=localhost
id=1833c959d82a7836ed0e7315f92a10aced4476cbd47
method=file
id=1833c633e7d2ba3b048a044a44b09843d1248f762d0
server=localhost\:56546
webapp/public/conf/conf.json deleted 100644 → 0
+ 0
− 0
View file @ b0733f79
webapp/public/js/authentication/configuration.js
+ 15
− 18
View file @ ffc585ad
"use strict";
// import conf from '../../conf/conf.json' assert {type: 'json'};
const conf = {
"self-server-url": "https://localhost:3000/",
"keycloak": {
......@@ -12,26 +11,24 @@ const conf = {
}
};
class Configuration {
static getMyURL() {
return conf["self-server-url"];
}
function getMyURL() {
return conf["self-server-url"];
}
static getKeycloakInfo() {
return conf.keycloak;
}
function getKeycloakInfo() {
return conf.keycloak;
}
static getKeycloakRealm() {
return conf.keycloak.realm;
}
function getKeycloakRealm() {
return conf.keycloak.realm;
}
static getKeycloakURL() {
return conf.keycloak["base-server-url"];
}
function getKeycloakURL() {
return conf.keycloak["base-server-url"];
}
static getDomainURL() {
return conf.domain["base-domain-url"];
}
function getDomainURL() {
return conf.domain["base-domain-url"];
}
export default Configuration;
\ No newline at end of file
export {getMyURL, getKeycloakInfo, getKeycloakRealm, getKeycloakURL, getDomainURL};
\ No newline at end of file
webapp/public/js/authentication/requests-to-domain.js
+ 9
− 10
View file @ ffc585ad
......@@ -2,8 +2,7 @@
import {getToken} from "./script.js";
import Domain from "./domain.js";
import Configuration from "./configuration.js";
const configuration = new Configuration();
import { getDomainURL } from './configuration.js';
class RequestToDomain {
......@@ -16,7 +15,7 @@ class RequestToDomain {
* sui domini dell'utente che ha effettuato il login
*/
static async getMyDomains() {
const responseDomain = await fetch(`${configuration.getDomainURL()}secured/domains/`, { // DA FARE: controllare che l'uri che ho specificato qui coincida con quello specificato dal domain manager
const responseDomain = await fetch(`${getDomainURL()}secured/domains/`, { // DA FARE: controllare che l'uri che ho specificato qui coincida con quello specificato dal domain manager
method: 'GET',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -42,7 +41,7 @@ class RequestToDomain {
* false altrimenti.
*/
static async createNewDomain(json) {
const response = await fetch(`${configuration.getDomainURL()}install/`, {
const response = await fetch(`${getDomainURL()}install/`, {
method: 'POST',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -63,7 +62,7 @@ class RequestToDomain {
* disponibili.
*/
static async getAllServices() {
const responseDomain = await fetch(`${configuration.getDomainURL()}secured/services`, { // DA FARE: controllare che l'uri che ho specificato qui coincida con quello specificato dal domain manager
const responseDomain = await fetch(`${getDomainURL()}secured/services`, { // DA FARE: controllare che l'uri che ho specificato qui coincida con quello specificato dal domain manager
method: 'GET',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -84,7 +83,7 @@ class RequestToDomain {
* @returns
*/
static async getUsedServices(domain) {
const response = await fetch(`${configuration.getDomainURL()}secured/services?domain=${domain}`, {
const response = await fetch(`${getDomainURL()}secured/services?domain=${domain}`, {
method: 'GET',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -105,7 +104,7 @@ class RequestToDomain {
* false altrimenti.
*/
static async startDomain(d) {
const response = await fetch(`${configuration.getDomainURL()}start/`, {
const response = await fetch(`${getDomainURL()}start/`, {
method: 'POST',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -128,7 +127,7 @@ class RequestToDomain {
* false altrimenti.
*/
static async stopDomain(d) {
const response = await fetch(`${configuration.getDomainURL()}stop/`, {
const response = await fetch(`${getDomainURL()}stop/`, {
method: 'POST',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -151,7 +150,7 @@ class RequestToDomain {
* false altrimenti.
*/
static async deleteDomain(d) {
const response = await fetch(`${configuration.getDomainURL()}delete/`, {
const response = await fetch(`${getDomainURL()}delete/`, {
method: 'POST',
headers: {
'Authorization': `Bearer ${await getToken()}`
......@@ -171,7 +170,7 @@ class RequestToDomain {
* @returns
*/
static async getUserPriviledges(domain) {
const response = await fetch(`${configuration.getDomainURL()}secured/priviledges?domain=${domain}`, {
const response = await fetch(`${getDomainURL()}secured/priviledges?domain=${domain}`, {
method: 'GET',
headers: {
'Authorization': `Bearer ${await getToken()}`
......
webapp/public/js/authentication/script.js
+ 7
− 7
View file @ ffc585ad
......@@ -4,8 +4,8 @@ import App from './app.js';
import RequestToDomain from './requests-to-domain.js';
// import * as jose from 'jose'; // per la gestione del token
import Configuration from './configuration.js';
const configuration = new Configuration();
import { getKeycloakRealm, getKeycloakURL, getMyURL } from './configuration.js';
const mySecure = new Secure();
......@@ -51,7 +51,7 @@ else if(uri.includes("#")){
// {nome: "casa4", stato:"on", admin: false}
// ];
const app = new App(myDomains,configuration);
const app = new App(myDomains);
}
}
} else if(uri.includes(`/secured/home/`)) {
......@@ -77,7 +77,7 @@ function queryStringGetValue(queryString) {
*/
async function requestFirstToken(uriAuthCode) {
const url = `${configuration.getKeycloakURL()}realms/${configuration.getKeycloakRealm()}/protocol/openid-connect/token`;
const url = `${getKeycloakURL()}realms/${getKeycloakRealm()}/protocol/openid-connect/token`;
const response = await fetch(url, {
method: `POST`,
headers: {
......@@ -88,7 +88,7 @@ async function requestFirstToken(uriAuthCode) {
client_id: `myclient`,
code_verifier: sessionStorage.getItem("codeVerifier"),
code: uriAuthCode,
redirect_uri: `${configuration.getMyURL()}secured`
redirect_uri: `${getMyURL()}secured`
})
});
token = await response.json();
......@@ -115,7 +115,7 @@ async function getToken() {
* Post per la richiesta del token usando il refresh token.
*/
async function requestUsingRefreshToken() {
const url = `${configuration.getKeycloakURL()}realms/${configuration.getKeycloakRealm()}/protocol/openid-connect/token`;
const url = `${getKeycloakURL()}realms/${getKeycloakRealm()}/protocol/openid-connect/token`;
const response = await fetch(url, {
method: `POST`,
headers: {
......@@ -165,7 +165,7 @@ async function logoutKeycloak() {
if(token == null)
return;
clearTimeout(oldTimeout); // DA FARE: funziona, ma vedere se fare il redirect alla pagina iniziale.
window.location.href = `${configuration.getKeycloakURL()}realms/${configuration.getKeycloakRealm()}/protocol/openid-connect/logout?id_token_hint=${await getIdToken()}`;
window.location.href = `${getKeycloakURL()}realms/${getKeycloakRealm()}/protocol/openid-connect/logout?id_token_hint=${await getIdToken()}`;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment