1484 Commits

Author SHA1 Message Date
oyurov
87d7886d63 Added test for getRedirectUrl method 2022-11-18 10:55:20 +01:00
Andrii Shvaika
0d1412cd46 Merge branch 'jwt-random' of github.com:smatvienko-tb/thingsboard 2022-11-17 11:50:56 +02:00
Igor Kulikov
02b49751d0
Merge pull request #7615 from ViacheslavKlimov/improvement/mvel-invoke-service
[3.4.2] MVEL scripts caching
2022-11-15 14:07:40 +02:00
Sergey Matvienko
7e5ab3bff7 JWT settings refactored packages, Swagger documented, rest client getJwtSettings and saveJwtSettings added 2022-11-14 18:52:57 +01:00
ViacheslavKlimov
dee81fea26 MVEL scripts caching 2022-11-14 18:00:19 +02:00
Sergey Matvienko
4fc13b7938 Merge remote-tracking branch 'ce/master' into jwt-random 2022-11-14 14:32:02 +01:00
Sergey Matvienko
46b2adeb2c jwt settings added message on base64 validation exception, default key is to be validated ok, tests added 2022-11-14 13:43:56 +01:00
zbeacon
d4ea646174 Changed expected exception such as we have not connected client 2022-11-14 13:02:29 +02:00
Volodymyr Babak
8a29dc294e mute TelemetryEdgeSqlTest that causes a lot of randomly generated errors 2022-11-11 17:41:12 +02:00
imbeacon
05f92d7222 Updated BasicMqttCredentials processing 2022-11-11 17:28:00 +02:00
imbeacon
dfbf3a9cd8 Test fixes, keep logic for auth for mqtt v3 2022-11-11 15:39:59 +02:00
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +02:00
imbeacon
885c1c3d88 Updated ConAck message building 2022-11-10 18:31:34 +02:00
imbeacon
02d9fef0f1 Added Mqtt v5 reason codes for ack messages and tests 2022-11-10 17:55:31 +02:00
ViacheslavKlimov
6e8dba6e2c More tests for notifications 2022-11-10 15:42:29 +02:00
Volodymyr Babak
d8a6093442 Added TbSendRPCReplyNodeTest 2022-11-10 11:36:46 +02:00
Sergey Matvienko
17a50ab70b Merge remote-tracking branch 'ce/master' into jwt-random
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/security/auth/TokenOutdatingService.java
#	application/src/test/java/org/thingsboard/server/service/security/auth/TokenOutdatingTest.java
2022-11-10 09:54:27 +01:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +02:00
Volodymyr Babak
8b46b30747 Merge remote-tracking branch 'upstream/master' into feature/edge-rpc-call-from-device 2022-11-09 18:34:01 +02:00
Andrew Shvayka
08534d68c5
Merge pull request #7544 from dmytro-landiak/inactivity-fix
[3.4.2] inactivity timeout fix
2022-11-09 16:15:09 +02:00
dlandiak
4a3e867155 fix tests in device state svc 2022-11-09 15:57:18 +02:00
dlandiak
3cb94532fa get inactivity using entity data query instead of separate attribute fetch request 2022-11-09 14:03:37 +02:00
Andrew Shvayka
0d626c5c88
Merge pull request #7564 from AndriiLandiak/edge-event-partition
[3.4.2] Table partitioning for edge event.
2022-11-09 13:31:52 +02:00
Andrew Shvayka
f6b4406341
Merge pull request #7518 from smatvienko-tb/cassandra-cloud-astra
[3.4.2] Cassandra cloud connects to Datastax Astra DB
2022-11-09 13:10:38 +02:00
Igor Kulikov
1ed5e5b115
Merge pull request #7554 from dmytro-landiak/alarm-subscriptions
[3.4.2] Fix alarm subscriptions on rest api
2022-11-08 16:18:45 +02:00
ViacheslavKlimov
165e86c82b Notification rules processing; refactoring 2022-11-08 16:04:50 +02:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
ViacheslavKlimov
b73e89d691 Merge remote-tracking branch 'dmytro-landiak/alarm-subscriptions' into feature/notification-system 2022-11-08 12:33:05 +02:00
Andrii Shvaika
7ce3af709b Fix broken test logic 2022-11-08 11:56:14 +02:00
Andrii Landiak
ebb29ca200 Refactoring code and optimize import 2022-11-07 18:17:12 +02:00
Andrii Shvaika
0873b9e158 Improvements to #7434 2022-11-07 18:12:28 +02:00
Andrii Landiak
d0090f8b7a Removed unnecessary unused case for DataUpdateService 2022-11-07 17:52:44 +02:00
Andrii Shvaika
6e33b09205 Merge branch 'feature/jwt-token-outdate-on-logout' of github.com:CooL16/thingsboard 2022-11-07 17:30:23 +02:00
Andrii Landiak
11ee41bf34 Adding partition to edge_event table 2022-11-07 14:42:49 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +02:00
ViacheslavKlimov
e391459343 Merge remote-tracking branch 'origin/master' into feature/notification-system
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
2022-11-06 18:55:41 +02:00
dlandiak
bce6249eeb fix alarm subscriptions on rest api 2022-11-04 17:28:09 +02:00
ViacheslavKlimov
3734a0da49 Notifications api permission checks, WS improvements, new target configs 2022-11-04 15:29:15 +02:00
dlandiak
52d7da7afd inactivity timeout fix - get from attr when persist to telemetry and default found 2022-11-04 10:33:08 +02:00
oyurov
3ab1f34594 Clean code 2022-11-02 14:07:49 +01:00
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00
ShvaykaD
fea91220f0 fix error in merge with master 2022-11-02 12:55:03 +02:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
oyurov
215a44b7c7 Added tests 2022-11-02 09:19:51 +01:00
oyurov
d10289253f Refactor 2022-11-02 08:46:58 +01:00
Sergey Matvienko
db3ca06f4d Merge remote-tracking branch 'ce/master' into jwt-random
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/AdminController.java
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
2022-11-01 20:05:50 +02:00
Andrii Shvaika
c10e491de7 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-11-01 16:56:55 +02:00
Andrii Shvaika
08b226c18f Bump Cassandra versions 2022-11-01 16:56:47 +02:00
Sergey Matvienko
069e77eb17 Merge remote-tracking branch 'ce/master' into cassandra-cloud-astra 2022-11-01 14:11:58 +02:00
Volodymyr Babak
ba645e4570 Merge remote-tracking branch 'upstream/master' into feature/edge-limit-attempt 2022-11-01 11:04:56 +02:00