diff --git a/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/PubNub.kt b/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/PubNub.kt index 676d6f5c58..4e67d9309f 100644 --- a/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/PubNub.kt +++ b/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/PubNub.kt @@ -277,6 +277,14 @@ interface PubNub : EventEmitter, StatusEmitter { * Each type of resource have different set of permissions. To know what's possible for each of them * check ChannelGrant, ChannelGroupGrant and UUIDGrant. */ + @Deprecated( + replaceWith = + ReplaceWith( + "grantToken(ttl)" + ), + level = DeprecationLevel.WARNING, + message = "Use grantToken(ttl) instead", + ) fun grantToken(): GrantTokenBuilder /** diff --git a/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenBuilder.java b/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenBuilder.java index 4944ddc2c0..1a952f4454 100644 --- a/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenBuilder.java +++ b/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenBuilder.java @@ -30,9 +30,12 @@ public interface GrantTokenBuilder extends Endpoint<PNGrantTokenResult> { GrantTokenObjectsBuilder authorizedUUID(String authorizedUUID); + @Deprecated GrantTokenEntitiesBuilder authorizedUserId(UserId userId); + @Deprecated GrantTokenEntitiesBuilder spacesPermissions(List<SpacePermissions> spacesPermissions); + @Deprecated GrantTokenEntitiesBuilder usersPermissions(List<UserPermissions> usersPermissions); } diff --git a/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenEntitiesBuilder.java b/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenEntitiesBuilder.java index d5b539df52..d5f8829efb 100644 --- a/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenEntitiesBuilder.java +++ b/pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/endpoints/access/builder/GrantTokenEntitiesBuilder.java @@ -10,12 +10,15 @@ public interface GrantTokenEntitiesBuilder extends Endpoint<PNGrantTokenResult> { + @Deprecated GrantTokenEntitiesBuilder meta(Object meta); + @Deprecated GrantTokenEntitiesBuilder spacesPermissions(List<SpacePermissions> spacesPermissions); + @Deprecated GrantTokenEntitiesBuilder usersPermissions(List<UserPermissions> usersPermissions); + @Deprecated GrantTokenEntitiesBuilder authorizedUserId(UserId userId); - } diff --git a/pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/pam/GrantTokenIT.java b/pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/pam/GrantTokenIT.java index 84e177bdbe..75edf73dec 100644 --- a/pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/pam/GrantTokenIT.java +++ b/pubnub-gson/pubnub-gson-impl/src/integrationTest/java/com/pubnub/api/integration/pam/GrantTokenIT.java @@ -63,8 +63,7 @@ public void happyPath() throws PubNubException { //when final PNGrantTokenResult grantTokenResponse = pubNubUnderTest - .grantToken() - .ttl(expectedTTL) + .grantToken(expectedTTL) .channels(Arrays.asList(ChannelGrant.name(expectedChannelResourceName).delete(), ChannelGrant.pattern(expectedChannelPattern).write())) .channelGroups(Arrays.asList(ChannelGroupGrant.id(expectedChannelGroupResourceId).read(), diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/jvmMain/kotlin/com/pubnub/api/PubNub.kt b/pubnub-kotlin/pubnub-kotlin-api/src/jvmMain/kotlin/com/pubnub/api/PubNub.kt index cc1d1a69f3..870e30f833 100644 --- a/pubnub-kotlin/pubnub-kotlin-api/src/jvmMain/kotlin/com/pubnub/api/PubNub.kt +++ b/pubnub-kotlin/pubnub-kotlin-api/src/jvmMain/kotlin/com/pubnub/api/PubNub.kt @@ -1090,6 +1090,13 @@ actual interface PubNub : StatusEmitter, EventEmitter { * @param spacesPermissions List of all space grants * @param usersPermissions List of all userId grants */ + @Deprecated( + level = DeprecationLevel.WARNING, + message = "This function is deprecated. Use the new grantToken(ttl, userId, meta, authorizedUUID, channels, channelGroups, uuids)", + replaceWith = ReplaceWith( + "grantToken(ttl, meta, authorizedUUID, channels, channelGroups, uuids)" + ) + ) fun grantToken( ttl: Int, meta: Any? = null,