Added Organization to OAuth2.

packages/insomnia-sdk/src/objects/__tests__/auth.test.ts

@@ -169,6 +169,7 @@ describe('test auth transforming', () => {
             pkceMethod: 'pkceMethod',
             responseType: 'id_token',
             origin: 'origin',
+            organization: 'org',
         };
 
         [

packages/insomnia-sdk/src/objects/auth.ts

@@ -494,6 +494,7 @@ export function fromPreRequestAuth(auth: RequestAuth): RequestAuthentication {
                 refreshToken: findValueInOauth2Options('refreshTokenUrl', authObj.oauth2),
                 credentialsInBody: findValueInOauth2Options('client_authentication', authObj.oauth2) === 'body',
                 audience: findValueInOauth2Options('audience', authObj.oauth2) || '',
+                organization: findValueInOauth2Options('organization', authObj.oauth2) || '',
                 resource: findValueInOauth2Options('resource', authObj.oauth2) || '',
                 // following properties are not supported yet in the script side, just try to find and set them
                 tokenPrefix: findValueInOauth2Options('tokenPrefix', authObj.oauth2),
@@ -681,6 +682,13 @@ export function toPreRequestAuth(auth: RequestAuthentication | {}): AuthOptions
                                 send_as: 'request_url', // request_body or request_header
 
                             },
+                            {
+                                key: 'organization',
+                                value: auth.organization || '',
+                                enabled: true,
+                                send_as: 'request_url', // request_body or request_header
+
+                            },
                         ],
                     },
 

packages/insomnia/src/models/request.ts

@@ -81,6 +81,7 @@ export interface AuthTypeOAuth2 {
   pkceMethod?: string;
   responseType?: OAuth2ResponseType;
   origin?: string;
+  organization?: string;
 }
 export interface AuthTypeHawk {
   type: typeof AUTH_HAWK;

packages/insomnia/src/network/o-auth-2/constants.ts

@@ -29,6 +29,7 @@ export type AuthKeys =
     'token_type' |
     'username' |
     'xError' |
-    'xResponseId';
+    'xResponseId' |
+    'organization';
 export const PKCE_CHALLENGE_S256 = 'S256';
 export const PKCE_CHALLENGE_PLAIN = 'plain';

packages/insomnia/src/network/o-auth-2/get-token.ts

@@ -60,6 +60,7 @@ export const getOAuth2Token = async (
       ...insertAuthKeyIf('scope', authentication.scope),
       ...insertAuthKeyIf('state', authentication.state),
       ...insertAuthKeyIf('audience', authentication.audience),
+      ...insertAuthKeyIf('organization', authentication.organization),
       ...(hasNonce ? [{
         name: 'nonce', value: Math.floor(Math.random() * 9999999999999) + 1 + '',
       }] : []),
@@ -105,6 +106,7 @@ export const getOAuth2Token = async (
       ...insertAuthKeyIf('state', authentication.state),
       ...insertAuthKeyIf('audience', authentication.audience),
       ...insertAuthKeyIf('resource', authentication.resource),
+      ...insertAuthKeyIf('organization', authentication.organization),
       ...(codeChallenge ? [
         { name: 'code_challenge', value: codeChallenge },
         { name: 'code_challenge_method', value: authentication.pkceMethod },
@@ -134,6 +136,7 @@ export const getOAuth2Token = async (
       ...insertAuthKeyIf('audience', authentication.audience),
       ...insertAuthKeyIf('resource', authentication.resource),
       ...insertAuthKeyIf('code_verifier', codeVerifier),
+      ...insertAuthKeyIf('organization', authentication.organization),
     ];
   } else if (authentication.grantType === 'password') {
     params = [
@@ -142,13 +145,15 @@ export const getOAuth2Token = async (
       ...insertAuthKeyIf('password', authentication.password),
       ...insertAuthKeyIf('scope', authentication.scope),
       ...insertAuthKeyIf('audience', authentication.audience),
+      ...insertAuthKeyIf('organization', authentication.organization),
     ];
   } else if (authentication.grantType === 'client_credentials') {
     params = [
       { name: 'grant_type', value: 'client_credentials' },
       ...insertAuthKeyIf('scope', authentication.scope),
       ...insertAuthKeyIf('audience', authentication.audience),
       ...insertAuthKeyIf('resource', authentication.resource),
+      ...insertAuthKeyIf('organization', authentication.organization),
     ];
   }
   const headers = authentication.origin ? [{ name: 'Origin', value: authentication.origin }] : [];

packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx

@@ -117,6 +117,7 @@ const getFields = (authentication: Extract<RequestAuthentication, { type: typeof
     help='Indicates the type of credentials returned in the response'
   />;
   const audience = <AuthInputRow label='Audience' property='audience' key='audience' help='Indicate what resource server to access' />;
+  const organization = <AuthInputRow label='Organization' property='organization' key='organization' help='Indicate what Organization the client belongs to' />;
   const resource = <AuthInputRow label='Resource' property='resource' key='resource' help='Indicate what resource to access' />;
   const origin = <AuthInputRow label='Origin' property='origin' key='origin' help='Specify Origin header when CORS is required for oauth endpoints' />;
   const credentialsInBody = <AuthSelectRow
@@ -142,6 +143,7 @@ const getFields = (authentication: Extract<RequestAuthentication, { type: typeof
     tokenPrefix,
     responseType,
     audience,
+    organization,
     resource,
     origin,
     credentialsInBody,
@@ -167,6 +169,7 @@ const getFieldsForGrantType = (authentication: Extract<RequestAuthentication, {
     resource,
     origin,
     credentialsInBody,
+    organization,
   } = getFields(authentication);
 
   const { grantType } = authentication;
@@ -193,6 +196,7 @@ const getFieldsForGrantType = (authentication: Extract<RequestAuthentication, {
       audience,
       resource,
       origin,
+      organization,
     ];
   } else if (grantType === GRANT_TYPE_CLIENT_CREDENTIALS) {
     basic = [
@@ -207,6 +211,7 @@ const getFieldsForGrantType = (authentication: Extract<RequestAuthentication, {
       tokenPrefix,
       audience,
       resource,
+      organization,
     ];
   } else if (grantType === GRANT_TYPE_PASSWORD) {
     basic = [
@@ -222,6 +227,7 @@ const getFieldsForGrantType = (authentication: Extract<RequestAuthentication, {
       credentialsInBody,
       tokenPrefix,
       audience,
+      organization,
     ];
   } else if (grantType === GRANT_TYPE_IMPLICIT) {
     basic = [
@@ -236,6 +242,7 @@ const getFieldsForGrantType = (authentication: Extract<RequestAuthentication, {
       state,
       tokenPrefix,
       audience,
+      organization,
     ];
   }