feat: es6+mods

This commit is contained in:
Andres 2023-10-06 22:11:40 +02:00
commit 19c92ed244
19 changed files with 179 additions and 245 deletions

View file

@ -1,8 +1,7 @@
const db = require("../utils/db");
const verifyHash = require("pbkdf2-wrapper/verifyHash");
import { db } from "../utils/db.js";
import verifyHash from "pbkdf2-wrapper/verifyHash.js";
exports.authorize = authorize;
async function authorize(username, password, callback) {
export async function authorize(username, password, callback) {
try {
var users = await db.get("users");
} catch (err) {
@ -18,8 +17,7 @@ async function authorize(username, password, callback) {
}
}
exports.isAuthorized = isAuthorized;
async function isAuthorized(req, res, next) {
export async function isAuthorized(req, res, next) {
if (process.env.ZU_DISABLE_AUTH === "true") {
next();
} else {

View file

@ -1,9 +1,9 @@
const _ = require("lodash");
const axios = require("axios");
import _ from "lodash";
import axios from "axios";
const api = require("../utils/controller-api");
const db = require("../utils/db");
const getZTAddress = require("../utils/zt-address");
import { api } from "../utils/controller-api.js";
import { db } from "../utils/db.js";
import { getZTAddress } from "../utils/zt-address.js";
let ZT_ADDRESS = null;
getZTAddress().then(function (address) {
@ -91,8 +91,7 @@ async function filterDeleted(nwid, mid) {
else return;
}
exports.getMembersData = getMembersData;
async function getMembersData(nwid, mids) {
export async function getMembersData(nwid, mids) {
const prefix = "/controller/network/" + nwid + "/member/";
const filtered = (
await Promise.all(mids.map(async (mid) => await filterDeleted(nwid, mid)))
@ -119,8 +118,7 @@ async function getMembersData(nwid, mids) {
return data;
}
exports.updateMemberAdditionalData = updateMemberAdditionalData;
async function updateMemberAdditionalData(nwid, mid, data) {
export async function updateMemberAdditionalData(nwid, mid, data) {
if (data.config && data.config.authorized) {
db.get("networks")
.filter({ id: nwid })
@ -172,8 +170,7 @@ async function updateMemberAdditionalData(nwid, mid, data) {
}
}
exports.deleteMemberAdditionalData = deleteMemberAdditionalData;
async function deleteMemberAdditionalData(nwid, mid) {
export async function deleteMemberAdditionalData(nwid, mid) {
// ZT controller bug
/* db.get("networks")
.find({ id: nwid })

View file

@ -1,11 +1,11 @@
const _ = require("lodash");
const axios = require("axios");
import _ from "lodash";
import axios from "axios";
const api = require("../utils/controller-api");
const db = require("../utils/db");
const constants = require("../utils/constants");
import { api } from "../utils/controller-api.js";
import { db } from "../utils/db.js";
import { defaultRulesSource } from "../utils/constants.js";
async function getNetworkAdditionalData(data) {
export async function getNetworkAdditionalData(data) {
let additionalData = db
.get("networks")
.find({ id: data.id })
@ -29,8 +29,7 @@ async function getNetworkAdditionalData(data) {
};
}
exports.getNetworksData = getNetworksData;
async function getNetworksData(nwids) {
export async function getNetworksData(nwids) {
const prefix = "/controller/network/";
const links = nwids.map((nwid) => prefix + nwid);
@ -54,13 +53,12 @@ async function getNetworksData(nwids) {
return data;
}
exports.createNetworkAdditionalData = createNetworkAdditionalData;
async function createNetworkAdditionalData(nwid) {
export async function createNetworkAdditionalData(nwid) {
const saveData = {
id: nwid,
additionalConfig: {
description: "",
rulesSource: constants.defaultRulesSource,
rulesSource: defaultRulesSource,
tagsByName: {},
capabilitiesByName: {},
},
@ -70,8 +68,7 @@ async function createNetworkAdditionalData(nwid) {
db.get("networks").push(saveData).write();
}
exports.updateNetworkAdditionalData = updateNetworkAdditionalData;
async function updateNetworkAdditionalData(nwid, data) {
export async function updateNetworkAdditionalData(nwid, data) {
let additionalData = {};
if (data.hasOwnProperty("description")) {
@ -96,7 +93,6 @@ async function updateNetworkAdditionalData(nwid, data) {
}
}
exports.deleteNetworkAdditionalData = deleteNetworkAdditionalData;
async function deleteNetworkAdditionalData(nwid) {
export async function deleteNetworkAdditionalData(nwid) {
db.get("networks").remove({ id: nwid }).write();
}