chatbot-nc 2.2.33 → 2.2.34
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/cjs/utils/auth.d.ts +0 -5
- package/dist/cjs/utils/auth.js +1 -102
- package/dist/cjs/utils/auth.js.map +1 -1
- package/dist/cjs/utils/index.d.ts +6 -4
- package/dist/cjs/utils/mcp-oauth.d.ts +3 -1
- package/dist/cjs/utils/mcp-oauth.js +96 -1
- package/dist/cjs/utils/mcp-oauth.js.map +1 -1
- package/dist/cjs/utils/oauth.d.ts +5 -1
- package/dist/cjs/utils/oauth.js +88 -1
- package/dist/cjs/utils/oauth.js.map +1 -1
- package/dist/cjs/webbookEvent/index.js +1 -1
- package/dist/cjs/webbookEvent/index.js.map +1 -1
- package/dist/esm/utils/auth.d.ts +0 -5
- package/dist/esm/utils/auth.js +1 -104
- package/dist/esm/utils/auth.js.map +1 -1
- package/dist/esm/utils/index.d.ts +6 -4
- package/dist/esm/utils/mcp-oauth.d.ts +3 -1
- package/dist/esm/utils/mcp-oauth.js +93 -1
- package/dist/esm/utils/mcp-oauth.js.map +1 -1
- package/dist/esm/utils/oauth.d.ts +5 -1
- package/dist/esm/utils/oauth.js +87 -1
- package/dist/esm/utils/oauth.js.map +1 -1
- package/dist/esm/webbookEvent/index.js +1 -1
- package/dist/esm/webbookEvent/index.js.map +1 -1
- package/package.json +1 -1
package/dist/cjs/utils/auth.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { OAuthKeys } from "../type";
|
|
2
1
|
import { ContentType } from "../enum";
|
|
3
2
|
export declare const Auth: {
|
|
4
3
|
GetApiKey: (authValue: string) => Promise<{
|
|
@@ -8,9 +7,5 @@ export declare const Auth: {
|
|
|
8
7
|
GetAuthInfo: (authValue: string) => Promise<any>;
|
|
9
8
|
GetBearerToken: (authValue: string) => Promise<string>;
|
|
10
9
|
GetContentType: (contentType: ContentType) => Promise<string>;
|
|
11
|
-
GetOAuthToken: (authValue: string) => Promise<"" | Record<OAuthKeys, any>>;
|
|
12
|
-
GetOAuthAccessToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
13
|
-
GetOAuthRefreshToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
14
|
-
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
15
10
|
AttachClientHeaders: (clientHeaders?: string, contentType?: string, sessionAttributes?: Record<string, string>) => Promise<Record<string, string>>;
|
|
16
11
|
};
|
package/dist/cjs/utils/auth.js
CHANGED
|
@@ -38,24 +38,6 @@ const GetBearerToken = async (authValue) => {
|
|
|
38
38
|
if (!Array.isArray(provisionList))
|
|
39
39
|
return "";
|
|
40
40
|
const providerInfo = Object.fromEntries(provisionList.map((item) => [item.Key, item.Value]));
|
|
41
|
-
// if (provisionList != null) {
|
|
42
|
-
// let userName = provisionList.find((x: any) => x.Key == 'AuthBearerUsername')?.Value;
|
|
43
|
-
// let password = provisionList.find((x: any) => x.Key == 'AuthBearerPassword')?.Value;
|
|
44
|
-
// let payload = { userName, username: userName, password };
|
|
45
|
-
// let strContentType = await this.GetContentType(ContentType.applicationJson);
|
|
46
|
-
// let url = provisionList.find((x: any) => x.Key == 'AuthBearerURL')?.Value;
|
|
47
|
-
// let config: AxiosRequestConfig<any> = {
|
|
48
|
-
// headers: {
|
|
49
|
-
// "Content-Type": strContentType
|
|
50
|
-
// }
|
|
51
|
-
// }
|
|
52
|
-
// let response = await axios.post(url, payload, config);
|
|
53
|
-
// if (response.status == 200) {
|
|
54
|
-
// let tokenName = provisionList.find((x: any) => x.Key == 'AuthBearerToken')?.Value;
|
|
55
|
-
// let provisionData = response.data;
|
|
56
|
-
// token = provisionData[tokenName];
|
|
57
|
-
// }
|
|
58
|
-
// }
|
|
59
41
|
if (provisionList != null) {
|
|
60
42
|
let payload = { userName: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.AuthBearerUsername, username: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.AuthBearerUsername, password: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.AuthBearerPassword };
|
|
61
43
|
let strContentType = await GetContentType(enum_1.ContentType.applicationJson);
|
|
@@ -82,89 +64,6 @@ const GetContentType = async (contentType) => {
|
|
|
82
64
|
}
|
|
83
65
|
return responeValue;
|
|
84
66
|
};
|
|
85
|
-
const GetOAuthToken = async (authValue) => {
|
|
86
|
-
if (!authValue)
|
|
87
|
-
throw new Error("OAuth Config Not Found");
|
|
88
|
-
const provisionList = JSON.parse(authValue);
|
|
89
|
-
if (!Array.isArray(provisionList))
|
|
90
|
-
return "";
|
|
91
|
-
const providerInfo = Object.fromEntries(provisionList.map((item) => [item.Key, item.Value]));
|
|
92
|
-
// 🔹 Step 1: If no token → fetch new one
|
|
93
|
-
if (!providerInfo.Token) {
|
|
94
|
-
const tokenInfo = await GetOAuthAccessToken(providerInfo);
|
|
95
|
-
providerInfo.Token = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.access_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.accessToken);
|
|
96
|
-
providerInfo.RefreshToken = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refresh_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refreshToken) || null;
|
|
97
|
-
providerInfo.Expire = await SetTokenExpiry(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in);
|
|
98
|
-
}
|
|
99
|
-
// 🔹 Step 2: Check expiry
|
|
100
|
-
const isExpired = !providerInfo.Expire || Number(providerInfo.Expire) <= Date.now();
|
|
101
|
-
if (isExpired && providerInfo.RefreshToken) {
|
|
102
|
-
const refreshTokenInfo = await GetOAuthRefreshToken(providerInfo);
|
|
103
|
-
providerInfo.Token = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.access_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.accessToken);
|
|
104
|
-
providerInfo.RefreshToken = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refresh_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refreshToken);
|
|
105
|
-
providerInfo.Expire = await SetTokenExpiry(refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.expires_in);
|
|
106
|
-
}
|
|
107
|
-
return providerInfo;
|
|
108
|
-
};
|
|
109
|
-
// const GetOAuthURL = async (providerInfo: Record<OAuthKeys, string>)=> {
|
|
110
|
-
// try {
|
|
111
|
-
// const scope = providerInfo?.Scope;
|
|
112
|
-
// const tokenKey = providerInfo.CodeVerifier || await this.ssmService.getParameterValue('SIGNING_KEY');
|
|
113
|
-
// const code_verifier = (await this._hashService.getHashedDataString(`${tokenKey}${userId}`)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
114
|
-
// const code_challenge = (await this._hashService.getHashedDataString(code_verifier)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
115
|
-
// let code_challenge_method = providerInfo.CodeChallangeMethod || "S256";
|
|
116
|
-
// return `${providerInfo.AuthURL}?client_id=${providerInfo.ClientId}&redirect_uri=${encodeURIComponent(providerInfo.CallBackURL)}&scope=${scope}&code_challenge=${code_challenge}&code_challenge_method=${code_challenge_method}&state=${userId}`;
|
|
117
|
-
// } catch (error) {
|
|
118
|
-
// console.error("Error in generating OAuth URL");
|
|
119
|
-
// throw error;
|
|
120
|
-
// }
|
|
121
|
-
// }
|
|
122
|
-
const GetOAuthAccessToken = async (providerInfo) => {
|
|
123
|
-
try {
|
|
124
|
-
const formUrlEncoded = async (x) => await Object.keys(x).reduce(async (acc, c) => {
|
|
125
|
-
let p = await acc;
|
|
126
|
-
return p + `&${c}=${encodeURIComponent(x[c])}`;
|
|
127
|
-
}, Promise.resolve(''));
|
|
128
|
-
let url = providerInfo.AccessTokenURL; //oauth/v3/token if not work
|
|
129
|
-
const formData = await formUrlEncoded({
|
|
130
|
-
grant_type: "authorization_code",
|
|
131
|
-
client_id: providerInfo.ClientId,
|
|
132
|
-
client_secret: providerInfo.ClientSecret,
|
|
133
|
-
redirect_uri: providerInfo.CallBackURL,
|
|
134
|
-
// code: queryParam.code,
|
|
135
|
-
// code_verifier: codeVerifier
|
|
136
|
-
});
|
|
137
|
-
const tokenInfo = await axios_1.default.post(url, formData, { headers: { "Content-Type": 'application/x-www-form-urlencoded' } }).then((res) => {
|
|
138
|
-
return res.data;
|
|
139
|
-
}).catch((err) => {
|
|
140
|
-
console.error(JSON.stringify(err));
|
|
141
|
-
console.error("Error in Axios call of Token Validation" + err);
|
|
142
|
-
throw err;
|
|
143
|
-
});
|
|
144
|
-
return tokenInfo;
|
|
145
|
-
}
|
|
146
|
-
catch (error) {
|
|
147
|
-
throw error;
|
|
148
|
-
}
|
|
149
|
-
};
|
|
150
|
-
const GetOAuthRefreshToken = async (providerInfo) => {
|
|
151
|
-
try {
|
|
152
|
-
let url = `${providerInfo.RefreshTokenURL}?refresh_token=${providerInfo.RefreshToken}&client_id=${providerInfo.ClientId}&client_secret=${providerInfo.ClientSecret}&grant_type=refresh_token`;
|
|
153
|
-
const tokenInfo = await axios_1.default.post(url).then((res) => {
|
|
154
|
-
return res.data;
|
|
155
|
-
}).catch((err) => {
|
|
156
|
-
console.error("Error in axios call of refresh Token");
|
|
157
|
-
throw err;
|
|
158
|
-
});
|
|
159
|
-
return tokenInfo;
|
|
160
|
-
}
|
|
161
|
-
catch (error) {
|
|
162
|
-
throw error;
|
|
163
|
-
}
|
|
164
|
-
};
|
|
165
|
-
const SetTokenExpiry = async (expiresIn = 1800) => {
|
|
166
|
-
return (Date.now() + ((expiresIn - 60) * 1000)).toString();
|
|
167
|
-
};
|
|
168
67
|
const AttachClientHeaders = async (clientHeaders, contentType, sessionAttributes) => {
|
|
169
68
|
try {
|
|
170
69
|
const headers = { 'Content-Type': contentType !== null && contentType !== void 0 ? contentType : 'application/json', "Accept": "application/json, text/event-stream, application/x-ndjson, application/json-seq" };
|
|
@@ -182,5 +81,5 @@ const AttachClientHeaders = async (clientHeaders, contentType, sessionAttributes
|
|
|
182
81
|
throw error;
|
|
183
82
|
}
|
|
184
83
|
};
|
|
185
|
-
exports.Auth = { GetApiKey, GetAuthInfo, GetBearerToken, GetContentType,
|
|
84
|
+
exports.Auth = { GetApiKey, GetAuthInfo, GetBearerToken, GetContentType, AttachClientHeaders };
|
|
186
85
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../utils/auth.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD;AAElD,kCAAsC;AAEtC,MAAM,SAAS,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;IAE7C,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAChC,CAAC;IAE1B,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC3B,4EAA4E;QAC5E,6EAA6E;QAC7E,yBAAyB;QACzB,OAAO,EAAE,GAAG,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,EAAE,CAAC;IAChF,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;IAC/C,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC7B,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAA+B,CAAC;IAEhI,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC3B,sFAAsF;QACtF,sFAAsF;QACtF,IAAI,GAAG,EAAE,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,EAAE,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,EAAE,CAAC;IACjG,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;IAClD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CACzB,CAAC;IAEjC
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../utils/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,15 +44,15 @@ export declare const Utils: {
|
|
|
44
44
|
GetAuthInfo: (authValue: string) => Promise<any>;
|
|
45
45
|
GetBearerToken: (authValue: string) => Promise<string>;
|
|
46
46
|
GetContentType: (contentType: import("../enum").ContentType) => Promise<string>;
|
|
47
|
-
GetOAuthToken: (authValue: string) => Promise<"" | Record<import("../type").OAuthKeys, any>>;
|
|
48
|
-
GetOAuthAccessToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
49
|
-
GetOAuthRefreshToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
50
|
-
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
51
47
|
AttachClientHeaders: (clientHeaders?: string, contentType?: string, sessionAttributes?: Record<string, string>) => Promise<Record<string, string>>;
|
|
52
48
|
};
|
|
53
49
|
jwt: typeof jwt;
|
|
54
50
|
OAuth: {
|
|
55
51
|
discoverOAuthOpenIdMetadata: (providerUrl: string) => Promise<import("../type").OAuthMetadata>;
|
|
52
|
+
GetOAuthToken: (authValue: string) => Promise<"" | Record<import("../type").OAuthKeys, any>>;
|
|
53
|
+
GetOAuthAccessToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
54
|
+
GetOAuthRefreshToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
55
|
+
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
56
56
|
};
|
|
57
57
|
MCPOAuth: {
|
|
58
58
|
discoverOAuthResourceMetadata: (mcpServerUrl: string) => Promise<import("../type").OAuthMCPProtectedResourceMetadata>;
|
|
@@ -60,5 +60,7 @@ export declare const Utils: {
|
|
|
60
60
|
registerClient: (metadata: import("../type").OAuthMCPMetadata, redirectUris: string[], client_Name?: string) => Promise<import("../type").ClientCredentials>;
|
|
61
61
|
buildAuthorizationUrl: (metadata: import("../type").OAuthMCPMetadata, clientId: string, redirectUri: string, state: string, codeChallenge?: string, codeChallengeMethod?: string, resource?: string) => Promise<string>;
|
|
62
62
|
handleCallBack: (callbackUrl: string, storedState: string, codeVerifier: string) => Promise<string>;
|
|
63
|
+
GetOAuthMCPAccessToken: (code: string, redirect_uri: string, metaData: import("../type").OAuthMCPMetadata | import("../type").OAuthMetadata, clientCredentials: import("../type").ClientCredentials, code_verifier?: string) => Promise<any>;
|
|
64
|
+
GetOAuthMCPRefreshToken: (metaData: import("../type").OAuthMCPMetadata | import("../type").OAuthMetadata, clientCredentials: import("../type").ClientCredentials, refresh_token: string) => Promise<any>;
|
|
63
65
|
};
|
|
64
66
|
};
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { ClientCredentials, OAuthMCPMetadata, OAuthMCPProtectedResourceMetadata } from "../type";
|
|
1
|
+
import { ClientCredentials, OAuthMCPMetadata, OAuthMCPProtectedResourceMetadata, OAuthMetadata } from "../type";
|
|
2
2
|
export declare const MCPOAuth: {
|
|
3
3
|
discoverOAuthResourceMetadata: (mcpServerUrl: string) => Promise<OAuthMCPProtectedResourceMetadata>;
|
|
4
4
|
discoverOAuthMetadata: (mcpServerUrl: string) => Promise<OAuthMCPMetadata>;
|
|
5
5
|
registerClient: (metadata: OAuthMCPMetadata, redirectUris: string[], client_Name?: string) => Promise<ClientCredentials>;
|
|
6
6
|
buildAuthorizationUrl: (metadata: OAuthMCPMetadata, clientId: string, redirectUri: string, state: string, codeChallenge?: string, codeChallengeMethod?: string, resource?: string) => Promise<string>;
|
|
7
7
|
handleCallBack: (callbackUrl: string, storedState: string, codeVerifier: string) => Promise<string>;
|
|
8
|
+
GetOAuthMCPAccessToken: (code: string, redirect_uri: string, metaData: OAuthMCPMetadata | OAuthMetadata, clientCredentials: ClientCredentials, code_verifier?: string) => Promise<any>;
|
|
9
|
+
GetOAuthMCPRefreshToken: (metaData: OAuthMCPMetadata | OAuthMetadata, clientCredentials: ClientCredentials, refresh_token: string) => Promise<any>;
|
|
8
10
|
};
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.MCPOAuth = void 0;
|
|
7
|
+
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const logger_1 = __importDefault(require("../logger"));
|
|
4
9
|
const discoverOAuthResourceMetadata = async (mcpServerUrl) => {
|
|
5
10
|
const url = new URL(mcpServerUrl);
|
|
6
11
|
const protectedResourceUrl = new URL("/.well-known/oauth-protected-resource", url);
|
|
@@ -117,5 +122,95 @@ const parseCallback = (url) => {
|
|
|
117
122
|
error_description: urlParams.get("error_description") || undefined,
|
|
118
123
|
};
|
|
119
124
|
};
|
|
120
|
-
|
|
125
|
+
// const GetOAuthMCPToken = async (tokenInfo: any, metaData: OAuthMCPMetadata | OAuthMetadata, clientCredentials: ClientCredentials) => {
|
|
126
|
+
// // 🔹 Step 1: If no token → fetch new one
|
|
127
|
+
// let token = tokenInfo?.access_token || tokenInfo?.accessToken
|
|
128
|
+
// if (!token) {
|
|
129
|
+
// tokenInfo = await GetOAuthMCPAccessToken(metaData,clientCredentials);
|
|
130
|
+
// tokenInfo.expire_at = await SetTokenExpiry(tokenInfo?.expires_in);
|
|
131
|
+
// return tokenInfo;
|
|
132
|
+
// }
|
|
133
|
+
// if (!tokenInfo?.access_token || tokenInfo?.accessToken)
|
|
134
|
+
// throw new Error("Token Not Found");
|
|
135
|
+
// // 🔹 Step 2: Check expiry
|
|
136
|
+
// let refresh_token = tokenInfo.refresh_token || tokenInfo?.refreshToken;
|
|
137
|
+
// if (!refresh_token)
|
|
138
|
+
// throw new Error("Refresh Token Not Found");
|
|
139
|
+
// const isExpired = !tokenInfo.expire_at || Number(tokenInfo.expire_at) <= Date.now();
|
|
140
|
+
// if (isExpired && refresh_token) {
|
|
141
|
+
// tokenInfo = await GetOAuthMCPRefreshToken(metaData,clientCredentials,refresh_token);
|
|
142
|
+
// tokenInfo.expire_at = await SetTokenExpiry(tokenInfo?.expires_in);
|
|
143
|
+
// return tokenInfo
|
|
144
|
+
// }
|
|
145
|
+
// return tokenInfo;
|
|
146
|
+
// }
|
|
147
|
+
const GetOAuthMCPAccessToken = async (code, redirect_uri, metaData, clientCredentials, code_verifier) => {
|
|
148
|
+
var _a, _b, _c, _d;
|
|
149
|
+
try {
|
|
150
|
+
let headers = { "Content-Type": 'application/x-www-form-urlencoded' };
|
|
151
|
+
const keys = {
|
|
152
|
+
grant_type: "authorization_code",
|
|
153
|
+
redirect_uri: redirect_uri,
|
|
154
|
+
code
|
|
155
|
+
};
|
|
156
|
+
if (!((_a = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _a === void 0 ? void 0 : _a.includes('none')) && ((_b = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _b === void 0 ? void 0 : _b.includes('client_secret_post'))) {
|
|
157
|
+
keys.client_id = clientCredentials.client_id,
|
|
158
|
+
keys.client_secret = clientCredentials.client_secret;
|
|
159
|
+
}
|
|
160
|
+
else if ((_c = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _c === void 0 ? void 0 : _c.includes('client_secret_basic')) {
|
|
161
|
+
const token = Buffer.from(`${clientCredentials.client_id}:${clientCredentials.client_secret}`).toString("base64");
|
|
162
|
+
headers.Authorization = `Basic ${token}`;
|
|
163
|
+
}
|
|
164
|
+
if ((_d = metaData === null || metaData === void 0 ? void 0 : metaData.code_challenge_methods_supported) === null || _d === void 0 ? void 0 : _d.length)
|
|
165
|
+
keys.code_verifier = code_verifier;
|
|
166
|
+
const formData = new URLSearchParams(keys);
|
|
167
|
+
let tokenInfo = await axios_1.default.post(metaData.token_endpoint, formData, { headers }).then((res) => {
|
|
168
|
+
return res.data;
|
|
169
|
+
}).catch((err) => {
|
|
170
|
+
logger_1.default.error(JSON.stringify(err));
|
|
171
|
+
logger_1.default.error("Error in Axios Call of Token Validation" + err);
|
|
172
|
+
throw err;
|
|
173
|
+
});
|
|
174
|
+
tokenInfo = Object.assign(tokenInfo, { expire_at: await SetTokenExpiry((tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expiry) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expire)) });
|
|
175
|
+
return tokenInfo;
|
|
176
|
+
}
|
|
177
|
+
catch (error) {
|
|
178
|
+
throw error;
|
|
179
|
+
}
|
|
180
|
+
};
|
|
181
|
+
const GetOAuthMCPRefreshToken = async (metaData, clientCredentials, refresh_token) => {
|
|
182
|
+
var _a, _b, _c;
|
|
183
|
+
try {
|
|
184
|
+
let headers = { "Content-Type": 'application/x-www-form-urlencoded' };
|
|
185
|
+
const keys = {
|
|
186
|
+
grant_type: "refresh_token",
|
|
187
|
+
refresh_token,
|
|
188
|
+
};
|
|
189
|
+
if (!((_a = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _a === void 0 ? void 0 : _a.includes('none')) && ((_b = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _b === void 0 ? void 0 : _b.includes('client_secret_post'))) {
|
|
190
|
+
keys.client_id = clientCredentials.client_id,
|
|
191
|
+
keys.client_secret = clientCredentials.client_secret;
|
|
192
|
+
}
|
|
193
|
+
else if ((_c = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _c === void 0 ? void 0 : _c.includes('client_secret_basic')) {
|
|
194
|
+
const token = Buffer.from(`${clientCredentials.client_id}:${clientCredentials.client_secret}`).toString("base64");
|
|
195
|
+
headers.Authorization = `Basic ${token}`;
|
|
196
|
+
}
|
|
197
|
+
const formData = new URLSearchParams(keys);
|
|
198
|
+
let tokenInfo = await axios_1.default.post(metaData.token_endpoint, formData, { headers }).then((res) => {
|
|
199
|
+
return res.data;
|
|
200
|
+
}).catch((err) => {
|
|
201
|
+
logger_1.default.error(JSON.stringify(err));
|
|
202
|
+
logger_1.default.error("Error in Axios Call of refresh Token" + err);
|
|
203
|
+
throw err;
|
|
204
|
+
});
|
|
205
|
+
tokenInfo = Object.assign(tokenInfo, { expire_at: await SetTokenExpiry((tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expiry) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expire)) });
|
|
206
|
+
return tokenInfo;
|
|
207
|
+
}
|
|
208
|
+
catch (error) {
|
|
209
|
+
throw error;
|
|
210
|
+
}
|
|
211
|
+
};
|
|
212
|
+
const SetTokenExpiry = async (expiresIn = 1800) => {
|
|
213
|
+
return (Date.now() + ((expiresIn - 60) * 1000)).toString();
|
|
214
|
+
};
|
|
215
|
+
exports.MCPOAuth = { discoverOAuthResourceMetadata, discoverOAuthMetadata, registerClient, buildAuthorizationUrl, handleCallBack, GetOAuthMCPAccessToken, GetOAuthMCPRefreshToken };
|
|
121
216
|
//# sourceMappingURL=mcp-oauth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-oauth.js","sourceRoot":"","sources":["../../../utils/mcp-oauth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-oauth.js","sourceRoot":"","sources":["../../../utils/mcp-oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import { OAuthMetadata } from "../type";
|
|
1
|
+
import { OAuthKeys, OAuthMetadata } from "../type";
|
|
2
2
|
export declare const OAuth: {
|
|
3
3
|
discoverOAuthOpenIdMetadata: (providerUrl: string) => Promise<OAuthMetadata>;
|
|
4
|
+
GetOAuthToken: (authValue: string) => Promise<"" | Record<OAuthKeys, any>>;
|
|
5
|
+
GetOAuthAccessToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
6
|
+
GetOAuthRefreshToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
7
|
+
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
4
8
|
};
|
package/dist/cjs/utils/oauth.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.OAuth = void 0;
|
|
7
|
+
const axios_1 = __importDefault(require("axios"));
|
|
4
8
|
const OPENID_CONFIGURATION_URLS = {
|
|
5
9
|
// Google
|
|
6
10
|
google: "https://accounts.google.com",
|
|
@@ -87,5 +91,88 @@ const discoverOAuthOpenIdMetadata = async (providerUrl) => {
|
|
|
87
91
|
const metadata = (await openIdResponse.json());
|
|
88
92
|
return metadata;
|
|
89
93
|
};
|
|
90
|
-
|
|
94
|
+
const GetOAuthToken = async (authValue) => {
|
|
95
|
+
if (!authValue)
|
|
96
|
+
throw new Error("OAuth Config Not Found");
|
|
97
|
+
const provisionList = JSON.parse(authValue);
|
|
98
|
+
if (!Array.isArray(provisionList))
|
|
99
|
+
return "";
|
|
100
|
+
const providerInfo = Object.fromEntries(provisionList.map((item) => [item.Key, item.Value]));
|
|
101
|
+
// 🔹 Step 1: If no token → fetch new one
|
|
102
|
+
if (!providerInfo.Token) {
|
|
103
|
+
const tokenInfo = await GetOAuthAccessToken(providerInfo);
|
|
104
|
+
providerInfo.Token = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.access_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.accessToken);
|
|
105
|
+
providerInfo.RefreshToken = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refresh_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refreshToken) || null;
|
|
106
|
+
providerInfo.Expire = await SetTokenExpiry(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in);
|
|
107
|
+
}
|
|
108
|
+
// 🔹 Step 2: Check expiry
|
|
109
|
+
const isExpired = !providerInfo.Expire || Number(providerInfo.Expire) <= Date.now();
|
|
110
|
+
if (isExpired && providerInfo.RefreshToken) {
|
|
111
|
+
const refreshTokenInfo = await GetOAuthRefreshToken(providerInfo);
|
|
112
|
+
providerInfo.Token = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.access_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.accessToken);
|
|
113
|
+
providerInfo.RefreshToken = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refresh_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refreshToken);
|
|
114
|
+
providerInfo.Expire = await SetTokenExpiry(refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.expires_in);
|
|
115
|
+
}
|
|
116
|
+
return providerInfo;
|
|
117
|
+
};
|
|
118
|
+
const GetOAuthAccessToken = async (providerInfo) => {
|
|
119
|
+
try {
|
|
120
|
+
const formUrlEncoded = async (x) => await Object.keys(x).reduce(async (acc, c) => {
|
|
121
|
+
let p = await acc;
|
|
122
|
+
return p + `&${c}=${encodeURIComponent(x[c])}`;
|
|
123
|
+
}, Promise.resolve(''));
|
|
124
|
+
let url = providerInfo.AccessTokenURL; //oauth/v3/token if not work
|
|
125
|
+
const formData = await formUrlEncoded({
|
|
126
|
+
grant_type: "authorization_code",
|
|
127
|
+
client_id: providerInfo.ClientId,
|
|
128
|
+
client_secret: providerInfo.ClientSecret,
|
|
129
|
+
redirect_uri: providerInfo.CallBackURL,
|
|
130
|
+
// code: queryParam.code,
|
|
131
|
+
// code_verifier: codeVerifier
|
|
132
|
+
});
|
|
133
|
+
const tokenInfo = await axios_1.default.post(url, formData, { headers: { "Content-Type": 'application/x-www-form-urlencoded' } }).then((res) => {
|
|
134
|
+
return res.data;
|
|
135
|
+
}).catch((err) => {
|
|
136
|
+
console.error(JSON.stringify(err));
|
|
137
|
+
console.error("Error in Axios call of Token Validation" + err);
|
|
138
|
+
throw err;
|
|
139
|
+
});
|
|
140
|
+
return tokenInfo;
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
throw error;
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
const GetOAuthRefreshToken = async (providerInfo) => {
|
|
147
|
+
try {
|
|
148
|
+
let url = `${providerInfo.RefreshTokenURL}?refresh_token=${providerInfo.RefreshToken}&client_id=${providerInfo.ClientId}&client_secret=${providerInfo.ClientSecret}&grant_type=refresh_token`;
|
|
149
|
+
const tokenInfo = await axios_1.default.post(url).then((res) => {
|
|
150
|
+
return res.data;
|
|
151
|
+
}).catch((err) => {
|
|
152
|
+
console.error("Error in axios call of refresh Token");
|
|
153
|
+
throw err;
|
|
154
|
+
});
|
|
155
|
+
return tokenInfo;
|
|
156
|
+
}
|
|
157
|
+
catch (error) {
|
|
158
|
+
throw error;
|
|
159
|
+
}
|
|
160
|
+
};
|
|
161
|
+
const SetTokenExpiry = async (expiresIn = 1800) => {
|
|
162
|
+
return (Date.now() + ((expiresIn - 60) * 1000)).toString();
|
|
163
|
+
};
|
|
164
|
+
// const GetOAuthURL = async (providerInfo: Record<OAuthKeys, string>)=> {
|
|
165
|
+
// try {
|
|
166
|
+
// const scope = providerInfo?.Scope;
|
|
167
|
+
// const tokenKey = providerInfo.CodeVerifier || await this.ssmService.getParameterValue('SIGNING_KEY');
|
|
168
|
+
// const code_verifier = (await this._hashService.getHashedDataString(`${tokenKey}${userId}`)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
169
|
+
// const code_challenge = (await this._hashService.getHashedDataString(code_verifier)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
170
|
+
// let code_challenge_method = providerInfo.CodeChallangeMethod || "S256";
|
|
171
|
+
// return `${providerInfo.AuthURL}?client_id=${providerInfo.ClientId}&redirect_uri=${encodeURIComponent(providerInfo.CallBackURL)}&scope=${scope}&code_challenge=${code_challenge}&code_challenge_method=${code_challenge_method}&state=${userId}`;
|
|
172
|
+
// } catch (error) {
|
|
173
|
+
// console.error("Error in generating OAuth URL");
|
|
174
|
+
// throw error;
|
|
175
|
+
// }
|
|
176
|
+
// }
|
|
177
|
+
exports.OAuth = { discoverOAuthOpenIdMetadata, GetOAuthToken, GetOAuthAccessToken, GetOAuthRefreshToken, SetTokenExpiry };
|
|
91
178
|
//# sourceMappingURL=oauth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../utils/oauth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../utils/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ class WebHookEvent {
|
|
|
70
70
|
config.auth.password = authInfo.password;
|
|
71
71
|
break;
|
|
72
72
|
case enum_1.AuthType.OAuth:
|
|
73
|
-
var OAuthToken = await utils_1.Utils.
|
|
73
|
+
var OAuthToken = await utils_1.Utils.OAuth.GetOAuthToken(authValue);
|
|
74
74
|
config.headers.Authorization = `${(_a = OAuthToken.HeaderPrefix) !== null && _a !== void 0 ? _a : "Bearer"} ${OAuthToken.Token}`;
|
|
75
75
|
break;
|
|
76
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../webbookEvent/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../webbookEvent/index.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/utils/auth.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { OAuthKeys } from "../type";
|
|
2
1
|
import { ContentType } from "../enum";
|
|
3
2
|
export declare const Auth: {
|
|
4
3
|
GetApiKey: (authValue: string) => Promise<{
|
|
@@ -8,9 +7,5 @@ export declare const Auth: {
|
|
|
8
7
|
GetAuthInfo: (authValue: string) => Promise<any>;
|
|
9
8
|
GetBearerToken: (authValue: string) => Promise<string>;
|
|
10
9
|
GetContentType: (contentType: ContentType) => Promise<string>;
|
|
11
|
-
GetOAuthToken: (authValue: string) => Promise<"" | Record<OAuthKeys, any>>;
|
|
12
|
-
GetOAuthAccessToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
13
|
-
GetOAuthRefreshToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
14
|
-
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
15
10
|
AttachClientHeaders: (clientHeaders?: string, contentType?: string, sessionAttributes?: Record<string, string>) => Promise<Record<string, string>>;
|
|
16
11
|
};
|
package/dist/esm/utils/auth.js
CHANGED
|
@@ -41,24 +41,6 @@ const GetBearerToken = (authValue) => __awaiter(void 0, void 0, void 0, function
|
|
|
41
41
|
if (!Array.isArray(provisionList))
|
|
42
42
|
return "";
|
|
43
43
|
const providerInfo = Object.fromEntries(provisionList.map((item) => [item.Key, item.Value]));
|
|
44
|
-
// if (provisionList != null) {
|
|
45
|
-
// let userName = provisionList.find((x: any) => x.Key == 'AuthBearerUsername')?.Value;
|
|
46
|
-
// let password = provisionList.find((x: any) => x.Key == 'AuthBearerPassword')?.Value;
|
|
47
|
-
// let payload = { userName, username: userName, password };
|
|
48
|
-
// let strContentType = await this.GetContentType(ContentType.applicationJson);
|
|
49
|
-
// let url = provisionList.find((x: any) => x.Key == 'AuthBearerURL')?.Value;
|
|
50
|
-
// let config: AxiosRequestConfig<any> = {
|
|
51
|
-
// headers: {
|
|
52
|
-
// "Content-Type": strContentType
|
|
53
|
-
// }
|
|
54
|
-
// }
|
|
55
|
-
// let response = await axios.post(url, payload, config);
|
|
56
|
-
// if (response.status == 200) {
|
|
57
|
-
// let tokenName = provisionList.find((x: any) => x.Key == 'AuthBearerToken')?.Value;
|
|
58
|
-
// let provisionData = response.data;
|
|
59
|
-
// token = provisionData[tokenName];
|
|
60
|
-
// }
|
|
61
|
-
// }
|
|
62
44
|
if (provisionList != null) {
|
|
63
45
|
let payload = { userName: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.AuthBearerUsername, username: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.AuthBearerUsername, password: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.AuthBearerPassword };
|
|
64
46
|
let strContentType = yield GetContentType(ContentType.applicationJson);
|
|
@@ -85,91 +67,6 @@ const GetContentType = (contentType) => __awaiter(void 0, void 0, void 0, functi
|
|
|
85
67
|
}
|
|
86
68
|
return responeValue;
|
|
87
69
|
});
|
|
88
|
-
const GetOAuthToken = (authValue) => __awaiter(void 0, void 0, void 0, function* () {
|
|
89
|
-
if (!authValue)
|
|
90
|
-
throw new Error("OAuth Config Not Found");
|
|
91
|
-
const provisionList = JSON.parse(authValue);
|
|
92
|
-
if (!Array.isArray(provisionList))
|
|
93
|
-
return "";
|
|
94
|
-
const providerInfo = Object.fromEntries(provisionList.map((item) => [item.Key, item.Value]));
|
|
95
|
-
// 🔹 Step 1: If no token → fetch new one
|
|
96
|
-
if (!providerInfo.Token) {
|
|
97
|
-
const tokenInfo = yield GetOAuthAccessToken(providerInfo);
|
|
98
|
-
providerInfo.Token = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.access_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.accessToken);
|
|
99
|
-
providerInfo.RefreshToken = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refresh_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refreshToken) || null;
|
|
100
|
-
providerInfo.Expire = yield SetTokenExpiry(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in);
|
|
101
|
-
}
|
|
102
|
-
// 🔹 Step 2: Check expiry
|
|
103
|
-
const isExpired = !providerInfo.Expire || Number(providerInfo.Expire) <= Date.now();
|
|
104
|
-
if (isExpired && providerInfo.RefreshToken) {
|
|
105
|
-
const refreshTokenInfo = yield GetOAuthRefreshToken(providerInfo);
|
|
106
|
-
providerInfo.Token = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.access_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.accessToken);
|
|
107
|
-
providerInfo.RefreshToken = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refresh_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refreshToken);
|
|
108
|
-
providerInfo.Expire = yield SetTokenExpiry(refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.expires_in);
|
|
109
|
-
}
|
|
110
|
-
return providerInfo;
|
|
111
|
-
});
|
|
112
|
-
// const GetOAuthURL = async (providerInfo: Record<OAuthKeys, string>)=> {
|
|
113
|
-
// try {
|
|
114
|
-
// const scope = providerInfo?.Scope;
|
|
115
|
-
// const tokenKey = providerInfo.CodeVerifier || await this.ssmService.getParameterValue('SIGNING_KEY');
|
|
116
|
-
// const code_verifier = (await this._hashService.getHashedDataString(`${tokenKey}${userId}`)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
117
|
-
// const code_challenge = (await this._hashService.getHashedDataString(code_verifier)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
118
|
-
// let code_challenge_method = providerInfo.CodeChallangeMethod || "S256";
|
|
119
|
-
// return `${providerInfo.AuthURL}?client_id=${providerInfo.ClientId}&redirect_uri=${encodeURIComponent(providerInfo.CallBackURL)}&scope=${scope}&code_challenge=${code_challenge}&code_challenge_method=${code_challenge_method}&state=${userId}`;
|
|
120
|
-
// } catch (error) {
|
|
121
|
-
// console.error("Error in generating OAuth URL");
|
|
122
|
-
// throw error;
|
|
123
|
-
// }
|
|
124
|
-
// }
|
|
125
|
-
const GetOAuthAccessToken = (providerInfo) => __awaiter(void 0, void 0, void 0, function* () {
|
|
126
|
-
try {
|
|
127
|
-
const formUrlEncoded = (x) => __awaiter(void 0, void 0, void 0, function* () {
|
|
128
|
-
return yield Object.keys(x).reduce((acc, c) => __awaiter(void 0, void 0, void 0, function* () {
|
|
129
|
-
let p = yield acc;
|
|
130
|
-
return p + `&${c}=${encodeURIComponent(x[c])}`;
|
|
131
|
-
}), Promise.resolve(''));
|
|
132
|
-
});
|
|
133
|
-
let url = providerInfo.AccessTokenURL; //oauth/v3/token if not work
|
|
134
|
-
const formData = yield formUrlEncoded({
|
|
135
|
-
grant_type: "authorization_code",
|
|
136
|
-
client_id: providerInfo.ClientId,
|
|
137
|
-
client_secret: providerInfo.ClientSecret,
|
|
138
|
-
redirect_uri: providerInfo.CallBackURL,
|
|
139
|
-
// code: queryParam.code,
|
|
140
|
-
// code_verifier: codeVerifier
|
|
141
|
-
});
|
|
142
|
-
const tokenInfo = yield axios.post(url, formData, { headers: { "Content-Type": 'application/x-www-form-urlencoded' } }).then((res) => {
|
|
143
|
-
return res.data;
|
|
144
|
-
}).catch((err) => {
|
|
145
|
-
console.error(JSON.stringify(err));
|
|
146
|
-
console.error("Error in Axios call of Token Validation" + err);
|
|
147
|
-
throw err;
|
|
148
|
-
});
|
|
149
|
-
return tokenInfo;
|
|
150
|
-
}
|
|
151
|
-
catch (error) {
|
|
152
|
-
throw error;
|
|
153
|
-
}
|
|
154
|
-
});
|
|
155
|
-
const GetOAuthRefreshToken = (providerInfo) => __awaiter(void 0, void 0, void 0, function* () {
|
|
156
|
-
try {
|
|
157
|
-
let url = `${providerInfo.RefreshTokenURL}?refresh_token=${providerInfo.RefreshToken}&client_id=${providerInfo.ClientId}&client_secret=${providerInfo.ClientSecret}&grant_type=refresh_token`;
|
|
158
|
-
const tokenInfo = yield axios.post(url).then((res) => {
|
|
159
|
-
return res.data;
|
|
160
|
-
}).catch((err) => {
|
|
161
|
-
console.error("Error in axios call of refresh Token");
|
|
162
|
-
throw err;
|
|
163
|
-
});
|
|
164
|
-
return tokenInfo;
|
|
165
|
-
}
|
|
166
|
-
catch (error) {
|
|
167
|
-
throw error;
|
|
168
|
-
}
|
|
169
|
-
});
|
|
170
|
-
const SetTokenExpiry = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (expiresIn = 1800) {
|
|
171
|
-
return (Date.now() + ((expiresIn - 60) * 1000)).toString();
|
|
172
|
-
});
|
|
173
70
|
const AttachClientHeaders = (clientHeaders, contentType, sessionAttributes) => __awaiter(void 0, void 0, void 0, function* () {
|
|
174
71
|
try {
|
|
175
72
|
const headers = { 'Content-Type': contentType !== null && contentType !== void 0 ? contentType : 'application/json', "Accept": "application/json, text/event-stream, application/x-ndjson, application/json-seq" };
|
|
@@ -187,5 +84,5 @@ const AttachClientHeaders = (clientHeaders, contentType, sessionAttributes) => _
|
|
|
187
84
|
throw error;
|
|
188
85
|
}
|
|
189
86
|
});
|
|
190
|
-
export const Auth = { GetApiKey, GetAuthInfo, GetBearerToken, GetContentType,
|
|
87
|
+
export const Auth = { GetApiKey, GetAuthInfo, GetBearerToken, GetContentType, AttachClientHeaders };
|
|
191
88
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../utils/auth.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,SAAS,GAAG,CAAO,SAAiB,EAAE,EAAE;IAE7C,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAChC,CAAC;IAE1B,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC3B,4EAA4E;QAC5E,6EAA6E;QAC7E,yBAAyB;QACzB,OAAO,EAAE,GAAG,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,EAAE,CAAC;IAChF,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CAAA,CAAA;AAED,MAAM,WAAW,GAAG,CAAO,SAAiB,EAAE,EAAE;IAC/C,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC7B,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAA+B,CAAC;IAEhI,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC3B,sFAAsF;QACtF,sFAAsF;QACtF,IAAI,GAAG,EAAE,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,EAAE,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,EAAE,CAAC;IACjG,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAA,CAAA;AAED,MAAM,cAAc,GAAG,CAAO,SAAiB,EAAE,EAAE;IAClD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CACzB,CAAC;IAEjC
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../utils/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,15 +44,15 @@ export declare const Utils: {
|
|
|
44
44
|
GetAuthInfo: (authValue: string) => Promise<any>;
|
|
45
45
|
GetBearerToken: (authValue: string) => Promise<string>;
|
|
46
46
|
GetContentType: (contentType: import("../enum").ContentType) => Promise<string>;
|
|
47
|
-
GetOAuthToken: (authValue: string) => Promise<"" | Record<import("../type").OAuthKeys, any>>;
|
|
48
|
-
GetOAuthAccessToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
49
|
-
GetOAuthRefreshToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
50
|
-
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
51
47
|
AttachClientHeaders: (clientHeaders?: string, contentType?: string, sessionAttributes?: Record<string, string>) => Promise<Record<string, string>>;
|
|
52
48
|
};
|
|
53
49
|
jwt: typeof jwt;
|
|
54
50
|
OAuth: {
|
|
55
51
|
discoverOAuthOpenIdMetadata: (providerUrl: string) => Promise<import("../type").OAuthMetadata>;
|
|
52
|
+
GetOAuthToken: (authValue: string) => Promise<"" | Record<import("../type").OAuthKeys, any>>;
|
|
53
|
+
GetOAuthAccessToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
54
|
+
GetOAuthRefreshToken: (providerInfo: Record<import("../type").OAuthKeys, string>) => Promise<any>;
|
|
55
|
+
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
56
56
|
};
|
|
57
57
|
MCPOAuth: {
|
|
58
58
|
discoverOAuthResourceMetadata: (mcpServerUrl: string) => Promise<import("../type").OAuthMCPProtectedResourceMetadata>;
|
|
@@ -60,5 +60,7 @@ export declare const Utils: {
|
|
|
60
60
|
registerClient: (metadata: import("../type").OAuthMCPMetadata, redirectUris: string[], client_Name?: string) => Promise<import("../type").ClientCredentials>;
|
|
61
61
|
buildAuthorizationUrl: (metadata: import("../type").OAuthMCPMetadata, clientId: string, redirectUri: string, state: string, codeChallenge?: string, codeChallengeMethod?: string, resource?: string) => Promise<string>;
|
|
62
62
|
handleCallBack: (callbackUrl: string, storedState: string, codeVerifier: string) => Promise<string>;
|
|
63
|
+
GetOAuthMCPAccessToken: (code: string, redirect_uri: string, metaData: import("../type").OAuthMCPMetadata | import("../type").OAuthMetadata, clientCredentials: import("../type").ClientCredentials, code_verifier?: string) => Promise<any>;
|
|
64
|
+
GetOAuthMCPRefreshToken: (metaData: import("../type").OAuthMCPMetadata | import("../type").OAuthMetadata, clientCredentials: import("../type").ClientCredentials, refresh_token: string) => Promise<any>;
|
|
63
65
|
};
|
|
64
66
|
};
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { ClientCredentials, OAuthMCPMetadata, OAuthMCPProtectedResourceMetadata } from "../type";
|
|
1
|
+
import { ClientCredentials, OAuthMCPMetadata, OAuthMCPProtectedResourceMetadata, OAuthMetadata } from "../type";
|
|
2
2
|
export declare const MCPOAuth: {
|
|
3
3
|
discoverOAuthResourceMetadata: (mcpServerUrl: string) => Promise<OAuthMCPProtectedResourceMetadata>;
|
|
4
4
|
discoverOAuthMetadata: (mcpServerUrl: string) => Promise<OAuthMCPMetadata>;
|
|
5
5
|
registerClient: (metadata: OAuthMCPMetadata, redirectUris: string[], client_Name?: string) => Promise<ClientCredentials>;
|
|
6
6
|
buildAuthorizationUrl: (metadata: OAuthMCPMetadata, clientId: string, redirectUri: string, state: string, codeChallenge?: string, codeChallengeMethod?: string, resource?: string) => Promise<string>;
|
|
7
7
|
handleCallBack: (callbackUrl: string, storedState: string, codeVerifier: string) => Promise<string>;
|
|
8
|
+
GetOAuthMCPAccessToken: (code: string, redirect_uri: string, metaData: OAuthMCPMetadata | OAuthMetadata, clientCredentials: ClientCredentials, code_verifier?: string) => Promise<any>;
|
|
9
|
+
GetOAuthMCPRefreshToken: (metaData: OAuthMCPMetadata | OAuthMetadata, clientCredentials: ClientCredentials, refresh_token: string) => Promise<any>;
|
|
8
10
|
};
|
|
@@ -7,6 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import axios from "axios";
|
|
11
|
+
import log from "../logger";
|
|
10
12
|
const discoverOAuthResourceMetadata = (mcpServerUrl) => __awaiter(void 0, void 0, void 0, function* () {
|
|
11
13
|
const url = new URL(mcpServerUrl);
|
|
12
14
|
const protectedResourceUrl = new URL("/.well-known/oauth-protected-resource", url);
|
|
@@ -123,5 +125,95 @@ const parseCallback = (url) => {
|
|
|
123
125
|
error_description: urlParams.get("error_description") || undefined,
|
|
124
126
|
};
|
|
125
127
|
};
|
|
126
|
-
|
|
128
|
+
// const GetOAuthMCPToken = async (tokenInfo: any, metaData: OAuthMCPMetadata | OAuthMetadata, clientCredentials: ClientCredentials) => {
|
|
129
|
+
// // 🔹 Step 1: If no token → fetch new one
|
|
130
|
+
// let token = tokenInfo?.access_token || tokenInfo?.accessToken
|
|
131
|
+
// if (!token) {
|
|
132
|
+
// tokenInfo = await GetOAuthMCPAccessToken(metaData,clientCredentials);
|
|
133
|
+
// tokenInfo.expire_at = await SetTokenExpiry(tokenInfo?.expires_in);
|
|
134
|
+
// return tokenInfo;
|
|
135
|
+
// }
|
|
136
|
+
// if (!tokenInfo?.access_token || tokenInfo?.accessToken)
|
|
137
|
+
// throw new Error("Token Not Found");
|
|
138
|
+
// // 🔹 Step 2: Check expiry
|
|
139
|
+
// let refresh_token = tokenInfo.refresh_token || tokenInfo?.refreshToken;
|
|
140
|
+
// if (!refresh_token)
|
|
141
|
+
// throw new Error("Refresh Token Not Found");
|
|
142
|
+
// const isExpired = !tokenInfo.expire_at || Number(tokenInfo.expire_at) <= Date.now();
|
|
143
|
+
// if (isExpired && refresh_token) {
|
|
144
|
+
// tokenInfo = await GetOAuthMCPRefreshToken(metaData,clientCredentials,refresh_token);
|
|
145
|
+
// tokenInfo.expire_at = await SetTokenExpiry(tokenInfo?.expires_in);
|
|
146
|
+
// return tokenInfo
|
|
147
|
+
// }
|
|
148
|
+
// return tokenInfo;
|
|
149
|
+
// }
|
|
150
|
+
const GetOAuthMCPAccessToken = (code, redirect_uri, metaData, clientCredentials, code_verifier) => __awaiter(void 0, void 0, void 0, function* () {
|
|
151
|
+
var _a, _b, _c, _d;
|
|
152
|
+
try {
|
|
153
|
+
let headers = { "Content-Type": 'application/x-www-form-urlencoded' };
|
|
154
|
+
const keys = {
|
|
155
|
+
grant_type: "authorization_code",
|
|
156
|
+
redirect_uri: redirect_uri,
|
|
157
|
+
code
|
|
158
|
+
};
|
|
159
|
+
if (!((_a = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _a === void 0 ? void 0 : _a.includes('none')) && ((_b = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _b === void 0 ? void 0 : _b.includes('client_secret_post'))) {
|
|
160
|
+
keys.client_id = clientCredentials.client_id,
|
|
161
|
+
keys.client_secret = clientCredentials.client_secret;
|
|
162
|
+
}
|
|
163
|
+
else if ((_c = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _c === void 0 ? void 0 : _c.includes('client_secret_basic')) {
|
|
164
|
+
const token = Buffer.from(`${clientCredentials.client_id}:${clientCredentials.client_secret}`).toString("base64");
|
|
165
|
+
headers.Authorization = `Basic ${token}`;
|
|
166
|
+
}
|
|
167
|
+
if ((_d = metaData === null || metaData === void 0 ? void 0 : metaData.code_challenge_methods_supported) === null || _d === void 0 ? void 0 : _d.length)
|
|
168
|
+
keys.code_verifier = code_verifier;
|
|
169
|
+
const formData = new URLSearchParams(keys);
|
|
170
|
+
let tokenInfo = yield axios.post(metaData.token_endpoint, formData, { headers }).then((res) => {
|
|
171
|
+
return res.data;
|
|
172
|
+
}).catch((err) => {
|
|
173
|
+
log.error(JSON.stringify(err));
|
|
174
|
+
log.error("Error in Axios Call of Token Validation" + err);
|
|
175
|
+
throw err;
|
|
176
|
+
});
|
|
177
|
+
tokenInfo = Object.assign(tokenInfo, { expire_at: yield SetTokenExpiry((tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expiry) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expire)) });
|
|
178
|
+
return tokenInfo;
|
|
179
|
+
}
|
|
180
|
+
catch (error) {
|
|
181
|
+
throw error;
|
|
182
|
+
}
|
|
183
|
+
});
|
|
184
|
+
const GetOAuthMCPRefreshToken = (metaData, clientCredentials, refresh_token) => __awaiter(void 0, void 0, void 0, function* () {
|
|
185
|
+
var _a, _b, _c;
|
|
186
|
+
try {
|
|
187
|
+
let headers = { "Content-Type": 'application/x-www-form-urlencoded' };
|
|
188
|
+
const keys = {
|
|
189
|
+
grant_type: "refresh_token",
|
|
190
|
+
refresh_token,
|
|
191
|
+
};
|
|
192
|
+
if (!((_a = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _a === void 0 ? void 0 : _a.includes('none')) && ((_b = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _b === void 0 ? void 0 : _b.includes('client_secret_post'))) {
|
|
193
|
+
keys.client_id = clientCredentials.client_id,
|
|
194
|
+
keys.client_secret = clientCredentials.client_secret;
|
|
195
|
+
}
|
|
196
|
+
else if ((_c = metaData === null || metaData === void 0 ? void 0 : metaData.token_endpoint_auth_methods_supported) === null || _c === void 0 ? void 0 : _c.includes('client_secret_basic')) {
|
|
197
|
+
const token = Buffer.from(`${clientCredentials.client_id}:${clientCredentials.client_secret}`).toString("base64");
|
|
198
|
+
headers.Authorization = `Basic ${token}`;
|
|
199
|
+
}
|
|
200
|
+
const formData = new URLSearchParams(keys);
|
|
201
|
+
let tokenInfo = yield axios.post(metaData.token_endpoint, formData, { headers }).then((res) => {
|
|
202
|
+
return res.data;
|
|
203
|
+
}).catch((err) => {
|
|
204
|
+
log.error(JSON.stringify(err));
|
|
205
|
+
log.error("Error in Axios Call of refresh Token" + err);
|
|
206
|
+
throw err;
|
|
207
|
+
});
|
|
208
|
+
tokenInfo = Object.assign(tokenInfo, { expire_at: yield SetTokenExpiry((tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expiry) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expire)) });
|
|
209
|
+
return tokenInfo;
|
|
210
|
+
}
|
|
211
|
+
catch (error) {
|
|
212
|
+
throw error;
|
|
213
|
+
}
|
|
214
|
+
});
|
|
215
|
+
const SetTokenExpiry = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (expiresIn = 1800) {
|
|
216
|
+
return (Date.now() + ((expiresIn - 60) * 1000)).toString();
|
|
217
|
+
});
|
|
218
|
+
export const MCPOAuth = { discoverOAuthResourceMetadata, discoverOAuthMetadata, registerClient, buildAuthorizationUrl, handleCallBack, GetOAuthMCPAccessToken, GetOAuthMCPRefreshToken };
|
|
127
219
|
//# sourceMappingURL=mcp-oauth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-oauth.js","sourceRoot":"","sources":["../../../utils/mcp-oauth.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"mcp-oauth.js","sourceRoot":"","sources":["../../../utils/mcp-oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import { OAuthMetadata } from "../type";
|
|
1
|
+
import { OAuthKeys, OAuthMetadata } from "../type";
|
|
2
2
|
export declare const OAuth: {
|
|
3
3
|
discoverOAuthOpenIdMetadata: (providerUrl: string) => Promise<OAuthMetadata>;
|
|
4
|
+
GetOAuthToken: (authValue: string) => Promise<"" | Record<OAuthKeys, any>>;
|
|
5
|
+
GetOAuthAccessToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
6
|
+
GetOAuthRefreshToken: (providerInfo: Record<OAuthKeys, string>) => Promise<any>;
|
|
7
|
+
SetTokenExpiry: (expiresIn?: number) => Promise<string>;
|
|
4
8
|
};
|
package/dist/esm/utils/oauth.js
CHANGED
|
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import axios from "axios";
|
|
10
11
|
const OPENID_CONFIGURATION_URLS = {
|
|
11
12
|
// Google
|
|
12
13
|
google: "https://accounts.google.com",
|
|
@@ -93,5 +94,90 @@ const discoverOAuthOpenIdMetadata = (providerUrl) => __awaiter(void 0, void 0, v
|
|
|
93
94
|
const metadata = (yield openIdResponse.json());
|
|
94
95
|
return metadata;
|
|
95
96
|
});
|
|
96
|
-
|
|
97
|
+
const GetOAuthToken = (authValue) => __awaiter(void 0, void 0, void 0, function* () {
|
|
98
|
+
if (!authValue)
|
|
99
|
+
throw new Error("OAuth Config Not Found");
|
|
100
|
+
const provisionList = JSON.parse(authValue);
|
|
101
|
+
if (!Array.isArray(provisionList))
|
|
102
|
+
return "";
|
|
103
|
+
const providerInfo = Object.fromEntries(provisionList.map((item) => [item.Key, item.Value]));
|
|
104
|
+
// 🔹 Step 1: If no token → fetch new one
|
|
105
|
+
if (!providerInfo.Token) {
|
|
106
|
+
const tokenInfo = yield GetOAuthAccessToken(providerInfo);
|
|
107
|
+
providerInfo.Token = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.access_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.accessToken);
|
|
108
|
+
providerInfo.RefreshToken = (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refresh_token) || (tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.refreshToken) || null;
|
|
109
|
+
providerInfo.Expire = yield SetTokenExpiry(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.expires_in);
|
|
110
|
+
}
|
|
111
|
+
// 🔹 Step 2: Check expiry
|
|
112
|
+
const isExpired = !providerInfo.Expire || Number(providerInfo.Expire) <= Date.now();
|
|
113
|
+
if (isExpired && providerInfo.RefreshToken) {
|
|
114
|
+
const refreshTokenInfo = yield GetOAuthRefreshToken(providerInfo);
|
|
115
|
+
providerInfo.Token = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.access_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.accessToken);
|
|
116
|
+
providerInfo.RefreshToken = (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refresh_token) || (refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.refreshToken);
|
|
117
|
+
providerInfo.Expire = yield SetTokenExpiry(refreshTokenInfo === null || refreshTokenInfo === void 0 ? void 0 : refreshTokenInfo.expires_in);
|
|
118
|
+
}
|
|
119
|
+
return providerInfo;
|
|
120
|
+
});
|
|
121
|
+
const GetOAuthAccessToken = (providerInfo) => __awaiter(void 0, void 0, void 0, function* () {
|
|
122
|
+
try {
|
|
123
|
+
const formUrlEncoded = (x) => __awaiter(void 0, void 0, void 0, function* () {
|
|
124
|
+
return yield Object.keys(x).reduce((acc, c) => __awaiter(void 0, void 0, void 0, function* () {
|
|
125
|
+
let p = yield acc;
|
|
126
|
+
return p + `&${c}=${encodeURIComponent(x[c])}`;
|
|
127
|
+
}), Promise.resolve(''));
|
|
128
|
+
});
|
|
129
|
+
let url = providerInfo.AccessTokenURL; //oauth/v3/token if not work
|
|
130
|
+
const formData = yield formUrlEncoded({
|
|
131
|
+
grant_type: "authorization_code",
|
|
132
|
+
client_id: providerInfo.ClientId,
|
|
133
|
+
client_secret: providerInfo.ClientSecret,
|
|
134
|
+
redirect_uri: providerInfo.CallBackURL,
|
|
135
|
+
// code: queryParam.code,
|
|
136
|
+
// code_verifier: codeVerifier
|
|
137
|
+
});
|
|
138
|
+
const tokenInfo = yield axios.post(url, formData, { headers: { "Content-Type": 'application/x-www-form-urlencoded' } }).then((res) => {
|
|
139
|
+
return res.data;
|
|
140
|
+
}).catch((err) => {
|
|
141
|
+
console.error(JSON.stringify(err));
|
|
142
|
+
console.error("Error in Axios call of Token Validation" + err);
|
|
143
|
+
throw err;
|
|
144
|
+
});
|
|
145
|
+
return tokenInfo;
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
throw error;
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
const GetOAuthRefreshToken = (providerInfo) => __awaiter(void 0, void 0, void 0, function* () {
|
|
152
|
+
try {
|
|
153
|
+
let url = `${providerInfo.RefreshTokenURL}?refresh_token=${providerInfo.RefreshToken}&client_id=${providerInfo.ClientId}&client_secret=${providerInfo.ClientSecret}&grant_type=refresh_token`;
|
|
154
|
+
const tokenInfo = yield axios.post(url).then((res) => {
|
|
155
|
+
return res.data;
|
|
156
|
+
}).catch((err) => {
|
|
157
|
+
console.error("Error in axios call of refresh Token");
|
|
158
|
+
throw err;
|
|
159
|
+
});
|
|
160
|
+
return tokenInfo;
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
throw error;
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
const SetTokenExpiry = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (expiresIn = 1800) {
|
|
167
|
+
return (Date.now() + ((expiresIn - 60) * 1000)).toString();
|
|
168
|
+
});
|
|
169
|
+
// const GetOAuthURL = async (providerInfo: Record<OAuthKeys, string>)=> {
|
|
170
|
+
// try {
|
|
171
|
+
// const scope = providerInfo?.Scope;
|
|
172
|
+
// const tokenKey = providerInfo.CodeVerifier || await this.ssmService.getParameterValue('SIGNING_KEY');
|
|
173
|
+
// const code_verifier = (await this._hashService.getHashedDataString(`${tokenKey}${userId}`)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
174
|
+
// const code_challenge = (await this._hashService.getHashedDataString(code_verifier)).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
175
|
+
// let code_challenge_method = providerInfo.CodeChallangeMethod || "S256";
|
|
176
|
+
// return `${providerInfo.AuthURL}?client_id=${providerInfo.ClientId}&redirect_uri=${encodeURIComponent(providerInfo.CallBackURL)}&scope=${scope}&code_challenge=${code_challenge}&code_challenge_method=${code_challenge_method}&state=${userId}`;
|
|
177
|
+
// } catch (error) {
|
|
178
|
+
// console.error("Error in generating OAuth URL");
|
|
179
|
+
// throw error;
|
|
180
|
+
// }
|
|
181
|
+
// }
|
|
182
|
+
export const OAuth = { discoverOAuthOpenIdMetadata, GetOAuthToken, GetOAuthAccessToken, GetOAuthRefreshToken, SetTokenExpiry };
|
|
97
183
|
//# sourceMappingURL=oauth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../utils/oauth.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../utils/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,7 @@ export default class WebHookEvent {
|
|
|
77
77
|
config.auth.password = authInfo.password;
|
|
78
78
|
break;
|
|
79
79
|
case AuthType.OAuth:
|
|
80
|
-
var OAuthToken = yield Utils.
|
|
80
|
+
var OAuthToken = yield Utils.OAuth.GetOAuthToken(authValue);
|
|
81
81
|
config.headers.Authorization = `${(_a = OAuthToken.HeaderPrefix) !== null && _a !== void 0 ? _a : "Bearer"} ${OAuthToken.Token}`;
|
|
82
82
|
break;
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../webbookEvent/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../webbookEvent/index.ts"],"names":[],"mappings":"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"}
|