amikhalev/sprinklers3
1
1
Fork 0
Code Issues 9 Pull Requests 1 Releases Wiki Activity

add clientId to device connect endpoint
All checks were successful
continuous-integration/drone the build was successful
Details

Browse Source
This commit is contained in:
Alex Mikhalev 2018-12-12 00:43:42 -08:00
parent 0aa587551f
commit 8c49cabc35
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/express/api/devices.ts
View File

@ -5,6 +5,7 @@ import { serialize } from "serializr";
import ApiError from "@common/ApiError"; import ApiError from "@common/ApiError";
import { ErrorCode } from "@common/ErrorCode"; import { ErrorCode } from "@common/ErrorCode";
import * as schema from "@common/sprinklersRpc/schema"; import * as schema from "@common/sprinklersRpc/schema";
import { DeviceToken } from "@common/TokenClaims";
import { generateDeviceToken } from "@server/authentication"; import { generateDeviceToken } from "@server/authentication";
import { SprinklersDevice } from "@server/entities"; import { SprinklersDevice } from "@server/entities";
import { verifyAuthorization } from "@server/express/verifyAuthorization"; import { verifyAuthorization } from "@server/express/verifyAuthorization";
@ -50,6 +51,13 @@ export function devices(state: ServerState) {
} }
router.get("/:deviceId", verifyAuthorization(), async (req, res) => { router.get("/:deviceId", verifyAuthorization(), async (req, res) => {
const deviceInfo = await verifyUserDevice(req);
res.send({
id: deviceInfo.id, deviceId: deviceInfo.deviceId, name: deviceInfo.name
})
});
router.get("/:deviceId/data", verifyAuthorization(), async (req, res) => {
await verifyUserDevice(req); await verifyUserDevice(req);
const device = state.mqttClient.acquireDevice(req.params.deviceId); const device = state.mqttClient.acquireDevice(req.params.deviceId);
const j = serialize(schema.sprinklersDevice, device); const j = serialize(schema.sprinklersDevice, device);
@ -98,8 +106,13 @@ export function devices(state: ServerState) {
type: "device" type: "device"
}), }),
async (req, res) => { async (req, res) => {
const token: DeviceToken = req.token! as any;
const deviceId = token.aud;
const clientId = `device-${deviceId}`;
res.send({ res.send({
url: state.mqttUrl mqttUrl: state.mqttUrl,
deviceId,
clientId,
}); });
} }
); );