From 76943f01e375606783ebda62c1aaa059fa226f0a Mon Sep 17 00:00:00 2001 From: p-netm Date: Wed, 17 Jun 2020 15:14:08 +0300 Subject: [PATCH] Revert "Rename apiResponse field from userName to username" This reverts commit c3dc18efbf1e6aa4d14f64db5ee4dbcddc5e40c3. --- packages/gatekeeper/src/helpers/oauth.ts | 4 ++-- packages/gatekeeper/src/helpers/tests/fixtures.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gatekeeper/src/helpers/oauth.ts b/packages/gatekeeper/src/helpers/oauth.ts index 2e23cd92..ddf16e54 100644 --- a/packages/gatekeeper/src/helpers/oauth.ts +++ b/packages/gatekeeper/src/helpers/oauth.ts @@ -53,7 +53,7 @@ export function getOnadataUserInfo(apiResponse: { [key: string]: any }): Session * @param {{[key: string]: any }} apiResponse - the API response object */ export function getOpenSRPUserInfo(apiResponse: { [key: string]: any }): SessionState { - if (!apiResponse.username) { + if (!apiResponse.userName) { throw new Error(OAUTH2_CALLBACK_ERROR); } return { @@ -63,7 +63,7 @@ export function getOpenSRPUserInfo(apiResponse: { [key: string]: any }): Session email: '', gravatar: '', name: '', - username: apiResponse.username + username: apiResponse.userName } }; } diff --git a/packages/gatekeeper/src/helpers/tests/fixtures.ts b/packages/gatekeeper/src/helpers/tests/fixtures.ts index 9209b6d0..e55d71d7 100644 --- a/packages/gatekeeper/src/helpers/tests/fixtures.ts +++ b/packages/gatekeeper/src/helpers/tests/fixtures.ts @@ -81,7 +81,7 @@ export const onadataSessionWithOauthData = { export const openSRPResponse = { preferredName: 'mosh', roles: ['Privilege Level: Full'], - username: 'moshthepitt' + userName: 'moshthepitt' }; export const openSRPFinalData = { @@ -96,7 +96,7 @@ export const openSRPSession = { email: '', gravatar: '', name: '', - username: openSRPResponse.username + username: openSRPResponse.userName } };