From 982ecfec2ea3241357a3e8c29923146fe317b087 Mon Sep 17 00:00:00 2001 From: Evgenii Abramov Date: Sat, 13 Mar 2021 10:49:47 +0300 Subject: [PATCH] ESLint refactoring --- config.orig.js | 280 +++++++++++++++++++++++------------------------ routes/oauth2.js | 10 +- 2 files changed, 145 insertions(+), 145 deletions(-) diff --git a/config.orig.js b/config.orig.js index 0b4e974..141e15c 100644 --- a/config.orig.js +++ b/config.orig.js @@ -1,157 +1,157 @@ module.exports = { - mqtt: { - host: 'localhost', - port: 1883, - user: 'user', - password: 'password', - }, - - https: { - privateKey: '/etc/letsencrypt/live/your.domain.ru/privkey.pem', - certificate: '/etc/letsencrypt/live/your.domain.ru/fullchain.pem', - port: 4433, - }, - - clients: [ - { - id: '1', - name: 'Yandex', - clientId: 'client', - clientSecret: 'secret', - isTrusted: false, - }, - ], - - users: [ - { - id: '1', - username: 'admin', - password: 'admin', - name: 'Administrator', - }, - { - id: '2', - username: 'user1', - password: 'user1', - name: 'User', - }, - ], - - devices: [ - { - id: 'haw-002-switch', - name: 'Свет в коридоре', - room: 'Коридор', - type: 'devices.types.light', - mqtt: [ - { - instance: 'on', - set: '/yandex/controls/light_HaW_002/state/on', - state: '/yandex/controls/light_HaW_002/state', - }, - ], - capabilities: [ - { - type: 'devices.capabilities.on_off', - retrievable: true, - }, - ], + mqtt: { + host: 'localhost', + port: 1883, + user: 'user', + password: 'password', }, - { - id: 'lvr-003-switch', - name: 'Основной свет', - room: 'Гостиная', - type: 'devices.types.light', - mqtt: [ - { - instance: 'on', - set: '/yandex/controls/light_LvR_003/state/on', - state: '/yandex/controls/light_LvR_003/state', - }, - ], - valueMapping: [ - { - type: 'on_off', - mapping: [[false, true], [0, 1]], // [yandex, mqtt] - }, - ], - capabilities: [ - { - type: 'devices.capabilities.on_off', - retrievable: true, - }, - ], + https: { + privateKey: '/etc/letsencrypt/live/your.domain.ru/privkey.pem', + certificate: '/etc/letsencrypt/live/your.domain.ru/fullchain.pem', + port: 4433, }, - { - id: 'lvr-001-weather', - name: 'В гостиной', - room: 'Гостиная', - type: 'devices.types.sensor', - mqtt: [ + clients: [ { - instance: 'temperature', - state: '/yandex/sensors/LvR_001_Weather/temperature', + id: '1', + name: 'Yandex', + clientId: 'client', + clientSecret: 'secret', + isTrusted: false, }, - { - instance: 'humidity', - state: '/yandex/sensors/LvR_001_Weather/humidity', - }, - ], - properties: [ - { - type: 'devices.properties.float', - retrievable: true, - parameters: { - instance: 'temperature', - unit: 'unit.temperature.celsius', - }, - }, - { - type: 'devices.properties.float', - retrievable: true, - parameters: { - instance: 'humidity', - unit: 'unit.percent', - }, - }, - ], - }, + ], - { - id: 'plug-001-flower', - name: 'Розетка для цветка', - room: 'Гостиная', - type: 'devices.types.socket', - mqtt: [ + users: [ { - instance: 'on', - set: '/yandex/controls/socket_LvR_002/state/on', - state: '/yandex/controls/socket_LvR_002/state/on', + id: '1', + username: 'admin', + password: 'admin', + name: 'Administrator', }, { - instance: 'power', - state: '/yandex/controls/socket_LvR_002/power', + id: '2', + username: 'user1', + password: 'user1', + name: 'User', }, - ], - capabilities: [ + ], + + devices: [ { - type: 'devices.capabilities.on_off', - retrievable: true, + id: 'haw-002-switch', + name: 'Свет в коридоре', + room: 'Коридор', + type: 'devices.types.light', + mqtt: [ + { + instance: 'on', + set: '/yandex/controls/light_HaW_002/state/on', + state: '/yandex/controls/light_HaW_002/state', + }, + ], + capabilities: [ + { + type: 'devices.capabilities.on_off', + retrievable: true, + }, + ], }, - ], - properties: [ + { - type: 'devices.properties.float', - retrievable: true, - parameters: { - instance: 'power', - unit: 'unit.watt', - }, + id: 'lvr-003-switch', + name: 'Основной свет', + room: 'Гостиная', + type: 'devices.types.light', + mqtt: [ + { + instance: 'on', + set: '/yandex/controls/light_LvR_003/state/on', + state: '/yandex/controls/light_LvR_003/state', + }, + ], + valueMapping: [ + { + type: 'on_off', + mapping: [[false, true], [0, 1]], // [yandex, mqtt] + }, + ], + capabilities: [ + { + type: 'devices.capabilities.on_off', + retrievable: true, + }, + ], }, - ], - }, - /* --- end */ - ], + + { + id: 'lvr-001-weather', + name: 'В гостиной', + room: 'Гостиная', + type: 'devices.types.sensor', + mqtt: [ + { + instance: 'temperature', + state: '/yandex/sensors/LvR_001_Weather/temperature', + }, + { + instance: 'humidity', + state: '/yandex/sensors/LvR_001_Weather/humidity', + }, + ], + properties: [ + { + type: 'devices.properties.float', + retrievable: true, + parameters: { + instance: 'temperature', + unit: 'unit.temperature.celsius', + }, + }, + { + type: 'devices.properties.float', + retrievable: true, + parameters: { + instance: 'humidity', + unit: 'unit.percent', + }, + }, + ], + }, + + { + id: 'plug-001-flower', + name: 'Розетка для цветка', + room: 'Гостиная', + type: 'devices.types.socket', + mqtt: [ + { + instance: 'on', + set: '/yandex/controls/socket_LvR_002/state/on', + state: '/yandex/controls/socket_LvR_002/state/on', + }, + { + instance: 'power', + state: '/yandex/controls/socket_LvR_002/power', + }, + ], + capabilities: [ + { + type: 'devices.capabilities.on_off', + retrievable: true, + }, + ], + properties: [ + { + type: 'devices.properties.float', + retrievable: true, + parameters: { + instance: 'power', + unit: 'unit.watt', + }, + }, + ], + }, + /* --- end */ + ], }; diff --git a/routes/oauth2.js b/routes/oauth2.js index fd316b2..ae44654 100644 --- a/routes/oauth2.js +++ b/routes/oauth2.js @@ -47,7 +47,7 @@ server.deserializeClient((id, done) => { server.grant(oauth2orize.grant.code((client, redirectUri, user, ares, done) => { const code = utils.getUid(16); - db.authorizationCodes.save(code, client.id, redirectUri, user.id, user.username, (error) => { + db.authorizationCodes.save(code, client.id, redirectUri, user.id, user.username, error => { if (error) return done(error); return done(null, code); }); @@ -61,7 +61,7 @@ server.grant(oauth2orize.grant.code((client, redirectUri, user, ares, done) => { server.grant(oauth2orize.grant.token((client, user, ares, done) => { const token = utils.getUid(256); - db.accessTokens.save(token, user.id, client.clientId, (error) => { + db.accessTokens.save(token, user.id, client.clientId, error => { if (error) return done(error); return done(null, token); }); @@ -81,7 +81,7 @@ server.exchange(oauth2orize.exchange.code((client, code, redirectUri, done) => { if (redirectUri !== authCode.redirectUri) return done(null, false); const token = utils.getUid(256); - db.accessTokens.save(token, authCode.userId, authCode.clientId, (error) => { + db.accessTokens.save(token, authCode.userId, authCode.clientId, error => { if (error) return done(error); // Add custom params, e.g. the username let params = { username: authCode.userName }; @@ -109,7 +109,7 @@ server.exchange(oauth2orize.exchange.password((client, username, password, scope if (password !== user.password) return done(null, false); // Everything validated, return the token const token = utils.getUid(256); - db.accessTokens.save(token, user.id, client.clientId, (error) => { + db.accessTokens.save(token, user.id, client.clientId, error => { if (error) return done(error); // Call `done(err, accessToken, [refreshToken], [params])`, see oauth2orize.exchange.code return done(null, token); @@ -132,7 +132,7 @@ server.exchange(oauth2orize.exchange.clientCredentials((client, scope, done) => // Everything validated, return the token const token = utils.getUid(256); // Pass in a null for user id since there is no user with this grant type - db.accessTokens.save(token, null, client.clientId, (error) => { + db.accessTokens.save(token, null, client.clientId, error => { if (error) return done(error); // Call `done(err, accessToken, [refreshToken], [params])`, see oauth2orize.exchange.code return done(null, token);