|
|
@ -312,13 +312,10 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
|
|
|
|
VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
|
|
|
|
VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
|
|
|
|
JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
|
|
|
|
String device = "{ \"scope\":\"mqtt-publisher mqtt-subscriber\", \"deviceIdentifiers\":[{\"id\":\""+deviceId+"\", " +
|
|
|
|
String scopes = " device_" + deviceId;
|
|
|
|
"\"type\":\""+VirtualFireAlarmConstants.DEVICE_TYPE+"\"}]}";
|
|
|
|
|
|
|
|
Map<String, String> params = new HashMap<String, String>();
|
|
|
|
|
|
|
|
params.put("device", Base64.encodeBase64String(device.getBytes()));
|
|
|
|
|
|
|
|
AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(),
|
|
|
|
AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(),
|
|
|
|
apiApplicationKey.getConsumerSecret(), owner,
|
|
|
|
apiApplicationKey.getConsumerSecret(), owner,
|
|
|
|
null, params);
|
|
|
|
scopes);
|
|
|
|
String accessToken = accessTokenInfo.getAccessToken();
|
|
|
|
String accessToken = accessTokenInfo.getAccessToken();
|
|
|
|
String refreshToken = accessTokenInfo.getRefreshToken();
|
|
|
|
String refreshToken = accessTokenInfo.getRefreshToken();
|
|
|
|
XmppAccount newXmppAccount = new XmppAccount();
|
|
|
|
XmppAccount newXmppAccount = new XmppAccount();
|
|
|
|