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

Fix Reset password link and overlays broken #2612

Merged
merged 7 commits into from
Aug 1, 2017

Conversation

impactmass
Copy link
Contributor

@impactmass impactmass commented Aug 1, 2017

WIP on the bug #2605. Currently testing

How to test:
_ Clone, and reaction
_ Invite a new user (via the Accounts admin) (make sure email is enabled)
_ Go to the email of the new user and follow the link
_ Confirm that on the link opening, a password reset modal opens
_ Enter password and save, and confirm that there are no errors.

@impactmass impactmass changed the title [WIP] Fix Reset password link and overlays broken Fix Reset password link and overlays broken Aug 1, 2017
@impactmass impactmass requested a review from spencern August 1, 2017 15:43
@spencern
Copy link
Contributor

spencern commented Aug 1, 2017

Haven't checked the invite link yet, but the reset password link still doesn't work for me.

image

Warning: React.createElement: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: undefined. You likely forgot to export your component from the file it's defined in. Check the render method of `Forgot`.
    in Forgot (created by Reaction(ForgotPassword))
    in Reaction(ForgotPassword) (created by Reaction(Login))
    in Reaction(Login) (created by Reaction(MainDropdown))
    in div (created by Reaction(MainDropdown))
    in div (created by Reaction(MainDropdown))
    in div (created by Reaction(MainDropdown))
    in div (created by Reaction(MainDropdown))
    in Reaction(MainDropdown) (created by Tracker(Reaction(MainDropdown)))
    in Tracker(Reaction(MainDropdown)) (created by withProps(Tracker(Reaction(MainDropdown))))
    in withProps(Tracker(Reaction(MainDropdown))) (created by Tracker(withProps(Tracker(Reaction(MainDropdown)))))
    in Tracker(withProps(Tracker(Reaction(MainDropdown)))) (created by Reaction(NavBar))
    in div (created by Reaction(NavBar))
    in Reaction(NavBar) (created by Tracker(Reaction(NavBar)))
    in Tracker(Reaction(NavBar)) (created by Reaction(CoreLayout))
    in div (created by Reaction(CoreLayout))
    in Reaction(CoreLayout) (created by Route)
    in Route
    in div (created by App)
    in App (created by Tracker(App))
    in Tracker(App)
    in TranslationProvider (created by Tracker(TranslationProvider))
    in Tracker(TranslationProvider)
    in Router (created by BrowserRouter)
    in BrowserRouter
printWarning @ modules.js:84626
modules.js:84794 

@spencern
Copy link
Contributor

spencern commented Aug 1, 2017

On the development specific fix, when I click through from an invite the overlay appears (Yay!) but then I'm not logged in and a weird blank new user is created.

Video of the issue: http://recordit.co/U3xxi6rRoo

Weird users:
image

no client or server errors or warnings.

@impactmass
Copy link
Contributor Author

impactmass commented Aug 1, 2017

I'll check on this asap. I fixed the overlay first..(as it relates most to the other ticket I was working on).

I'll try and re-create the weird user accounts and log in issue. I (and also @awadesmoline ) and didn't get that when I tested.

@impactmass
Copy link
Contributor Author

Recorded this just now https://www.dropbox.com/s/ur1et424g4zvx3q/rec.mov?dl=0 (I haven't edited anything yet)... no weird users and login fine. (I'll still see if I can repro it)
For now: I'm working on Reset link now.

@spencern
Copy link
Contributor

spencern commented Aug 1, 2017

@impactmass interesting. I'll reset and try again.

@spencern
Copy link
Contributor

spencern commented Aug 1, 2017

@impactmass - I just did a full reset and am not able to reproduce the login issue anymore. 👍

Copy link
Contributor

@spencern spencern left a comment

Choose a reason for hiding this comment

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

Checked reset password link, overlays, and inviting new users. All work 👍

@impactmass
Copy link
Contributor Author

The core fix for reset password link, overlays, and inviting new users looks good to go.
I added a TODO comment on "cart/merge" as it throws a validation error when a password reset it done (because currentSessionId shows up as false). Added the comment since fixing that will go out of the scope of this PR

@spencern spencern merged commit b41a0ff into development Aug 1, 2017
impactmass added a commit that referenced this pull request Aug 2, 2017
* Fix missing component errors and component name reference

* Fix missing component imports and references

* Return use Component. for core comp

* Change componenent ref in resetPassword

* Update Match check to prevent error in cart after password reset

* Add todo comment on the check on cart/merge

