mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow optional specification of Origin header for Auth Code flow + PKCE (#3783)

Browse Source 
Co-authored-by: Opender Singh <opender.singh@konghq.com>
This commit is contained in:
Paul Johnson 2021-08-09 23:30:32 +01:00 committed by GitHub
parent 8478fbc27f
commit 366a54f630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/insomnia-app/app/network/o-auth-2/get-token.ts
View File

@ -71,6 +71,7 @@ async function _getOAuth2AuthorizationCodeHeader(
authentication.resource,
authentication.usePkce,
authentication.pkceMethod,
authentication.origin,
);
return _updateOAuth2Token(requestId, results);
}
@ -190,6 +191,7 @@ async function _getAccessToken(
authentication.clientSecret,
token.refreshToken,
authentication.scope,
authentication.origin,
);
// If we didn't receive an access token it means the refresh token didn't succeed,

7
packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.ts
View File

@ -23,6 +23,7 @@ export default async function(
resource = '',
usePkce = false,
pkceMethod = c.PKCE_CHALLENGE_S256,
origin = '',
): Promise<Record<string, any>> {
if (!authorizeUrl) {
throw new Error('Invalid authorization URL');
@ -80,6 +81,7 @@ export default async function(
audience,
resource,
codeVerifier,
origin,
);
}
@ -171,6 +173,7 @@ async function _getToken(
audience = '',
resource = '',
codeVerifier = '',
origin = '',
): Promise<Record<string, any>> {
const params = [
{
@ -232,6 +235,10 @@ async function _getToken(
headers.push(getBasicAuthHeader(clientId, clientSecret));
}
if (origin) {
headers.push({ name: 'Origin', value: origin });
}
const responsePatch = await sendWithSettings(requestId, {
headers,
url,

5
packages/insomnia-app/app/network/o-auth-2/refresh-token.ts
View File

@ -14,6 +14,7 @@ export default async function(
clientSecret: string,
refreshToken: string,
scope: string,
origin: string,
): Promise<Record<string, any>> {
const params = [
{
@ -55,6 +56,10 @@ export default async function(
headers.push(getBasicAuthHeader(clientId, clientSecret));
}
if (origin) {
headers.push({ name: 'Origin', value: origin });
}
const url = setDefaultProtocol(accessTokenUrl);
const response = await sendWithSettings(requestId, {
headers,

12
packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.tsx
View File

@ -241,6 +241,10 @@ class OAuth2Auth extends PureComponent<Props, State> {
this._handleChangeProperty('resource', value);
}
_handleChangeOrigin(value: string) {
this._handleChangeProperty('origin', value);
}
_handleChangeGrantType(e: React.SyntheticEvent<HTMLInputElement>) {
this._handleChangeProperty('grantType', e.currentTarget.value);
}
@ -497,6 +501,12 @@ class OAuth2Auth extends PureComponent<Props, State> {
this._handleChangeResource,
'Indicate what resource to access',
);
const origin = this.renderInputRow(
'Origin',
'origin',
this._handleChangeOrigin,
'Specify Origin header when CORS is required for oauth endpoints',
);
const credentialsInBody = this.renderSelectRow(
'Credentials',
'credentialsInBody',
@ -527,7 +537,7 @@ class OAuth2Auth extends PureComponent<Props, State> {
enabled,
];
advancedFields = [scope, state, credentialsInBody, tokenPrefix, audience, resource];
advancedFields = [scope, state, credentialsInBody, tokenPrefix, audience, resource, origin];
} else if (grantType === GRANT_TYPE_CLIENT_CREDENTIALS) {
basicFields = [accessTokenUrl, clientId, clientSecret, enabled];
advancedFields = [scope, credentialsInBody, tokenPrefix, audience, resource];