@sipgate/integration-bridge 0.27.21 → 0.27.23
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 +6 -6
- package/dist/util/oauth.js.map +1 -1
- package/package.json +1 -1
package/dist/util/oauth.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export interface OAuthCallbackParams {
|
|
|
18
18
|
extractToken: ExtractTokenFromResponseFn<any>;
|
|
19
19
|
}
|
|
20
20
|
export declare function getOAuth2RedirectUrl(config: OAuthParams, req: Request, res: Response, addState?: boolean): Promise<string>;
|
|
21
|
-
export declare function handleOAuth2Callback(config: OAuthCallbackParams, req: Request, res: Response, checkNonceCookie?: boolean, paramCommunication?: GetAccessTokenParamCommunication): Promise<{
|
|
21
|
+
export declare function handleOAuth2Callback(config: OAuthCallbackParams, req: Request, res: Response, checkNonceCookie?: boolean, paramCommunication?: GetAccessTokenParamCommunication, additionalHeaders?: Record<string, any>): Promise<{
|
|
22
22
|
apiKey: string;
|
|
23
23
|
apiUrl: string;
|
|
24
24
|
query_params: any;
|
package/dist/util/oauth.js
CHANGED
|
@@ -80,7 +80,7 @@ function getOAuth2RedirectUrl(config, req, res, addState = true) {
|
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
exports.getOAuth2RedirectUrl = getOAuth2RedirectUrl;
|
|
83
|
-
function handleOAuth2Callback(config, req, res, checkNonceCookie = false, paramCommunication = GetAccessTokenParamCommunication.BODY) {
|
|
83
|
+
function handleOAuth2Callback(config, req, res, checkNonceCookie = false, paramCommunication = GetAccessTokenParamCommunication.BODY, additionalHeaders = {}) {
|
|
84
84
|
var _a, _b, _c, _d;
|
|
85
85
|
return __awaiter(this, void 0, void 0, function* () {
|
|
86
86
|
try {
|
|
@@ -101,7 +101,7 @@ function handleOAuth2Callback(config, req, res, checkNonceCookie = false, paramC
|
|
|
101
101
|
throw `Unexpected: nonce parameter from request and from cookie are different. Possible CSFR attack!`;
|
|
102
102
|
_1.Security.Nonce.deleteNonceCookie(req, res, config.cookieName, config.client_secret);
|
|
103
103
|
}
|
|
104
|
-
const response = yield getAccessToken(state.accessTokenUrl, req.query.code.toString(), config.client_id, config.client_secret, config.redirect_uri, paramCommunication);
|
|
104
|
+
const response = yield getAccessToken(state.accessTokenUrl, req.query.code.toString(), config.client_id, config.client_secret, config.redirect_uri, paramCommunication, additionalHeaders);
|
|
105
105
|
return {
|
|
106
106
|
apiKey: config.extractToken(response),
|
|
107
107
|
apiUrl: state.apiUrl,
|
|
@@ -122,7 +122,7 @@ var GetAccessTokenParamCommunication;
|
|
|
122
122
|
GetAccessTokenParamCommunication[GetAccessTokenParamCommunication["X_WWW_FORM_URL_ENCODED"] = 1] = "X_WWW_FORM_URL_ENCODED";
|
|
123
123
|
GetAccessTokenParamCommunication[GetAccessTokenParamCommunication["BODY"] = 2] = "BODY";
|
|
124
124
|
})(GetAccessTokenParamCommunication = exports.GetAccessTokenParamCommunication || (exports.GetAccessTokenParamCommunication = {}));
|
|
125
|
-
function getAccessToken(accessTokenURL, authorizationCode, clientId, clientSecret, redirect_uri, paramCommunication = GetAccessTokenParamCommunication.BODY) {
|
|
125
|
+
function getAccessToken(accessTokenURL, authorizationCode, clientId, clientSecret, redirect_uri, paramCommunication = GetAccessTokenParamCommunication.BODY, additionalHeaders = {}) {
|
|
126
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
127
127
|
console.log(`Start: fetching access tokens`);
|
|
128
128
|
const params = {
|
|
@@ -134,13 +134,13 @@ function getAccessToken(accessTokenURL, authorizationCode, clientId, clientSecre
|
|
|
134
134
|
};
|
|
135
135
|
switch (paramCommunication) {
|
|
136
136
|
case GetAccessTokenParamCommunication.QUERY_PARAM:
|
|
137
|
-
return yield axios_1.default.post(accessTokenURL, {}, { params: params });
|
|
137
|
+
return yield axios_1.default.post(accessTokenURL, {}, Object.assign({ params: params }, (Object.keys(additionalHeaders) && { headers: additionalHeaders })));
|
|
138
138
|
case GetAccessTokenParamCommunication.X_WWW_FORM_URL_ENCODED:
|
|
139
139
|
return yield axios_1.default.post(accessTokenURL, new URLSearchParams(params), {
|
|
140
|
-
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
|
140
|
+
headers: Object.assign({}, { 'Content-Type': 'application/x-www-form-urlencoded' }, additionalHeaders),
|
|
141
141
|
});
|
|
142
142
|
case GetAccessTokenParamCommunication.BODY:
|
|
143
|
-
return yield axios_1.default.post(accessTokenURL, params);
|
|
143
|
+
return yield axios_1.default.post(accessTokenURL, Object.assign({ params: params }, (Object.keys(additionalHeaders) && { headers: additionalHeaders })));
|
|
144
144
|
default:
|
|
145
145
|
throw Error('Unexpected parameter communication type');
|
|
146
146
|
}
|
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,EACb,WAAoB,IAAI;;;QAExB,IAAI;YACF,MAAM,YAAY,GAAW,WAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACpD,IAAI,YAAY,CAAC;YACjB,IAAI,QAAQ,EAAE;gBACZ,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;oBAC3B,KAAK,EAAE,YAAY;oBACnB,cAAc,EAAE,MAAM,CAAC,aAAa;oBACpC,MAAM,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAC,CAAC;gBACH,YAAY,GAAG;oBACb,aAAa,EAAE,MAAM;oBACrB,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,KAAK;iBACN,CAAC;aACH;iBAAM;gBACL,YAAY,GAAG;oBACb,aAAa,EAAE,MAAM;oBACrB,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,SAAS,EAAE,MAAM,CAAC,SAAS;iBAC5B,CAAC;aACH;YACD,MAAM,gBAAgB,GAAG,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;YAC3D,WAAQ,CAAC,KAAK,CAAC,cAAc,CAC3B,GAAG,EACH,GAAG,EACH,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,aAAa,EACpB,YAAY,CACb,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YACzC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;SACvB;QAAC,OAAO,SAAc,EAAE;YACvB,MAAM,YAAY,GAAG,mCAAmC,IAAI,CAAC,SAAS,CACpE,SAAS,EACT,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CACtC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,0CAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YAC7D,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,IAAI,oBAAW,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;SAC1C;;CACF;AA/CD,oDA+CC;AAED,SAAsB,oBAAoB,CACxC,MAA2B,EAC3B,GAAY,EACZ,GAAa,EACb,mBAA4B,KAAK,EACjC,qBAAuD,gCAAgC,CAAC,IAAI;;;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/util/oauth.ts"],"names":[],"mappings":"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"}
|