yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 09:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from strapi/chore/fix-rebase

Browse Source 
Chore/fix rebase
This commit is contained in:
cyril lopez 2020-07-08 12:50:12 +02:00 committed by GitHub
commit db4f0cf8b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/strapi-admin/admin/src/containers/AuthPage/index.js
View File

@ -1,6 +1,6 @@
import React, { useEffect, useReducer } from 'react'; import React, { useEffect, useReducer } from 'react';
import axios from 'axios'; 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 { Redirect, useRouteMatch, useHistory } from 'react-router-dom';
import { auth, useQuery } from 'strapi-helper-plugin'; import { auth, useQuery } from 'strapi-helper-plugin';
import { Padded } from '@buffetjs/core'; import { Padded } from '@buffetjs/core';
@ -207,12 +207,7 @@ const AuthPage = ({ hasAdmin }) => {
axios({ axios({
method: 'POST', method: 'POST',
url: 'https://analytics.strapi.io/register', url: 'https://analytics.strapi.io/register',
data: omit(modifiedData, [ data: pick(modifiedData, ['userInfo.email', 'userInfo.firstname']),
'userInfo.password',
'userInfo.confirmPassword',
'password',
'confirmPassword',
]),
}); });
} }
// Redirect to the homePage // Redirect to the homePage

2
packages/strapi-helper-plugin/lib/src/utils/hasPermissions.js
View File

@ -20,7 +20,7 @@ const findMatchingPermissions = (userPermissions, permissions) => {
const formatPermissionsForRequest = permissions => const formatPermissionsForRequest = permissions =>
permissions.map(permission => permissions.map(permission =>
pickBy(permission, (value, key) => { pickBy(permission, (value, key) => {
return ['action', 'subject', 'fields'].includes(key) && !isEmpty(value); return ['action', 'subject'].includes(key) && !isEmpty(value);
}) })
); );