@sipgate/integration-bridge 0.27.17 → 0.27.18
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/dist/util/oauth.d.ts +1 -1
- package/dist/util/oauth.js +23 -12
- package/dist/util/oauth.js.map +1 -1
- package/package.json +1 -1
package/dist/util/oauth.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ export interface OAuthCallbackParams {
|
|
|
17
17
|
redirect_uri: string;
|
|
18
18
|
extractToken: ExtractTokenFromResponseFn<any>;
|
|
19
19
|
}
|
|
20
|
-
export declare function getOAuth2RedirectUrl(config: OAuthParams, req: Request, res: Response): Promise<string>;
|
|
20
|
+
export declare function getOAuth2RedirectUrl(config: OAuthParams, req: Request, res: Response, addState?: boolean): Promise<string>;
|
|
21
21
|
export declare function handleOAuth2Callback(config: OAuthCallbackParams, req: Request, res: Response, checkNonceCookie?: boolean, paramCommunication?: GetAccessTokenParamCommunication): Promise<{
|
|
22
22
|
apiKey: string;
|
|
23
23
|
apiUrl: string;
|
package/dist/util/oauth.js
CHANGED
|
@@ -40,22 +40,33 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
40
40
|
const util = __importStar(require("util"));
|
|
41
41
|
const _1 = require(".");
|
|
42
42
|
const models_1 = require("../models");
|
|
43
|
-
function getOAuth2RedirectUrl(config, req, res) {
|
|
43
|
+
function getOAuth2RedirectUrl(config, req, res, addState = true) {
|
|
44
44
|
var _a;
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
try {
|
|
47
47
|
const nonce_string = _1.Security.Nonce.nonce();
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
48
|
+
let searchParams;
|
|
49
|
+
if (addState) {
|
|
50
|
+
const state = JSON.stringify({
|
|
51
|
+
nonce: nonce_string,
|
|
52
|
+
accessTokenUrl: config.accesTokenUrl,
|
|
53
|
+
apiUrl: config.apiUrl,
|
|
54
|
+
});
|
|
55
|
+
searchParams = {
|
|
56
|
+
response_type: 'code',
|
|
57
|
+
redirect_uri: config.redirect_uri,
|
|
58
|
+
client_id: config.client_id,
|
|
59
|
+
state,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
searchParams = {
|
|
64
|
+
response_type: 'code',
|
|
65
|
+
redirect_uri: config.redirect_uri,
|
|
66
|
+
client_id: config.client_id,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
const searchParamsAuth = new URLSearchParams(searchParams);
|
|
59
70
|
_1.Security.Nonce.setNonceCookie(req, res, config.cookieName, config.client_secret, nonce_string);
|
|
60
71
|
const url = new URL(config.authorizeUrl);
|
|
61
72
|
url.search = searchParamsAuth.toString();
|
package/dist/util/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/util/oauth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA6C;AAE7C,2CAA6B;AAC7B,wBAA6B;AAC7B,sCAAwC;AAsBxC,SAAsB,oBAAoB,CACxC,MAAmB,EACnB,GAAY,EACZ,GAAa;;;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/util/oauth.ts"],"names":[],"mappings":"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"}
|