@dainprotocol/service-sdk 1.0.82 → 1.0.83
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/service/oauth2.js +14 -14
- package/dist/service/oauth2.js.map +1 -1
- package/dist/service/types.d.ts +3 -2
- package/package.json +1 -1
package/dist/service/oauth2.js
CHANGED
|
@@ -40,28 +40,28 @@ class OAuth2Handler {
|
|
|
40
40
|
provider,
|
|
41
41
|
timestamp: Date.now(),
|
|
42
42
|
};
|
|
43
|
+
// Create base params that are common for both PKCE and non-PKCE flows
|
|
44
|
+
const baseParams = {
|
|
45
|
+
client_id: providerConfig.clientId,
|
|
46
|
+
redirect_uri: `${this.baseUrl}/oauth2/callback/${provider}`,
|
|
47
|
+
response_type: 'code',
|
|
48
|
+
scope: providerConfig.scopes.join(' '),
|
|
49
|
+
state: await this.encodeState(stateData),
|
|
50
|
+
};
|
|
51
|
+
// Add any extra parameters defined in the provider config
|
|
52
|
+
if (providerConfig.extraAuthParams) {
|
|
53
|
+
Object.assign(baseParams, providerConfig.extraAuthParams);
|
|
54
|
+
}
|
|
43
55
|
if (providerConfig.usePKCE) {
|
|
44
56
|
const codeVerifier = this.generateCodeVerifier();
|
|
45
57
|
const codeChallenge = this.generateCodeChallenge(codeVerifier);
|
|
46
58
|
stateData.codeVerifier = codeVerifier;
|
|
47
|
-
|
|
48
|
-
response_type: 'code',
|
|
49
|
-
client_id: providerConfig.clientId,
|
|
50
|
-
redirect_uri: `${this.baseUrl}/oauth2/callback/${provider}`,
|
|
51
|
-
scope: providerConfig.scopes.join(' '),
|
|
52
|
-
state: await this.encodeState(stateData),
|
|
59
|
+
Object.assign(baseParams, {
|
|
53
60
|
code_challenge: codeChallenge,
|
|
54
61
|
code_challenge_method: 'S256'
|
|
55
62
|
});
|
|
56
|
-
return `${providerConfig.authorizationUrl}?${params.toString()}`;
|
|
57
63
|
}
|
|
58
|
-
const params = new URLSearchParams(
|
|
59
|
-
client_id: providerConfig.clientId,
|
|
60
|
-
redirect_uri: `${this.baseUrl}/oauth2/callback/${provider}`,
|
|
61
|
-
response_type: 'code',
|
|
62
|
-
scope: providerConfig.scopes.join(' '),
|
|
63
|
-
state: await this.encodeState(stateData),
|
|
64
|
-
});
|
|
64
|
+
const params = new URLSearchParams(baseParams);
|
|
65
65
|
return `${providerConfig.authorizationUrl}?${params.toString()}`;
|
|
66
66
|
}
|
|
67
67
|
async handleCallback(code, state) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2.js","sourceRoot":"","sources":["../../src/service/oauth2.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"oauth2.js","sourceRoot":"","sources":["../../src/service/oauth2.ts"],"names":[],"mappings":";;;AACA,+CAAoD;AACpD,+CAAyD;AACzD,mCAAiD;AASjD,MAAa,aAAa;IACP,SAAS,CAAoC;IAC7C,UAAU,CAAS;IACnB,OAAO,CAAS;IAChB,UAAU,CAA0B;IAErD,YAAY,UAAkB,EAAE,OAAe,EAAE,UAAoC;QACnF,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,IAAI,sCAAwB,EAAE,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,IAAY,EAAE,MAA4B;QACzD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAEO,oBAAoB;QAC1B,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC;aACnB,QAAQ,CAAC,QAAQ,CAAC;aAClB,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;aAC5B,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;IAEO,qBAAqB,CAAC,QAAgB;QAC5C,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC3B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,OAAe;QACrD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;QAEtE,MAAM,SAAS,GAAc;YAC3B,OAAO;YACP,QAAQ;YACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;QAEF,sEAAsE;QACtE,MAAM,UAAU,GAA2B;YACzC,SAAS,EAAE,cAAc,CAAC,QAAQ;YAClC,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,oBAAoB,QAAQ,EAAE;YAC3D,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACtC,KAAK,EAAE,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;SACzC,CAAC;QAEF,0DAA0D;QAC1D,IAAI,cAAc,CAAC,eAAe,EAAE,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,eAAe,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACjD,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;YAC/D,SAAS,CAAC,YAAY,GAAG,YAAY,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;gBACxB,cAAc,EAAE,aAAa;gBAC7B,qBAAqB,EAAE,MAAM;aAC9B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;QAC/C,OAAO,GAAG,cAAc,CAAC,gBAAgB,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,IAAY,EACZ,KAAa;QAMb,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE9D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC7C,IAAI,EACJ,cAAc,EACd,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,YAAY,CACvB,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEhF,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;YAC7B,MAAM,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO;YACL,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,MAAM;SACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,IAAY,EACZ,MAA4B,EAC5B,QAAgB,EAChB,YAAqB;QAErB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,QAAQ;YAC1B,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,oBAAoB,QAAQ,EAAE;YAC3D,IAAI;YACJ,UAAU,EAAE,oBAAoB;SACjC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,mCAAmC;YACnD,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;QAEF,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC9F,OAAO,CAAC,eAAe,CAAC,GAAG,SAAS,SAAS,EAAE,CAAC;QAClD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC5C,MAAM,EAAE,MAAM;YACd,OAAO;YACP,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEnC,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,YAAY,EAAE,IAAI,CAAC,aAAa;YAChC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAe;QAC/B,OAAO,MAAM,IAAA,uBAAQ,EAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,OAAO,MAAM,IAAA,yBAAU,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,OAAe;QACpD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe;QAKhC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAClE,IAAI;YACJ,MAAM,EAAE;gBACN,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,aAAa,EAAE,MAAM,CAAC,aAAa;aACpC;YACD,SAAS,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;SAC/D,CAAC,CAAC,CACJ,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA/LD,sCA+LC"}
|
package/dist/service/types.d.ts
CHANGED
|
@@ -182,11 +182,12 @@ export interface OAuth2ProviderConfig {
|
|
|
182
182
|
authorizationUrl: string;
|
|
183
183
|
tokenUrl: string;
|
|
184
184
|
scopes: string[];
|
|
185
|
+
usePKCE?: boolean;
|
|
186
|
+
useBasicAuth?: boolean;
|
|
185
187
|
reason?: string;
|
|
186
188
|
requiredTools?: string[];
|
|
187
189
|
onSuccess?: (agentId: string, tokens: OAuth2Tokens) => Promise<void>;
|
|
188
|
-
|
|
189
|
-
useBasicAuth?: boolean;
|
|
190
|
+
extraAuthParams?: Record<string, string>;
|
|
190
191
|
}
|
|
191
192
|
export type OAuth2Config = {
|
|
192
193
|
providers: Record<string, OAuth2ProviderConfig>;
|