Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Put missing code back #14072

Merged
merged 1 commit into from Aug 11, 2022
Merged

Put missing code back #14072

merged 1 commit into from Aug 11, 2022

Conversation

alexandrebodin
Copy link
Member

@alexandrebodin alexandrebodin commented Aug 11, 2022

What does it do?

Put missing code back that got drop in a merge conflict probably

Why is it needed?

Describe the issue you are solving.

How to test it?

Provide information about the environment and the path to verify the behaviour.

Related issue(s)/PR(s)

Fixes #14069

@alexandrebodin alexandrebodin marked this pull request as ready for review August 11, 2022 08:05
@alexandrebodin alexandrebodin added source: plugin:users-permissions Source is plugin/users-permissions package pr: fix This PR is fixing a bug labels Aug 11, 2022
@alexandrebodin alexandrebodin added this to the 4.3.4 milestone Aug 11, 2022
Copy link
Contributor

@petersg83 petersg83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't try to setup an external provider but based on the code in previous strapi versions, it looks good to me

@codecov
Copy link

codecov bot commented Aug 11, 2022

Codecov Report

Merging #14072 (dd357e6) into master (4d60bfd) will decrease coverage by 6.76%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #14072      +/-   ##
==========================================
- Coverage   55.34%   48.58%   -6.77%     
==========================================
  Files        1258      246    -1012     
  Lines       31702     9194   -22508     
  Branches     5735     2025    -3710     
==========================================
- Hits        17546     4467   -13079     
+ Misses      12340     3901    -8439     
+ Partials     1816      826     -990     
Flag Coverage Δ
front ?
unit 48.58% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
.../src/middlewares/extendCTBInitialDataMiddleware.js
...dmin/src/components/GuidedTour/Stepper/StepLine.js
...c/contexts/PermisssionsDataManagerContext/index.js
...ontent-manager/pages/App/utils/checkPermissions.js
...ckages/core/admin/admin/src/utils/getRequestUrl.js
...ger/pages/EditSettingsView/components/LinkToCTB.js
...MediaLibraryInput/Carousel/CarouselAssetActions.js
packages/core/upload/admin/src/hooks/useUpload.js
...onents/AutoReloadOverlayBlockerProvider/Blocker.js
.../Webhooks/EditView/components/WebhookForm/index.js
... and 1002 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@alexandrebodin alexandrebodin merged commit b0da408 into master Aug 11, 2022
@alexandrebodin alexandrebodin deleted the fix/lost-code-merge branch August 11, 2022 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: fix This PR is fixing a bug source: plugin:users-permissions Source is plugin/users-permissions package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Call to /api/auth/<provider>/callback?access_token=<the access token> returns a 404
3 participants