diff --git a/WebServer/bin/code/Resources.class b/WebServer/bin/code/Resources.class
index d77a40ed352a05187daa44f6f233c2d0156c02fe..ff670eb776da0489f96d95e76f6dfdefcd67c103 100644
Binary files a/WebServer/bin/code/Resources.class and b/WebServer/bin/code/Resources.class differ
diff --git a/WebServer/bin/code/Server.class b/WebServer/bin/code/Server.class
index 9a5bb2dca954bb0b713a13fab23299c0e70e94dc..ba08391345eca2b494140003a57e34b886273b5b 100644
Binary files a/WebServer/bin/code/Server.class and b/WebServer/bin/code/Server.class differ
diff --git a/WebServer/src/code/Resources.java b/WebServer/src/code/Resources.java
index 85ee6c406a7c0958d428b5a7e4bfaf0b5a61748f..c2029e38a34e4be0c46558b757c91813a8574739 100644
--- a/WebServer/src/code/Resources.java
+++ b/WebServer/src/code/Resources.java
@@ -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;
}
diff --git a/WebServer/src/code/Server.java b/WebServer/src/code/Server.java
index 7a484be35574d06781b52f62dbf58f2a6e607be3..651a807871efbd2a9502417c6b2e601baf4ff760 100644
--- a/WebServer/src/code/Server.java
+++ b/WebServer/src/code/Server.java
@@ -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());
diff --git a/keycloak-19.0.1/data/h2/keycloakdb.lock.db b/keycloak-19.0.1/data/h2/keycloakdb.lock.db
index 06e320ab9f06a821d0b4b7dc692799b4326b7463..f3a4d95528415e51bf1fcc3cf6e6434c9f7a367d 100644
--- a/keycloak-19.0.1/data/h2/keycloakdb.lock.db
+++ b/keycloak-19.0.1/data/h2/keycloakdb.lock.db
@@ -1,6 +1,6 @@
#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
diff --git a/webapp/public/conf/conf.json b/webapp/public/conf/conf.json
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/webapp/public/js/authentication/configuration.js b/webapp/public/js/authentication/configuration.js
index 311a976968c56dc26db7f0a4854eebebb9a0bf33..38503a6423e349cfad1a95206a7ca9ac49d1dd40 100644
--- a/webapp/public/js/authentication/configuration.js
+++ b/webapp/public/js/authentication/configuration.js
@@ -1,6 +1,5 @@
"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
diff --git a/webapp/public/js/authentication/requests-to-domain.js b/webapp/public/js/authentication/requests-to-domain.js
index 6c83e31d116dca78a64832ad9f4e3c354e34211c..ed7d3804f9d6df4ffee5f4687a4b34438e9829e6 100644
--- a/webapp/public/js/authentication/requests-to-domain.js
+++ b/webapp/public/js/authentication/requests-to-domain.js
@@ -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()}`
diff --git a/webapp/public/js/authentication/script.js b/webapp/public/js/authentication/script.js
index 169cb371c5c59d2ec2239ed65acf6c0be2f9fa55..a32f0047b4c634206c7c085257e4b2100e5858d4 100644
--- a/webapp/public/js/authentication/script.js
+++ b/webapp/public/js/authentication/script.js
@@ -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()}`;
}