Skip to content

Commit fe9f173

Browse files
authored
Fix revoke token method signature (#375)
fix(pam): fix revoke token method signature Fix revoke token method signature where mistakenly expected object with `token` field. refactor(typo): fix typo in PAM types file name
1 parent 25b4c94 commit fe9f173

File tree

18 files changed

+57
-45
lines changed

18 files changed

+57
-45
lines changed

.pubnub.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
---
22
changelog:
3+
- date: 2024-05-22
4+
version: v8.2.1
5+
changes:
6+
- type: bug
7+
text: "Fix revoke token method signature where mistakenly expected object with `token` field."
38
- date: 2024-05-21
49
version: v8.2.0
510
changes:
@@ -988,7 +993,7 @@ supported-platforms:
988993
- 'Ubuntu 14.04 and up'
989994
- 'Windows 7 and up'
990995
version: 'Pubnub Javascript for Node'
991-
version: '8.2.0'
996+
version: '8.2.1'
992997
sdks:
993998
- full-name: PubNub Javascript SDK
994999
short-name: Javascript
@@ -1004,7 +1009,7 @@ sdks:
10041009
- distribution-type: source
10051010
distribution-repository: GitHub release
10061011
package-name: pubnub.js
1007-
location: https://github.com/pubnub/javascript/archive/refs/tags/v8.2.0.zip
1012+
location: https://github.com/pubnub/javascript/archive/refs/tags/v8.2.1.zip
10081013
requires:
10091014
- name: 'agentkeepalive'
10101015
min-version: '3.5.2'
@@ -1675,7 +1680,7 @@ sdks:
16751680
- distribution-type: library
16761681
distribution-repository: GitHub release
16771682
package-name: pubnub.js
1678-
location: https://github.com/pubnub/javascript/releases/download/v8.2.0/pubnub.8.2.0.js
1683+
location: https://github.com/pubnub/javascript/releases/download/v8.2.1/pubnub.8.2.1.js
16791684
requires:
16801685
- name: 'agentkeepalive'
16811686
min-version: '3.5.2'

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v8.2.1
2+
May 22 2024
3+
4+
#### Fixed
5+
- Fix revoke token method signature where mistakenly expected object with `token` field.
6+
17
## v8.2.0
28
May 21 2024
39

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Watch [Getting Started with PubNub JS SDK](https://app.dashcam.io/replay/64ee0d2
2828
npm install pubnub
2929
```
3030
* or download one of our builds from our CDN:
31-
* https://cdn.pubnub.com/sdk/javascript/pubnub.8.2.0.js
32-
* https://cdn.pubnub.com/sdk/javascript/pubnub.8.2.0.min.js
31+
* https://cdn.pubnub.com/sdk/javascript/pubnub.8.2.1.js
32+
* https://cdn.pubnub.com/sdk/javascript/pubnub.8.2.1.min.js
3333
3434
2. Configure your keys:
3535

dist/web/pubnub.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3810,7 +3810,7 @@
38103810
return base.PubNubFile;
38113811
},
38123812
get version() {
3813-
return '8.2.0';
3813+
return '8.2.1';
38143814
},
38153815
getVersion() {
38163816
return this.version;
@@ -12234,12 +12234,12 @@
1223412234
/**
1223512235
* Revoke token permission.
1223612236
*
12237-
* @param parameters - Request configuration parameters.
12237+
* @param token - Access token for which permissions should be revoked.
1223812238
* @param [callback] - Request completion handler callback.
1223912239
*
1224012240
* @returns Asynchronous revoke token response or `void` in case if `callback` provided.
1224112241
*/
12242-
revokeToken(parameters, callback) {
12242+
revokeToken(token, callback) {
1224312243
return __awaiter(this, void 0, void 0, function* () {
1224412244
throw new Error('Revoke Token error: PAM module disabled');
1224512245
});

dist/web/pubnub.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/core/components/configuration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const makeConfiguration = (base, setupCryptoModule) => {
110110
return base.PubNubFile;
111111
},
112112
get version() {
113-
return '8.2.0';
113+
return '8.2.1';
114114
},
115115
getVersion() {
116116
return this.version;

lib/core/pubnub-common.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,15 +1267,15 @@ class PubNubCore {
12671267
/**
12681268
* Revoke token permission.
12691269
*
1270-
* @param parameters - Request configuration parameters.
1270+
* @param token - Access token for which permissions should be revoked.
12711271
* @param [callback] - Request completion handler callback.
12721272
*
12731273
* @returns Asynchronous revoke token response or `void` in case if `callback` provided.
12741274
*/
1275-
revokeToken(parameters, callback) {
1275+
revokeToken(token, callback) {
12761276
return __awaiter(this, void 0, void 0, function* () {
12771277
if (process.env.PAM_MODULE !== 'disabled') {
1278-
const request = new revoke_token_1.RevokeTokenRequest(Object.assign(Object.assign({}, parameters), { keySet: this._configuration.keySet }));
1278+
const request = new revoke_token_1.RevokeTokenRequest({ token, keySet: this._configuration.keySet });
12791279
if (callback)
12801280
return this.sendRequest(request, callback);
12811281
return this.sendRequest(request);

lib/types/core/pubnub-common.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import * as History from './types/api/history';
1717
import * as MessageAction from './types/api/message-action';
1818
import * as FileSharing from './types/api/file-sharing';
1919
import { PubNubFileInterface } from './types/file';
20-
import * as PAM from './types/api/access-panager';
20+
import * as PAM from './types/api/access-manager';
2121
import { SubscriptionOptions } from '../entities/commonTypes';
2222
import { ChannelMetadata } from '../entities/ChannelMetadata';
2323
import { SubscriptionSet } from '../entities/SubscriptionSet';
@@ -692,18 +692,18 @@ export declare class PubNubCore<CryptographyTypes, FileConstructorParameters, Pl
692692
/**
693693
* Revoke token permission.
694694
*
695-
* @param parameters - Request configuration parameters.
695+
* @param token - Access token for which permissions should be revoked.
696696
* @param callback - Request completion handler callback.
697697
*/
698-
revokeToken(parameters: PAM.RevokeParameters, callback: ResultCallback<PAM.RevokeTokenResponse>): void;
698+
revokeToken(token: PAM.RevokeParameters, callback: ResultCallback<PAM.RevokeTokenResponse>): void;
699699
/**
700700
* Revoke token permission.
701701
*
702-
* @param parameters - Request configuration parameters.
702+
* @param token - Access token for which permissions should be revoked.
703703
*
704704
* @returns Asynchronous revoke token response.
705705
*/
706-
revokeToken(parameters: PAM.RevokeParameters): Promise<PAM.RevokeTokenResponse>;
706+
revokeToken(token: PAM.RevokeParameters): Promise<PAM.RevokeTokenResponse>;
707707
/**
708708
* Get current access token.
709709
*

lib/types/core/types/api/access-panager.d.ts renamed to lib/types/core/types/api/access-manager.d.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,10 @@ export type GrantTokenParameters = {
188188
* Response with generated access token.
189189
*/
190190
export type GrantTokenResponse = string;
191-
export type RevokeParameters = {
192-
/**
193-
* Access token for which permissions should be revoked.
194-
*/
195-
token: string;
196-
};
191+
/**
192+
* Access token for which permissions should be revoked.
193+
*/
194+
export type RevokeParameters = string;
197195
/**
198196
* Response with revoked access token.
199197
*/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pubnub",
3-
"version": "8.2.0",
3+
"version": "8.2.1",
44
"author": "PubNub <[email protected]>",
55
"description": "Publish & Subscribe Real-time Messaging with PubNub",
66
"scripts": {

src/core/components/configuration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export const makeConfiguration = (
169169
return base.PubNubFile;
170170
},
171171
get version(): string {
172-
return '8.2.0';
172+
return '8.2.1';
173173
},
174174
getVersion(): string {
175175
return this.version;

src/core/endpoints/access_manager/audit.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { TransportResponse } from '../../types/transport-response';
77
import { PubNubAPIError } from '../../../errors/pubnub-api-error';
88
import { AbstractRequest } from '../../components/request';
99
import RequestOperation from '../../constants/operations';
10-
import * as PAM from '../../types/api/access-panager';
10+
import * as PAM from '../../types/api/access-manager';
1111
import { KeySet, Query } from '../../types/api';
1212

1313
// --------------------------------------------------------

src/core/endpoints/access_manager/grant.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { TransportResponse } from '../../types/transport-response';
77
import { PubNubAPIError } from '../../../errors/pubnub-api-error';
88
import { AbstractRequest } from '../../components/request';
99
import RequestOperation from '../../constants/operations';
10-
import * as PAM from '../../types/api/access-panager';
10+
import * as PAM from '../../types/api/access-manager';
1111
import { KeySet, Query } from '../../types/api';
1212

1313
// --------------------------------------------------------

src/core/endpoints/access_manager/grant_token.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { PubNubAPIError } from '../../../errors/pubnub-api-error';
88
import { TransportMethod } from '../../types/transport-request';
99
import { AbstractRequest } from '../../components/request';
1010
import RequestOperation from '../../constants/operations';
11-
import * as PAM from '../../types/api/access-panager';
11+
import * as PAM from '../../types/api/access-manager';
1212
import { KeySet } from '../../types/api';
1313

1414
// --------------------------------------------------------

src/core/endpoints/access_manager/revoke_token.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { PubNubAPIError } from '../../../errors/pubnub-api-error';
88
import { TransportMethod } from '../../types/transport-request';
99
import { AbstractRequest } from '../../components/request';
1010
import RequestOperation from '../../constants/operations';
11-
import * as PAM from '../../types/api/access-panager';
11+
import * as PAM from '../../types/api/access-manager';
1212
import { encodeString } from '../../utils';
1313
import { KeySet } from '../../types/api';
1414

@@ -20,7 +20,12 @@ import { KeySet } from '../../types/api';
2020
/**
2121
* Request configuration parameters.
2222
*/
23-
type RequestParameters = PAM.RevokeParameters & {
23+
type RequestParameters = {
24+
/**
25+
* Access token for which permissions should be revoked.
26+
*/
27+
token: string;
28+
2429
/**
2530
* PubNub REST API access key set.
2631
*/

src/core/pubnub-common.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import { RevokeTokenRequest } from './endpoints/access_manager/revoke_token';
8080
import { GrantTokenRequest } from './endpoints/access_manager/grant_token';
8181
import { GrantRequest } from './endpoints/access_manager/grant';
8282
import { AuditRequest } from './endpoints/access_manager/audit';
83-
import * as PAM from './types/api/access-panager';
83+
import * as PAM from './types/api/access-manager';
8484
// endregion
8585
// region Entities
8686
import { SubscriptionOptions } from '../entities/commonTypes';
@@ -1906,34 +1906,34 @@ export class PubNubCore<
19061906
/**
19071907
* Revoke token permission.
19081908
*
1909-
* @param parameters - Request configuration parameters.
1909+
* @param token - Access token for which permissions should be revoked.
19101910
* @param callback - Request completion handler callback.
19111911
*/
1912-
public revokeToken(parameters: PAM.RevokeParameters, callback: ResultCallback<PAM.RevokeTokenResponse>): void;
1912+
public revokeToken(token: PAM.RevokeParameters, callback: ResultCallback<PAM.RevokeTokenResponse>): void;
19131913

19141914
/**
19151915
* Revoke token permission.
19161916
*
1917-
* @param parameters - Request configuration parameters.
1917+
* @param token - Access token for which permissions should be revoked.
19181918
*
19191919
* @returns Asynchronous revoke token response.
19201920
*/
1921-
public async revokeToken(parameters: PAM.RevokeParameters): Promise<PAM.RevokeTokenResponse>;
1921+
public async revokeToken(token: PAM.RevokeParameters): Promise<PAM.RevokeTokenResponse>;
19221922

19231923
/**
19241924
* Revoke token permission.
19251925
*
1926-
* @param parameters - Request configuration parameters.
1926+
* @param token - Access token for which permissions should be revoked.
19271927
* @param [callback] - Request completion handler callback.
19281928
*
19291929
* @returns Asynchronous revoke token response or `void` in case if `callback` provided.
19301930
*/
19311931
async revokeToken(
1932-
parameters: PAM.RevokeParameters,
1932+
token: PAM.RevokeParameters,
19331933
callback?: ResultCallback<PAM.RevokeTokenResponse>,
19341934
): Promise<PAM.RevokeTokenResponse | void> {
19351935
if (process.env.PAM_MODULE !== 'disabled') {
1936-
const request = new RevokeTokenRequest({ ...parameters, keySet: this._configuration.keySet });
1936+
const request = new RevokeTokenRequest({ token, keySet: this._configuration.keySet });
19371937

19381938
if (callback) return this.sendRequest(request, callback);
19391939
return this.sendRequest(request);

src/core/types/api/access-panager.ts renamed to src/core/types/api/access-manager.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,10 @@ export type GrantTokenResponse = string;
223223
// endregion
224224

225225
// region Revoke
226-
export type RevokeParameters = {
227-
/**
228-
* Access token for which permissions should be revoked.
229-
*/
230-
token: string;
231-
};
226+
/**
227+
* Access token for which permissions should be revoked.
228+
*/
229+
export type RevokeParameters = string;
232230

233231
/**
234232
* Response with revoked access token.

0 commit comments

Comments
 (0)