refactor: Remove unused configuration variables

Author: joachimvh

packages/uma/bin/demo.ts

@@ -10,28 +10,20 @@ const baseUrl = `${protocol}://${host}:${port}/uma`;
 const rootDir = path.join(__dirname, '../');
 
 export const launch: () => Promise<void> = async () => {
-
-  const variables: Record<string, any> = {};
+  const variables: Record<string, unknown> = {};
 
   variables['urn:uma:variables:port'] = port;
-  variables['urn:uma:variables:host'] = host;
-  variables['urn:uma:variables:protocol'] = protocol;
   variables['urn:uma:variables:baseUrl'] = baseUrl;
 
   // variables['urn:uma:variables:policyDir'] = path.join(rootDir, './config/rules/policy');
-  variables['urn:uma:variables:rulesDir'] = path.join(rootDir, './config/rules/n3');
   variables['urn:uma:variables:eyePath'] = 'eye';
 
-  variables['urn:uma:variables:mainModulePath'] = rootDir;
-  variables['urn:uma:variables:customConfigPath'] = path.join(rootDir, './config/demo.json');
-
-  const mainModulePath = variables['urn:uma:variables:mainModulePath'];
-  const configPath = variables['urn:uma:variables:customConfigPath'];
+  const configPath = path.join(rootDir, './config/demo.json');
 
   setGlobalLoggerFactory(new WinstonLoggerFactory('info'));
 
   const manager = await ComponentsManager.build({
-    mainModulePath,
+    mainModulePath: rootDir,
     logLevel: 'silly',
     typeChecking: false,
   });
@@ -40,7 +32,6 @@ export const launch: () => Promise<void> = async () => {
 
   const umaServer: ServerInitializer = await manager.instantiate('urn:uma:default:NodeHttpServer',{variables});
   await umaServer.handleSafe();
-
 };
 
 launch();

packages/uma/bin/main.ts

@@ -10,28 +10,20 @@ const baseUrl = `${protocol}://${host}:${port}/uma`;
 const rootDir = path.join(__dirname, '../');
 
 export const launch: () => Promise<void> = async () => {
-
-  const variables: Record<string, any> = {};
+  const variables: Record<string, unknown> = {};
 
   variables['urn:uma:variables:port'] = port;
-  variables['urn:uma:variables:host'] = host;
-  variables['urn:uma:variables:protocol'] = protocol;
   variables['urn:uma:variables:baseUrl'] = baseUrl;
 
   variables['urn:uma:variables:policyDir'] = path.join(rootDir, './config/rules/policy');
-  variables['urn:uma:variables:rulesDir'] = path.join(rootDir, './config/rules/n3');
   variables['urn:uma:variables:eyePath'] = 'eye';
 
-  variables['urn:uma:variables:mainModulePath'] = rootDir;
-  variables['urn:uma:variables:customConfigPath'] = path.join(rootDir, './config/default.json');
-
-  const mainModulePath = variables['urn:uma:variables:mainModulePath'];
-  const configPath = variables['urn:uma:variables:customConfigPath'];
+  const configPath = path.join(rootDir, './config/default.json');
 
   setGlobalLoggerFactory(new WinstonLoggerFactory('info'));
 
   const manager = await ComponentsManager.build({
-    mainModulePath,
+    mainModulePath: rootDir,
     logLevel: 'silly',
     typeChecking: false,
   });
@@ -40,7 +32,6 @@ export const launch: () => Promise<void> = async () => {
 
   const umaServer: ServerInitializer = await manager.instantiate('urn:uma:default:NodeHttpServer',{variables});
   await umaServer.handleSafe();
-
 };
 
 launch();

packages/uma/bin/odrl.ts

@@ -10,28 +10,20 @@ const baseUrl = `${protocol}://${host}:${port}/uma`;
 const rootDir = path.join(__dirname, '../');
 
 export const launch: () => Promise<void> = async () => {
-
     const variables: Record<string, any> = {};
 
     variables['urn:uma:variables:port'] = port;
-    variables['urn:uma:variables:host'] = host;
-    variables['urn:uma:variables:protocol'] = protocol;
     variables['urn:uma:variables:baseUrl'] = baseUrl;
 
     variables['urn:uma:variables:policyDir'] = path.join(rootDir, './config/rules/odrl');
-    // variables['urn:uma:variables:rulesDir'] = path.join(rootDir, './config/rules/n3');
     variables['urn:uma:variables:eyePath'] = 'eye';
 
-    variables['urn:uma:variables:mainModulePath'] = rootDir;
-    variables['urn:uma:variables:customConfigPath'] = path.join(rootDir, './config/odrl.json');
-
-    const mainModulePath = variables['urn:uma:variables:mainModulePath'];
-    const configPath = variables['urn:uma:variables:customConfigPath'];
+    const configPath = path.join(rootDir, './config/odrl.json');
 
     setGlobalLoggerFactory(new WinstonLoggerFactory('info'));
 
     const manager = await ComponentsManager.build({
-        mainModulePath,
+        mainModulePath: rootDir,
         logLevel: 'silly',
         typeChecking: false,
     });
@@ -40,7 +32,6 @@ export const launch: () => Promise<void> = async () => {
 
     const umaServer: ServerInitializer = await manager.instantiate('urn:uma:default:NodeHttpServer',{variables});
     await umaServer.handleSafe();
-
 };
 
 launch();

packages/uma/config/base_default.json

@@ -12,21 +12,11 @@
         "@id": "urn:uma:variables:baseUrl",
         "@type": "Variable"
       },
-      {
-        "comment": "Hostname of the server.",
-        "@id": "urn:uma:variables:host",
-        "@type": "Variable"
-      },
       {
         "comment": "Path to the directory containing the policy rules.",
         "@id": "urn:uma:variables:policyDir",
         "@type": "Variable"
       },
-      {
-        "comment": "Path to the directory containing the N3 rules.",
-        "@id": "urn:uma:variables:rulesDir",
-        "@type": "Variable"
-      },
       {
         "comment": "Path of the local eye reasoner.",
         "@id": "urn:uma:variables:eyePath",