From 2df6e16ca9d997d891cd190bfdcf62acf09858f8 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 23 Nov 2020 10:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/official/JetLinksAuthenticator.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java b/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java index 2fc6dce..6b880a0 100644 --- a/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java +++ b/src/main/java/org/jetlinks/protocol/official/JetLinksAuthenticator.java @@ -3,10 +3,7 @@ package org.jetlinks.protocol.official; import org.apache.commons.codec.digest.DigestUtils; import org.jetlinks.core.Value; import org.jetlinks.core.defaults.Authenticator; -import org.jetlinks.core.device.AuthenticationRequest; -import org.jetlinks.core.device.AuthenticationResponse; -import org.jetlinks.core.device.DeviceOperator; -import org.jetlinks.core.device.MqttAuthenticationRequest; +import org.jetlinks.core.device.*; import reactor.core.publisher.Mono; import javax.annotation.Nonnull; @@ -14,6 +11,15 @@ import java.util.concurrent.TimeUnit; public class JetLinksAuthenticator implements Authenticator { + @Override + public Mono authenticate(@Nonnull AuthenticationRequest request, @Nonnull DeviceRegistry registry) { + MqttAuthenticationRequest mqtt = ((MqttAuthenticationRequest) request); + + return registry + .getDevice(mqtt.getClientId()) + .flatMap(device -> authenticate(request, device)); + } + @Override public Mono authenticate(@Nonnull AuthenticationRequest request, @Nonnull DeviceOperator deviceOperation) { if (request instanceof MqttAuthenticationRequest) {