@microsoft/omnichannel-chat-sdk 2.0.2-main.c0f210d → 2.1.0-main.8f375cf
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -0
- package/lib/OmnichannelChatSDK.d.ts +28 -0
- package/lib/OmnichannelChatSDK.js +220 -70
- package/lib/OmnichannelChatSDK.js.map +1 -1
- package/lib/api/createVoiceVideoCalling.d.ts +1 -0
- package/lib/api/createVoiceVideoCalling.js +29 -17
- package/lib/api/createVoiceVideoCalling.js.map +1 -1
- package/lib/config/settings.d.ts +1 -1
- package/lib/config/settings.js +1 -1
- package/lib/core/ChatSDKConfig.d.ts +2 -0
- package/lib/core/messaging/ACSClient.d.ts +4 -1
- package/lib/core/messaging/ACSClient.js +214 -81
- package/lib/core/messaging/ACSClient.js.map +1 -1
- package/lib/core/messaging/ACSClientConfig.d.ts +3 -0
- package/lib/telemetry/TelemetryEvent.d.ts +2 -0
- package/lib/telemetry/TelemetryEvent.js +2 -0
- package/lib/telemetry/TelemetryEvent.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/utils/chatTokenRenewal.d.ts +4 -0
- package/lib/utils/chatTokenRenewal.js +17 -9
- package/lib/utils/chatTokenRenewal.js.map +1 -1
- package/lib/utils/chatTokenUnauthorizedRecovery.d.ts +64 -0
- package/lib/utils/chatTokenUnauthorizedRecovery.js +293 -0
- package/lib/utils/chatTokenUnauthorizedRecovery.js.map +1 -0
- package/lib/utils/createOmnichannelMessage.js +5 -0
- package/lib/utils/createOmnichannelMessage.js.map +1 -1
- package/lib/utils/messageUpdates.d.ts +10 -0
- package/lib/utils/messageUpdates.js +56 -0
- package/lib/utils/messageUpdates.js.map +1 -0
- package/package.json +1 -1
|
@@ -33,6 +33,10 @@ export declare const defaultChatTokenRenewalRetryCooldownInMs: number;
|
|
|
33
33
|
export declare const defaultChatTokenRenewalTimeoutInMs: number;
|
|
34
34
|
export declare const defaultNonRetriableStatusCodes: number[];
|
|
35
35
|
export declare const authenticatedNonRetriableStatusCodes: number[];
|
|
36
|
+
/**
|
|
37
|
+
* Returns the expiry of a JWT chat token in milliseconds since epoch, or undefined when it cannot be read.
|
|
38
|
+
*/
|
|
39
|
+
export declare const getChatTokenExpiresOnInMs: (token: unknown) => number | undefined;
|
|
36
40
|
/**
|
|
37
41
|
* Returns true when the token is a JWT whose exp claim is far enough in the future to be accepted by ACS.
|
|
38
42
|
*/
|
|
@@ -43,7 +43,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
43
43
|
}
|
|
44
44
|
};
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
|
-
exports.createChatTokenRefresher = exports.isChatTokenUsable = exports.authenticatedNonRetriableStatusCodes = exports.defaultNonRetriableStatusCodes = exports.defaultChatTokenRenewalTimeoutInMs = exports.defaultChatTokenRenewalRetryCooldownInMs = void 0;
|
|
46
|
+
exports.createChatTokenRefresher = exports.isChatTokenUsable = exports.getChatTokenExpiresOnInMs = exports.authenticatedNonRetriableStatusCodes = exports.defaultNonRetriableStatusCodes = exports.defaultChatTokenRenewalTimeoutInMs = exports.defaultChatTokenRenewalRetryCooldownInMs = void 0;
|
|
47
47
|
exports.defaultChatTokenRenewalRetryCooldownInMs = 60 * 1000;
|
|
48
48
|
exports.defaultChatTokenRenewalTimeoutInMs = 60 * 1000;
|
|
49
49
|
var minimumTokenLifetimeInMs = 60 * 1000;
|
|
@@ -63,29 +63,37 @@ var decodeBase64Url = function (value) {
|
|
|
63
63
|
return null;
|
|
64
64
|
};
|
|
65
65
|
/**
|
|
66
|
-
* Returns
|
|
66
|
+
* Returns the expiry of a JWT chat token in milliseconds since epoch, or undefined when it cannot be read.
|
|
67
67
|
*/
|
|
68
|
-
var
|
|
69
|
-
if (nowInMs === void 0) { nowInMs = Date.now(); }
|
|
68
|
+
var getChatTokenExpiresOnInMs = function (token) {
|
|
70
69
|
try {
|
|
71
70
|
if (typeof token !== "string" || token.trim().length === 0) {
|
|
72
|
-
return
|
|
71
|
+
return undefined;
|
|
73
72
|
}
|
|
74
73
|
var parts = token.split(".");
|
|
75
74
|
if (parts.length !== 3) {
|
|
76
|
-
return
|
|
75
|
+
return undefined;
|
|
77
76
|
}
|
|
78
77
|
var payload = decodeBase64Url(parts[1]);
|
|
79
78
|
if (!payload) {
|
|
80
|
-
return
|
|
79
|
+
return undefined;
|
|
81
80
|
}
|
|
82
81
|
var exp = JSON.parse(payload).exp;
|
|
83
|
-
return typeof exp === "number"
|
|
82
|
+
return typeof exp === "number" ? exp * 1000 : undefined;
|
|
84
83
|
}
|
|
85
84
|
catch (_a) {
|
|
86
|
-
return
|
|
85
|
+
return undefined;
|
|
87
86
|
}
|
|
88
87
|
};
|
|
88
|
+
exports.getChatTokenExpiresOnInMs = getChatTokenExpiresOnInMs;
|
|
89
|
+
/**
|
|
90
|
+
* Returns true when the token is a JWT whose exp claim is far enough in the future to be accepted by ACS.
|
|
91
|
+
*/
|
|
92
|
+
var isChatTokenUsable = function (token, nowInMs) {
|
|
93
|
+
if (nowInMs === void 0) { nowInMs = Date.now(); }
|
|
94
|
+
var expiresOnInMs = (0, exports.getChatTokenExpiresOnInMs)(token);
|
|
95
|
+
return expiresOnInMs !== undefined && expiresOnInMs > nowInMs + minimumTokenLifetimeInMs;
|
|
96
|
+
};
|
|
89
97
|
exports.isChatTokenUsable = isChatTokenUsable;
|
|
90
98
|
var getStatusCode = function (error) {
|
|
91
99
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatTokenRenewal.js","sourceRoot":"","sources":["../../src/utils/chatTokenRenewal.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BU,QAAA,wCAAwC,GAAG,EAAE,GAAG,IAAI,CAAC;AACrD,QAAA,kCAAkC,GAAG,EAAE,GAAG,IAAI,CAAC;AAC5D,IAAM,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAC;AAE3C,mHAAmH;AACtG,QAAA,8BAA8B,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAExE,+HAA+H;AAClH,QAAA,oCAAoC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAE/D,IAAM,eAAe,GAAG,UAAC,KAAa;IAClC,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3D,IAAM,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACrE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF;;GAEG;AACI,IAAM,
|
|
1
|
+
{"version":3,"file":"chatTokenRenewal.js","sourceRoot":"","sources":["../../src/utils/chatTokenRenewal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Recovers ACS chat requests that fail with 401 Unauthorized while the chat token has not expired, for example after
|
|
3
|
+
* the token was revoked.
|
|
4
|
+
*
|
|
5
|
+
* Recovery is fail-safe. It never throws, retries a failed request at most once, renews the token at most once per
|
|
6
|
+
* interval for a chat, stops renewing after ACS rejects several renewed tokens in a row, and gives the original 401
|
|
7
|
+
* back to the caller when no different usable token is available, which is exactly the behavior without recovery.
|
|
8
|
+
*/
|
|
9
|
+
import { ChatClientOptions } from "@azure/communication-chat";
|
|
10
|
+
import { CommunicationTokenCredential } from "@azure/communication-common";
|
|
11
|
+
export declare enum UnauthorizedRecoverySource {
|
|
12
|
+
ChatRequest = "ChatRequest"
|
|
13
|
+
}
|
|
14
|
+
export declare enum UnauthorizedRecoveryFailureReason {
|
|
15
|
+
/** Renewal did not return a different usable token. */
|
|
16
|
+
NoNewToken = "NoNewToken",
|
|
17
|
+
/** ACS returned 401 for the renewed token too. */
|
|
18
|
+
RenewedTokenRejected = "RenewedTokenRejected"
|
|
19
|
+
}
|
|
20
|
+
export interface ChatTokenUnauthorizedRecoveryParams {
|
|
21
|
+
initialToken: string;
|
|
22
|
+
/** Renews the chat token. Must never throw and returns the current token when renewal is not possible. */
|
|
23
|
+
refreshToken: () => Promise<string>;
|
|
24
|
+
onStart?: (source: UnauthorizedRecoverySource) => void;
|
|
25
|
+
/** Called when ACS accepts a renewed token, or when an existing newer token is used without renewing. */
|
|
26
|
+
onSuccess?: (source: UnauthorizedRecoverySource, usedExistingToken: boolean) => void;
|
|
27
|
+
onFailure?: (source: UnauthorizedRecoverySource, reason: UnauthorizedRecoveryFailureReason) => void;
|
|
28
|
+
minRenewalIntervalInMs?: number;
|
|
29
|
+
/** Renewals in a row whose token ACS also rejected, after which recovery stops renewing for the chat. */
|
|
30
|
+
maxRejectedRenewals?: number;
|
|
31
|
+
now?: () => number;
|
|
32
|
+
}
|
|
33
|
+
export interface ChatTokenUnauthorizedRecovery {
|
|
34
|
+
/** Returns the token to send: the given token, or the newest usable token known, whichever expires later. */
|
|
35
|
+
selectToken: (token: string) => string;
|
|
36
|
+
/** Records a token obtained outside recovery, such as a proactive renewal. */
|
|
37
|
+
observeToken: (token: string) => void;
|
|
38
|
+
/** Returns a different usable token to retry with after a 401, or undefined when none is available. */
|
|
39
|
+
recover: (failedToken: string | undefined, source: UnauthorizedRecoverySource) => Promise<string | undefined>;
|
|
40
|
+
/** Reports whether ACS accepted a request sent with the given token. */
|
|
41
|
+
reportTokenResult: (token: string, accepted: boolean) => void;
|
|
42
|
+
}
|
|
43
|
+
export declare const defaultUnauthorizedRecoveryMinRenewalIntervalInMs: number;
|
|
44
|
+
export declare const defaultUnauthorizedRecoveryMaxRejectedRenewals = 3;
|
|
45
|
+
export declare const createChatTokenUnauthorizedRecovery: (params: ChatTokenUnauthorizedRecoveryParams) => ChatTokenUnauthorizedRecovery;
|
|
46
|
+
type ChatAdditionalPolicy = NonNullable<ChatClientOptions["additionalPolicies"]>[number];
|
|
47
|
+
export declare const chatTokenUnauthorizedRecoveryPolicyName = "ChatTokenUnauthorizedRecoveryPolicy";
|
|
48
|
+
/**
|
|
49
|
+
* Pipeline policy for ACS chat requests. Runs after the authentication policy on every attempt, sends the newest
|
|
50
|
+
* usable token, and resends a request that failed with 401 once with a different usable token.
|
|
51
|
+
*/
|
|
52
|
+
export declare const createChatTokenUnauthorizedRecoveryPolicy: (recovery: ChatTokenUnauthorizedRecovery) => ChatAdditionalPolicy;
|
|
53
|
+
/**
|
|
54
|
+
* Credential that gives the newest usable token to ACS, including the real-time notification client, which reads
|
|
55
|
+
* the token from the credential instead of the request pipeline.
|
|
56
|
+
*/
|
|
57
|
+
export declare class ChatTokenUnauthorizedRecoveryCredential implements CommunicationTokenCredential {
|
|
58
|
+
private credential;
|
|
59
|
+
private recovery;
|
|
60
|
+
constructor(credential: CommunicationTokenCredential, recovery: ChatTokenUnauthorizedRecovery);
|
|
61
|
+
getToken(options?: Parameters<CommunicationTokenCredential["getToken"]>[0]): Promise<Awaited<ReturnType<CommunicationTokenCredential["getToken"]>>>;
|
|
62
|
+
dispose(): void;
|
|
63
|
+
}
|
|
64
|
+
export {};
|
|
@@ -0,0 +1,293 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Recovers ACS chat requests that fail with 401 Unauthorized while the chat token has not expired, for example after
|
|
4
|
+
* the token was revoked.
|
|
5
|
+
*
|
|
6
|
+
* Recovery is fail-safe. It never throws, retries a failed request at most once, renews the token at most once per
|
|
7
|
+
* interval for a chat, stops renewing after ACS rejects several renewed tokens in a row, and gives the original 401
|
|
8
|
+
* back to the caller when no different usable token is available, which is exactly the behavior without recovery.
|
|
9
|
+
*/
|
|
10
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
11
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
12
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
13
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
14
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
15
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
16
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
17
|
+
});
|
|
18
|
+
};
|
|
19
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
20
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
21
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
22
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
23
|
+
function step(op) {
|
|
24
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
25
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
26
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
27
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
28
|
+
switch (op[0]) {
|
|
29
|
+
case 0: case 1: t = op; break;
|
|
30
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
31
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
32
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
33
|
+
default:
|
|
34
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
35
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
36
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
37
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
38
|
+
if (t[2]) _.ops.pop();
|
|
39
|
+
_.trys.pop(); continue;
|
|
40
|
+
}
|
|
41
|
+
op = body.call(thisArg, _);
|
|
42
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
43
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
47
|
+
exports.ChatTokenUnauthorizedRecoveryCredential = exports.createChatTokenUnauthorizedRecoveryPolicy = exports.chatTokenUnauthorizedRecoveryPolicyName = exports.createChatTokenUnauthorizedRecovery = exports.defaultUnauthorizedRecoveryMaxRejectedRenewals = exports.defaultUnauthorizedRecoveryMinRenewalIntervalInMs = exports.UnauthorizedRecoveryFailureReason = exports.UnauthorizedRecoverySource = void 0;
|
|
48
|
+
var chatTokenRenewal_1 = require("./chatTokenRenewal");
|
|
49
|
+
var UnauthorizedRecoverySource;
|
|
50
|
+
(function (UnauthorizedRecoverySource) {
|
|
51
|
+
UnauthorizedRecoverySource["ChatRequest"] = "ChatRequest";
|
|
52
|
+
})(UnauthorizedRecoverySource || (exports.UnauthorizedRecoverySource = UnauthorizedRecoverySource = {}));
|
|
53
|
+
var UnauthorizedRecoveryFailureReason;
|
|
54
|
+
(function (UnauthorizedRecoveryFailureReason) {
|
|
55
|
+
/** Renewal did not return a different usable token. */
|
|
56
|
+
UnauthorizedRecoveryFailureReason["NoNewToken"] = "NoNewToken";
|
|
57
|
+
/** ACS returned 401 for the renewed token too. */
|
|
58
|
+
UnauthorizedRecoveryFailureReason["RenewedTokenRejected"] = "RenewedTokenRejected";
|
|
59
|
+
})(UnauthorizedRecoveryFailureReason || (exports.UnauthorizedRecoveryFailureReason = UnauthorizedRecoveryFailureReason = {}));
|
|
60
|
+
exports.defaultUnauthorizedRecoveryMinRenewalIntervalInMs = 60 * 1000;
|
|
61
|
+
exports.defaultUnauthorizedRecoveryMaxRejectedRenewals = 3;
|
|
62
|
+
var createChatTokenUnauthorizedRecovery = function (params) {
|
|
63
|
+
var _a, _b, _c;
|
|
64
|
+
var minRenewalIntervalInMs = (_a = params.minRenewalIntervalInMs) !== null && _a !== void 0 ? _a : exports.defaultUnauthorizedRecoveryMinRenewalIntervalInMs;
|
|
65
|
+
var maxRejectedRenewals = (_b = params.maxRejectedRenewals) !== null && _b !== void 0 ? _b : exports.defaultUnauthorizedRecoveryMaxRejectedRenewals;
|
|
66
|
+
var now = (_c = params.now) !== null && _c !== void 0 ? _c : (function () { return Date.now(); });
|
|
67
|
+
var latestToken = params.initialToken;
|
|
68
|
+
var lastRenewalTime = null;
|
|
69
|
+
var activeRenewal = null;
|
|
70
|
+
var rejectedRenewals = 0;
|
|
71
|
+
// Renewed token whose first ACS response has not been reported yet
|
|
72
|
+
var unverifiedRenewal = null;
|
|
73
|
+
var safeInvoke = function (callback) {
|
|
74
|
+
try {
|
|
75
|
+
callback();
|
|
76
|
+
}
|
|
77
|
+
catch (_a) {
|
|
78
|
+
// Telemetry callbacks must never break recovery
|
|
79
|
+
}
|
|
80
|
+
};
|
|
81
|
+
var isNewer = function (candidate, current) {
|
|
82
|
+
var candidateExpiresOn = (0, chatTokenRenewal_1.getChatTokenExpiresOnInMs)(candidate);
|
|
83
|
+
if (candidateExpiresOn === undefined) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
var currentExpiresOn = (0, chatTokenRenewal_1.getChatTokenExpiresOnInMs)(current);
|
|
87
|
+
return currentExpiresOn === undefined || candidateExpiresOn > currentExpiresOn;
|
|
88
|
+
};
|
|
89
|
+
var observeToken = function (token) {
|
|
90
|
+
try {
|
|
91
|
+
if (token && token !== latestToken && (0, chatTokenRenewal_1.isChatTokenUsable)(token, now()) && isNewer(token, latestToken)) {
|
|
92
|
+
latestToken = token;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (_a) {
|
|
96
|
+
// Keep the current token
|
|
97
|
+
}
|
|
98
|
+
};
|
|
99
|
+
var selectToken = function (token) {
|
|
100
|
+
try {
|
|
101
|
+
if (latestToken && latestToken !== token && (0, chatTokenRenewal_1.isChatTokenUsable)(latestToken, now()) && isNewer(latestToken, token)) {
|
|
102
|
+
return latestToken;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
catch (_a) {
|
|
106
|
+
// Keep the given token
|
|
107
|
+
}
|
|
108
|
+
return token;
|
|
109
|
+
};
|
|
110
|
+
var renew = function (failedToken, source) { return __awaiter(void 0, void 0, void 0, function () {
|
|
111
|
+
var token, _a;
|
|
112
|
+
return __generator(this, function (_b) {
|
|
113
|
+
switch (_b.label) {
|
|
114
|
+
case 0:
|
|
115
|
+
lastRenewalTime = now();
|
|
116
|
+
safeInvoke(function () { var _a; return (_a = params.onStart) === null || _a === void 0 ? void 0 : _a.call(params, source); });
|
|
117
|
+
_b.label = 1;
|
|
118
|
+
case 1:
|
|
119
|
+
_b.trys.push([1, 3, , 4]);
|
|
120
|
+
return [4 /*yield*/, params.refreshToken()];
|
|
121
|
+
case 2:
|
|
122
|
+
token = _b.sent();
|
|
123
|
+
return [3 /*break*/, 4];
|
|
124
|
+
case 3:
|
|
125
|
+
_a = _b.sent();
|
|
126
|
+
token = undefined;
|
|
127
|
+
return [3 /*break*/, 4];
|
|
128
|
+
case 4:
|
|
129
|
+
if (!token || token === failedToken || !(0, chatTokenRenewal_1.isChatTokenUsable)(token, now())) {
|
|
130
|
+
safeInvoke(function () { var _a; return (_a = params.onFailure) === null || _a === void 0 ? void 0 : _a.call(params, source, UnauthorizedRecoveryFailureReason.NoNewToken); });
|
|
131
|
+
return [2 /*return*/, undefined];
|
|
132
|
+
}
|
|
133
|
+
observeToken(token);
|
|
134
|
+
unverifiedRenewal = { token: token, source: source };
|
|
135
|
+
return [2 /*return*/, token];
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
}); };
|
|
139
|
+
var reportTokenResult = function (token, accepted) {
|
|
140
|
+
try {
|
|
141
|
+
if (!unverifiedRenewal || unverifiedRenewal.token !== token) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
var source_1 = unverifiedRenewal.source;
|
|
145
|
+
unverifiedRenewal = null;
|
|
146
|
+
if (accepted) {
|
|
147
|
+
rejectedRenewals = 0;
|
|
148
|
+
safeInvoke(function () { var _a; return (_a = params.onSuccess) === null || _a === void 0 ? void 0 : _a.call(params, source_1, false); });
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
rejectedRenewals++;
|
|
152
|
+
safeInvoke(function () { var _a; return (_a = params.onFailure) === null || _a === void 0 ? void 0 : _a.call(params, source_1, UnauthorizedRecoveryFailureReason.RenewedTokenRejected); });
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
catch (_a) {
|
|
156
|
+
// Reporting must never break the request
|
|
157
|
+
}
|
|
158
|
+
};
|
|
159
|
+
var recover = function (failedToken, source) { return __awaiter(void 0, void 0, void 0, function () {
|
|
160
|
+
var _a;
|
|
161
|
+
return __generator(this, function (_b) {
|
|
162
|
+
switch (_b.label) {
|
|
163
|
+
case 0:
|
|
164
|
+
_b.trys.push([0, 4, , 5]);
|
|
165
|
+
if (latestToken && latestToken !== failedToken && (0, chatTokenRenewal_1.isChatTokenUsable)(latestToken, now())) {
|
|
166
|
+
safeInvoke(function () { var _a; return (_a = params.onSuccess) === null || _a === void 0 ? void 0 : _a.call(params, source, true); });
|
|
167
|
+
return [2 /*return*/, latestToken];
|
|
168
|
+
}
|
|
169
|
+
if (!activeRenewal) return [3 /*break*/, 2];
|
|
170
|
+
return [4 /*yield*/, activeRenewal];
|
|
171
|
+
case 1: return [2 /*return*/, _b.sent()];
|
|
172
|
+
case 2:
|
|
173
|
+
if (rejectedRenewals >= maxRejectedRenewals
|
|
174
|
+
|| (lastRenewalTime !== null && now() - lastRenewalTime < minRenewalIntervalInMs)) {
|
|
175
|
+
return [2 /*return*/, undefined];
|
|
176
|
+
}
|
|
177
|
+
activeRenewal = (function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
178
|
+
return __generator(this, function (_a) {
|
|
179
|
+
switch (_a.label) {
|
|
180
|
+
case 0:
|
|
181
|
+
_a.trys.push([0, , 2, 3]);
|
|
182
|
+
return [4 /*yield*/, renew(failedToken, source)];
|
|
183
|
+
case 1: return [2 /*return*/, _a.sent()];
|
|
184
|
+
case 2:
|
|
185
|
+
activeRenewal = null;
|
|
186
|
+
return [7 /*endfinally*/];
|
|
187
|
+
case 3: return [2 /*return*/];
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
}); })();
|
|
191
|
+
return [4 /*yield*/, activeRenewal];
|
|
192
|
+
case 3: return [2 /*return*/, _b.sent()];
|
|
193
|
+
case 4:
|
|
194
|
+
_a = _b.sent();
|
|
195
|
+
return [2 /*return*/, undefined];
|
|
196
|
+
case 5: return [2 /*return*/];
|
|
197
|
+
}
|
|
198
|
+
});
|
|
199
|
+
}); };
|
|
200
|
+
return { selectToken: selectToken, observeToken: observeToken, recover: recover, reportTokenResult: reportTokenResult };
|
|
201
|
+
};
|
|
202
|
+
exports.createChatTokenUnauthorizedRecovery = createChatTokenUnauthorizedRecovery;
|
|
203
|
+
exports.chatTokenUnauthorizedRecoveryPolicyName = "ChatTokenUnauthorizedRecoveryPolicy";
|
|
204
|
+
var authorizationHeaderName = "Authorization";
|
|
205
|
+
var bearerPrefix = "Bearer ";
|
|
206
|
+
var getBearerToken = function (request) {
|
|
207
|
+
var header = request.headers.get(authorizationHeaderName);
|
|
208
|
+
return header && header.startsWith(bearerPrefix) ? header.substring(bearerPrefix.length) : undefined;
|
|
209
|
+
};
|
|
210
|
+
// Only bodies that can be sent again unchanged are retried
|
|
211
|
+
var isReplayableBody = function (request) {
|
|
212
|
+
var body = request.body;
|
|
213
|
+
return body === undefined || body === null || typeof body === "string";
|
|
214
|
+
};
|
|
215
|
+
/**
|
|
216
|
+
* Pipeline policy for ACS chat requests. Runs after the authentication policy on every attempt, sends the newest
|
|
217
|
+
* usable token, and resends a request that failed with 401 once with a different usable token.
|
|
218
|
+
*/
|
|
219
|
+
var createChatTokenUnauthorizedRecoveryPolicy = function (recovery) {
|
|
220
|
+
var policy = {
|
|
221
|
+
name: exports.chatTokenUnauthorizedRecoveryPolicyName,
|
|
222
|
+
sendRequest: function (request, next) { return __awaiter(void 0, void 0, void 0, function () {
|
|
223
|
+
var sentToken, selectedToken, response, token, retryResponse;
|
|
224
|
+
return __generator(this, function (_a) {
|
|
225
|
+
switch (_a.label) {
|
|
226
|
+
case 0:
|
|
227
|
+
sentToken = getBearerToken(request);
|
|
228
|
+
if (sentToken) {
|
|
229
|
+
selectedToken = recovery.selectToken(sentToken);
|
|
230
|
+
if (selectedToken !== sentToken) {
|
|
231
|
+
request.headers.set(authorizationHeaderName, "".concat(bearerPrefix).concat(selectedToken));
|
|
232
|
+
sentToken = selectedToken;
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
return [4 /*yield*/, next(request)];
|
|
236
|
+
case 1:
|
|
237
|
+
response = _a.sent();
|
|
238
|
+
if (sentToken) {
|
|
239
|
+
recovery.reportTokenResult(sentToken, response.status !== 401);
|
|
240
|
+
}
|
|
241
|
+
if (response.status !== 401 || !sentToken || !isReplayableBody(request)) {
|
|
242
|
+
return [2 /*return*/, response];
|
|
243
|
+
}
|
|
244
|
+
return [4 /*yield*/, recovery.recover(sentToken, UnauthorizedRecoverySource.ChatRequest)];
|
|
245
|
+
case 2:
|
|
246
|
+
token = _a.sent();
|
|
247
|
+
if (!token || token === sentToken) {
|
|
248
|
+
return [2 /*return*/, response];
|
|
249
|
+
}
|
|
250
|
+
request.headers.set(authorizationHeaderName, "".concat(bearerPrefix).concat(token));
|
|
251
|
+
return [4 /*yield*/, next(request)];
|
|
252
|
+
case 3:
|
|
253
|
+
retryResponse = _a.sent();
|
|
254
|
+
recovery.reportTokenResult(token, retryResponse.status !== 401);
|
|
255
|
+
return [2 /*return*/, retryResponse];
|
|
256
|
+
}
|
|
257
|
+
});
|
|
258
|
+
}); }
|
|
259
|
+
};
|
|
260
|
+
return { policy: policy, position: "perRetry" };
|
|
261
|
+
};
|
|
262
|
+
exports.createChatTokenUnauthorizedRecoveryPolicy = createChatTokenUnauthorizedRecoveryPolicy;
|
|
263
|
+
/**
|
|
264
|
+
* Credential that gives the newest usable token to ACS, including the real-time notification client, which reads
|
|
265
|
+
* the token from the credential instead of the request pipeline.
|
|
266
|
+
*/
|
|
267
|
+
var ChatTokenUnauthorizedRecoveryCredential = /** @class */ (function () {
|
|
268
|
+
function ChatTokenUnauthorizedRecoveryCredential(credential, recovery) {
|
|
269
|
+
this.credential = credential;
|
|
270
|
+
this.recovery = recovery;
|
|
271
|
+
}
|
|
272
|
+
ChatTokenUnauthorizedRecoveryCredential.prototype.getToken = function (options) {
|
|
273
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
274
|
+
var accessToken, token, expiresOnTimestamp;
|
|
275
|
+
return __generator(this, function (_a) {
|
|
276
|
+
switch (_a.label) {
|
|
277
|
+
case 0: return [4 /*yield*/, this.credential.getToken(options)];
|
|
278
|
+
case 1:
|
|
279
|
+
accessToken = _a.sent();
|
|
280
|
+
token = this.recovery.selectToken(accessToken.token);
|
|
281
|
+
expiresOnTimestamp = token !== accessToken.token ? (0, chatTokenRenewal_1.getChatTokenExpiresOnInMs)(token) : undefined;
|
|
282
|
+
return [2 /*return*/, expiresOnTimestamp !== undefined ? { token: token, expiresOnTimestamp: expiresOnTimestamp } : accessToken];
|
|
283
|
+
}
|
|
284
|
+
});
|
|
285
|
+
});
|
|
286
|
+
};
|
|
287
|
+
ChatTokenUnauthorizedRecoveryCredential.prototype.dispose = function () {
|
|
288
|
+
this.credential.dispose();
|
|
289
|
+
};
|
|
290
|
+
return ChatTokenUnauthorizedRecoveryCredential;
|
|
291
|
+
}());
|
|
292
|
+
exports.ChatTokenUnauthorizedRecoveryCredential = ChatTokenUnauthorizedRecoveryCredential;
|
|
293
|
+
//# sourceMappingURL=chatTokenUnauthorizedRecovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chatTokenUnauthorizedRecovery.js","sourceRoot":"","sources":["../../src/utils/chatTokenUnauthorizedRecovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
var OmnichannelMessage_1 = require("../core/messaging/OmnichannelMessage");
|
|
15
15
|
var LiveChatVersion_1 = require("../core/LiveChatVersion");
|
|
16
16
|
var utilities_1 = require("./utilities");
|
|
17
|
+
var messageUpdates_1 = require("./messageUpdates");
|
|
17
18
|
var createOmnichannelMessage = function (message, optionalParams) {
|
|
18
19
|
var omnichannelMessage = {};
|
|
19
20
|
omnichannelMessage.liveChatVersion = optionalParams.liveChatVersion || LiveChatVersion_1.default.V1;
|
|
@@ -47,6 +48,9 @@ var createOmnichannelMessage = function (message, optionalParams) {
|
|
|
47
48
|
omnichannelMessage.properties.tags = metadata && metadata.tags ? metadata.tags : [];
|
|
48
49
|
omnichannelMessage.tags = metadata && metadata.tags ? metadata.tags.replace(/\"/g, "").split(",").filter(function (tag) { return tag.length > 0; }) : []; // eslint-disable-line no-useless-escape
|
|
49
50
|
omnichannelMessage.timestamp = editedOn !== null && editedOn !== void 0 ? editedOn : createdOn;
|
|
51
|
+
if ((0, messageUpdates_1.isMessageEdited)(message)) {
|
|
52
|
+
omnichannelMessage.resourceType = OmnichannelMessage_1.ResourceType.MessageUpdate;
|
|
53
|
+
}
|
|
50
54
|
omnichannelMessage.messageType = OmnichannelMessage_1.MessageType.UserMessage; // Backward compatibility
|
|
51
55
|
// `sender` can be null/undefined for system messages or certain ACS
|
|
52
56
|
// event types. Use optional chaining so message transformation does not
|
|
@@ -118,6 +122,7 @@ var createOmnichannelMessage = function (message, optionalParams) {
|
|
|
118
122
|
};
|
|
119
123
|
}
|
|
120
124
|
omnichannelMessage.role = (0, utilities_1.getMessageRole)(omnichannelMessage);
|
|
125
|
+
(0, messageUpdates_1.retainMessageVersion)(omnichannelMessage, message);
|
|
121
126
|
}
|
|
122
127
|
else {
|
|
123
128
|
var clientmessageid = message.clientmessageid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOmnichannelMessage.js","sourceRoot":"","sources":["../../src/utils/createOmnichannelMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"createOmnichannelMessage.js","sourceRoot":"","sources":["../../src/utils/createOmnichannelMessage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const getMessageVersion: (message: object) => string | undefined;
|
|
2
|
+
export declare const retainMessageVersion: (message: object, source: object) => void;
|
|
3
|
+
export declare const isNewerMessageVersion: (version: string, previous?: string) => boolean;
|
|
4
|
+
export declare const isMessageEdited: (message: object) => boolean;
|
|
5
|
+
export declare class MessageUpdateTracker {
|
|
6
|
+
private observedVersions;
|
|
7
|
+
private deliveredVersions;
|
|
8
|
+
shouldDeliver(id: string, version: string): boolean;
|
|
9
|
+
markDelivered(id: string, version: string): void;
|
|
10
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MessageUpdateTracker = exports.isMessageEdited = exports.isNewerMessageVersion = exports.retainMessageVersion = exports.getMessageVersion = void 0;
|
|
4
|
+
// Keep transport versions off the public message payload, including during rehydration.
|
|
5
|
+
var retainedMessageVersions = new WeakMap();
|
|
6
|
+
var getMessageVersion = function (message) {
|
|
7
|
+
var version = "version" in message ? message.version : retainedMessageVersions.get(message);
|
|
8
|
+
if (typeof version !== "string" || !/^\d+$/.test(version)) {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
return version.replace(/^0+(?=\d)/, "");
|
|
12
|
+
};
|
|
13
|
+
exports.getMessageVersion = getMessageVersion;
|
|
14
|
+
var retainMessageVersion = function (message, source) {
|
|
15
|
+
var version = (0, exports.getMessageVersion)(source);
|
|
16
|
+
if (version !== undefined) {
|
|
17
|
+
retainedMessageVersions.set(message, version);
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
exports.retainMessageVersion = retainMessageVersion;
|
|
21
|
+
var isNewerMessageVersion = function (version, previous) {
|
|
22
|
+
// ACS versions are UInt64 strings; Number would lose precision and BigInt would raise the runtime target.
|
|
23
|
+
return previous === undefined
|
|
24
|
+
|| version.length > previous.length
|
|
25
|
+
|| (version.length === previous.length && version > previous);
|
|
26
|
+
};
|
|
27
|
+
exports.isNewerMessageVersion = isNewerMessageVersion;
|
|
28
|
+
var isMessageEdited = function (message) {
|
|
29
|
+
return "editedOn" in message
|
|
30
|
+
&& message.editedOn instanceof Date
|
|
31
|
+
&& Number.isFinite(message.editedOn.getTime());
|
|
32
|
+
};
|
|
33
|
+
exports.isMessageEdited = isMessageEdited;
|
|
34
|
+
var MessageUpdateTracker = /** @class */ (function () {
|
|
35
|
+
function MessageUpdateTracker() {
|
|
36
|
+
this.observedVersions = new Map();
|
|
37
|
+
this.deliveredVersions = new Map();
|
|
38
|
+
}
|
|
39
|
+
MessageUpdateTracker.prototype.shouldDeliver = function (id, version) {
|
|
40
|
+
var observed = this.observedVersions.get(id);
|
|
41
|
+
if (observed !== undefined && (0, exports.isNewerMessageVersion)(observed, version)) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
// Keep the latest observation even if a callback fails after partially updating its UI.
|
|
45
|
+
this.observedVersions.set(id, version);
|
|
46
|
+
return (0, exports.isNewerMessageVersion)(version, this.deliveredVersions.get(id));
|
|
47
|
+
};
|
|
48
|
+
MessageUpdateTracker.prototype.markDelivered = function (id, version) {
|
|
49
|
+
if ((0, exports.isNewerMessageVersion)(version, this.deliveredVersions.get(id))) {
|
|
50
|
+
this.deliveredVersions.set(id, version);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
return MessageUpdateTracker;
|
|
54
|
+
}());
|
|
55
|
+
exports.MessageUpdateTracker = MessageUpdateTracker;
|
|
56
|
+
//# sourceMappingURL=messageUpdates.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messageUpdates.js","sourceRoot":"","sources":["../../src/utils/messageUpdates.ts"],"names":[],"mappings":";;;AAAA,wFAAwF;AACxF,IAAM,uBAAuB,GAAG,IAAI,OAAO,EAAkB,CAAC;AAEvD,IAAM,iBAAiB,GAAG,UAAC,OAAe;IAC7C,IAAM,OAAO,GAAG,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9F,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B;AAEK,IAAM,oBAAoB,GAAG,UAAC,OAAe,EAAE,MAAc;IAChE,IAAM,OAAO,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,uBAAuB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;AACL,CAAC,CAAC;AALW,QAAA,oBAAoB,wBAK/B;AAEK,IAAM,qBAAqB,GAAG,UAAC,OAAe,EAAE,QAAiB;IACpE,0GAA0G;IAC1G,OAAO,QAAQ,KAAK,SAAS;WACtB,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM;WAChC,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,OAAO,GAAG,QAAQ,CAAC,CAAC;AACtE,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC;AAEK,IAAM,eAAe,GAAG,UAAC,OAAe;IAC3C,OAAO,UAAU,IAAI,OAAO;WACrB,OAAO,CAAC,QAAQ,YAAY,IAAI;WAChC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEF;IAAA;QACY,qBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC7C,sBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAkB1D,CAAC;IAhBU,4CAAa,GAApB,UAAqB,EAAU,EAAE,OAAe;QAC5C,IAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,SAAS,IAAI,IAAA,6BAAqB,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YACrE,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,wFAAwF;QACxF,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,IAAA,6BAAqB,EAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEM,4CAAa,GAApB,UAAqB,EAAU,EAAE,OAAe;QAC5C,IAAI,IAAA,6BAAqB,EAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC;IACL,2BAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,oDAAoB"}
|