From d692a61db34ac0bdbe48c81ca0b47af7e93615ea Mon Sep 17 00:00:00 2001 From: soupette Date: Wed, 8 Jul 2020 11:56:22 +0200 Subject: [PATCH 1/2] Fix AuthPage conflicts Signed-off-by: soupette --- .../strapi-admin/admin/src/containers/AuthPage/index.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/index.js index 6d0ba4e139..8d0014d791 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/index.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/index.js @@ -1,6 +1,6 @@ import React, { useEffect, useReducer } from 'react'; import axios from 'axios'; -import { camelCase, get, omit, upperFirst } from 'lodash'; +import { camelCase, get, omit, upperFirst, pick } from 'lodash'; import { Redirect, useRouteMatch, useHistory } from 'react-router-dom'; import { auth, useQuery } from 'strapi-helper-plugin'; import { Padded } from '@buffetjs/core'; @@ -207,12 +207,7 @@ const AuthPage = ({ hasAdmin }) => { axios({ method: 'POST', url: 'https://analytics.strapi.io/register', - data: omit(modifiedData, [ - 'userInfo.password', - 'userInfo.confirmPassword', - 'password', - 'confirmPassword', - ]), + data: pick(modifiedData, ['userInfo.email', 'userInfo.firstname']), }); } // Redirect to the homePage From 783356647cf64fa2d5961cd08f15d9199c134857 Mon Sep 17 00:00:00 2001 From: soupette Date: Wed, 8 Jul 2020 12:00:43 +0200 Subject: [PATCH 2/2] Fix conflict helper => hasPermissions.js Signed-off-by: soupette --- packages/strapi-helper-plugin/lib/src/utils/hasPermissions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/utils/hasPermissions.js b/packages/strapi-helper-plugin/lib/src/utils/hasPermissions.js index c244880c21..f3e0fd7593 100644 --- a/packages/strapi-helper-plugin/lib/src/utils/hasPermissions.js +++ b/packages/strapi-helper-plugin/lib/src/utils/hasPermissions.js @@ -20,7 +20,7 @@ const findMatchingPermissions = (userPermissions, permissions) => { const formatPermissionsForRequest = permissions => permissions.map(permission => pickBy(permission, (value, key) => { - return ['action', 'subject', 'fields'].includes(key) && !isEmpty(value); + return ['action', 'subject'].includes(key) && !isEmpty(value); }) );