...
|
...
|
@@ -164,22 +164,25 @@ public class DefaultTransportApiService implements TransportApiService { |
164
|
164
|
}
|
165
|
165
|
|
166
|
166
|
private ListenableFuture<TransportApiResponseMsg> validateCredentials(TransportProtos.ValidateBasicMqttCredRequestMsg mqtt) {
|
167
|
|
- DeviceCredentials credentials = deviceCredentialsService.findDeviceCredentialsByCredentialsId(mqtt.getUserName());
|
168
|
|
- if (credentials != null) {
|
169
|
|
- if (credentials.getCredentialsType() == DeviceCredentialsType.ACCESS_TOKEN) {
|
170
|
|
- return getDeviceInfo(credentials.getDeviceId(), credentials);
|
171
|
|
- } else if (credentials.getCredentialsType() == DeviceCredentialsType.MQTT_BASIC) {
|
172
|
|
- if (!checkMqttCredentials(mqtt, credentials)) {
|
173
|
|
- credentials = null;
|
|
167
|
+ DeviceCredentials credentials = null;
|
|
168
|
+ if (mqtt.getUserName() != null) {
|
|
169
|
+ credentials = deviceCredentialsService.findDeviceCredentialsByCredentialsId(mqtt.getUserName());
|
|
170
|
+ if (credentials != null) {
|
|
171
|
+ if (credentials.getCredentialsType() == DeviceCredentialsType.ACCESS_TOKEN) {
|
|
172
|
+ return getDeviceInfo(credentials.getDeviceId(), credentials);
|
|
173
|
+ } else if (credentials.getCredentialsType() == DeviceCredentialsType.MQTT_BASIC) {
|
|
174
|
+ if (!checkMqttCredentials(mqtt, credentials)) {
|
|
175
|
+ credentials = null;
|
|
176
|
+ }
|
174
|
177
|
}
|
175
|
178
|
}
|
176
|
|
- }
|
177
|
|
- if (credentials == null) {
|
178
|
|
- credentials = checkMqttCredentials(mqtt, EncryptionUtil.getSha3Hash("|", mqtt.getClientId(), mqtt.getUserName()));
|
179
|
179
|
if (credentials == null) {
|
180
|
|
- credentials = checkMqttCredentials(mqtt, EncryptionUtil.getSha3Hash(mqtt.getClientId()));
|
|
180
|
+ credentials = checkMqttCredentials(mqtt, EncryptionUtil.getSha3Hash("|", mqtt.getClientId(), mqtt.getUserName()));
|
181
|
181
|
}
|
182
|
182
|
}
|
|
183
|
+ if (credentials == null) {
|
|
184
|
+ credentials = checkMqttCredentials(mqtt, EncryptionUtil.getSha3Hash(mqtt.getClientId()));
|
|
185
|
+ }
|
183
|
186
|
if (credentials != null) {
|
184
|
187
|
return getDeviceInfo(credentials.getDeviceId(), credentials);
|
185
|
188
|
} else {
|
...
|
...
|
|