* Update to only comment and fix test
spencern pushed a commit that referenced this pull request Aug 4, 2017
… should automatically grant that user appropriate permissions when registered (#2538)

* Add back initial setup from previous commits - inviteOwner method, mail template

* fix failing test

* Add form to call invite user form marketplace settings dashgs

* Set invited user as owner of new shop and set preferences

* Fix typo, and set default option

* Resolve lint import error

* Fix error in createShop; and update publication to limit to shop

* Merge seun-fix-passwordoverlay-comp-2605 into seun-invite-owner-2186

* Updating sortable for pre-passed data

* wip

* Convert comp to react; and use registerComponent

* Use correct Id on shopcreate

* Fix Reset password link and overlays broken (#2612)

* Fix missing component errors and component name reference

* Fix missing component imports and references

* Return use Component. for core comp

* Change componenent ref in resetPassword

* Update Match check to prevent error in cart after password reset

* Add todo comment on the check on cart/merge

* Update to only comment and fix test

* Set correct shopId when user updates password for the first time

* Switch getShopId to getPrimaryShopId in shopAutoValue

* AddressBook should be an array

* Update shopIdAutoValue to switch based on if merchantCart enabled

* should be merchantCart not merchantCarts
spencern pushed a commit that referenced this pull request Aug 4, 2017
* Setup up version for migrating from old permissions style to groups

* Update accounts that match on migrate and add down method

* Add shop manager as part of default groups on start and add to migration file

* Show no dropdown if shop has only one group

* If account with no name, use first part of email as name

* Switch logger to debug

* add sort to display higher permission groups at the top

* Setup searching for and creating custom group and setting users to custom

* Add back initial setup from previous commits - inviteOwner method, mail template

* fix failing test

* Add form to call invite user form marketplace settings dashgs

* Set invited user as owner of new shop and set preferences

* Fix typo, and set default option

* Add comments to document flow of migration

* Prevent error on user without roles field in tests

* Change info logs to debug

* Add comment

* make dropdown more groups aware; and init owner swap

* wip

* Resolve lint import error

* Fix error in createShop; and update publication to limit to shop

* Merge seun-fix-passwordoverlay-comp-2605 into seun-invite-owner-2186

* Updating sortable for pre-passed data

* wip

* Convert comp to react; and use registerComponent

* Use correct Id on shopcreate

* Fix Reset password link and overlays broken (#2612)

* Fix missing component errors and component name reference

* Fix missing component imports and references

* Return use Component. for core comp

* Change componenent ref in resetPassword

* Update Match check to prevent error in cart after password reset

* Add todo comment on the check on cart/merge

* Update to only comment and fix test

* Alert before swap owner; Add i18n and event update

* Add load on long method calls

* Move loader to HOC

* Update to loader

* Separating marketplace owner change from shop owner change

* Remove log error

* Separate warning for Marketplace change

* Show dropdown options based on owner perm

* Update comment

* Set correct shopId when user updates password for the first time

* Check if addressBook exist before using

* Make shopIdAutoValueForCart separate from shopIdAutoValue
@impactmass impactmass deleted the seun-fix-passwordoverlay-comp-2605 branch August 7, 2017 09:58
spencern pushed a commit that referenced this pull request Aug 16, 2017
…I change (#2662)

* Setup up version for migrating from old permissions style to groups

* Update accounts that match on migrate and add down method

* Add shop manager as part of default groups on start and add to migration file

* Show no dropdown if shop has only one group

* If account with no name, use first part of email as name

* Switch logger to debug

* add sort to display higher permission groups at the top

* Setup searching for and creating custom group and setting users to custom

* Add back initial setup from previous commits - inviteOwner method, mail template

* fix failing test

* Add form to call invite user form marketplace settings dashgs

* Set invited user as owner of new shop and set preferences

* Fix typo, and set default option

* Add comments to document flow of migration

* Prevent error on user without roles field in tests

* Change info logs to debug

* Add comment

* make dropdown more groups aware; and init owner swap

* wip

* Resolve lint import error

* Fix error in createShop; and update publication to limit to shop

* Merge seun-fix-passwordoverlay-comp-2605 into seun-invite-owner-2186

* Updating sortable for pre-passed data

* wip

* Convert comp to react; and use registerComponent

* Use correct Id on shopcreate

* Fix Reset password link and overlays broken (#2612)

* Fix missing component errors and component name reference

* Fix missing component imports and references

* Return use Component. for core comp

* Change componenent ref in resetPassword

* Update Match check to prevent error in cart after password reset

* Add todo comment on the check on cart/merge

* Update to only comment and fix test

* Alert before swap owner; Add i18n and event update

* Add load on long method calls

* Move loader to HOC

* Update to loader

* Separating marketplace owner change from shop owner change

* Remove log error

* Separate warning for Marketplace change

* Show dropdown options based on owner perm

* Update comment

* Set correct shopId when user updates password for the first time

* Set method to check that invite can only be done to requester group

* Show sorting icons only if data is sortable

* Update group table content styles

* More table style changes

* Enable editing default groups

* Use shop owner email for new shop; not marktepl owner email

* If invited email already exists, promote them

* Update email template to reflect

* Update getCurrentUserName to better preference for selecting admin name

* Remove console logs

* Remove addGroupMember component and it's references. Now handled by adminInvite flow

* Fix typo

* Add owner check and error message for groupId param

* Update sample text email to localhost

* Setup canInviteToGroup on method and client comp

* Indent nested items

* Freeze edits on owner group

* Alert before remove method call

* Limit invite to access

* Remove logs

* Fix typo

* Add reaction-accounts to role list for admin accounts pub

* Update to migration file to prevent non-exist group

* Roles list rearrangement

* Remove .only that was restricting tests

* Updates to resolve PR review comments

* Fix group tests, add helper for default group

* Flag shop as primary shop so tests requiring primary shop don not fail

* Add more code comments

* More description to code comments

* Dropdown adjustment

* i18n and alerts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants