Commit Graph

822 Commits

Author SHA1 Message Date
SabreCat e1deb6adff fix(payments): add missing SKU variations 2023-01-22 23:21:22 -06:00
SabreCat f845bbd7a0 fix(payments): address some test failures 2023-01-22 22:30:48 -06:00
SabreCat 0dfc8de300 fix(lint): remove extraneous import 2023-01-20 16:25:24 -06:00
SabreCat e5bbde7e97 feat(event): 10th Birthday Bash
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
SabreCat 98c4910051 Merge branch 'release' into develop 2022-12-23 15:35:20 -06:00
SabreCat 079279e5c1 Revert "fix(tests): if singleton event, always provide empty string suffix"
This reverts commit 64bf4ee4b6.
2022-12-20 09:51:24 -06:00
SabreCat 6d33ec02a8 Merge branch 'release' into develop 2022-12-19 16:24:48 -06:00
SabreCat 64bf4ee4b6 fix(tests): if singleton event, always provide empty string suffix 2022-12-19 16:22:20 -06:00
Adam Fitzgibbon 42e0bad4ac added validation for blocked users when inviting to groups by username (#14316) 2022-12-15 14:47:54 -06:00
Phillip Thelen b97da5fe57 Add support for getting chat limit from database (#14392)
* Add support for getting chat limit from database

* fix lint error
2022-12-15 14:38:28 -06:00
Phillip Thelen 21652c2670 fix tests and some cases 2022-12-02 17:12:17 +01:00
Phillip Thelen d1ee679810 handle upgrades and creations better 2022-12-02 11:51:33 +01:00
SabreCat 67988da33c fix(lint): line lengths and so on 2022-11-30 15:27:53 -06:00
Phillip Thelen fae26a517d Improve handling 2022-11-30 15:06:50 +01:00
SabreCat f1fa6a8456 Revert "Allow sub upgrades/downgrades on iOS (#14303)"
This reverts commit 9e98e56e9b.
2022-11-21 16:40:56 -06:00
Sabe Jones 82c5e40b92 Enforce maximum password length (#14290)
* fix(auth): enforce maximum password length

* fix(auth): line length and better error message

* fix(auth): correctly import/export constant

Co-authored-by: SabreCat <sabe@habitica.com>
2022-11-18 16:49:10 -06:00
SabreCat f2aaee15f3 Merge branch 'release' into develop 2022-11-18 15:29:06 -06:00
SabreCat 15353eba8a fix(subs): roll all the way back, didn't work :( 2022-11-18 15:12:14 -06:00
SabreCat febffb3f07 Revert "Fix double subscriptions, second attempt (#14345)"
This reverts commit 1a5cba57b7.
2022-11-18 14:26:49 -06:00
SabreCat fdfa2d6df4 Merge branch 'release' into develop 2022-11-15 19:29:37 -06:00
Sabe Jones 1a5cba57b7 Fix double subscriptions, second attempt (#14345)
* fix(subscriptions): reject subs that come in too fast

* fix(lint): remove unused import

* fix(groups): individual subs may come rapidly

* fix(subscriptions): bad paren, handle rapid testing

* fix(test): reset dateUpdated between subs

* fix(test): one more block for dateUpdated

Co-authored-by: SabreCat <sabe@habitica.com>
2022-11-15 19:19:37 -06:00
Phillip Thelen e3c86349b4 fix lint 2022-11-11 13:58:45 +01:00
Phillip Thelen 6604f38144 Handle subscription cancelation better 2022-11-11 13:54:17 +01:00
Phillip Thelen 7d2529f5e1 Add logic for different types of sub upgrades 2022-11-09 19:49:53 +01:00
Phillip Thelen 8d732c59c4 Add field to track when current subscription type started 2022-11-08 12:38:24 +01:00
Phillip Thelen 3a34aa4cc5 Improve recheck handling for test subs 2022-11-08 12:19:17 +01:00
Phillip Thelen e7fc7feddd Better handling for cancellation when user had multiple subs 2022-11-04 13:30:50 +01:00
Phillip Thelen 7fd899b642 Fix logic for apple subscriptions 2022-11-03 17:48:36 +01:00
SabreCat 164dbdcf10 Merge branch 'develop' into apple_sub_fix 2022-11-02 15:00:24 -05:00
Phillip Thelen ab953440e3 fix issue where subs would be applied multiple times 2022-11-02 16:36:09 +01:00
SabreCat 9b1a726875 Revert "feat(subs): allow upgrade/downgrade on iOS"
This reverts commit 27440772f0.
2022-11-02 09:00:29 -05:00
Phillip Thelen 9e98e56e9b Allow sub upgrades/downgrades on iOS (#14303)
* Allow sub upgrades/downgrades on iOS

* fix check

* fix(lint): line length

* fix(typo): customER

* fix tests

* Implement correct handling for when subs are up/downgraded

* fix lint errors

* fix test

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-11-01 21:07:23 -05:00
SabreCat 27440772f0 feat(subs): allow upgrade/downgrade on iOS
by @phillipthelen
2022-11-01 20:53:04 -05:00
SabreCat aea0be3245 fix(subs): establish lock to prevent race condition 2022-11-01 20:47:21 -05:00
Phillip Thelen 08469c556b fix lint errors 2022-10-28 12:41:43 +02:00
Phillip Thelen 13a25ad89e Implement correct handling for when subs are up/downgraded 2022-10-28 11:23:48 +02:00
negue f7a03d2eb5 improve transactions logs + split createSubscription (#14289)
* improve transactions logs + split createSubscription
2022-10-27 08:39:06 +02:00
SabreCat e6a7d15644 fix(typo): customER 2022-10-25 16:59:59 -05:00
SabreCat 6a4b08203f fix(lint): line length 2022-10-25 16:52:16 -05:00
SabreCat c9016c8d42 Merge branch 'develop' into phillip/sub_change 2022-10-25 16:47:51 -05:00
Sabe Jones 90250d1a25 Establish lock to avoid race scenario in subscriptions (#14267)
* fix(subscription): establish lock to avoid race scenario

* fix(lint): import syntax

* fix(lint): whitespace, dependency cycle

* fix(subs): skip locking on gifts and groups

* fix(subs): correctly reset _subSignature

* fix(sub): use findOneAndUpdate for unlock

* fix(test): save newly created user for some reason

Co-authored-by: SabreCat <sabe@habitica.com>
2022-10-25 16:44:33 -05:00
Phillip Thelen 31685c3e94 fix check 2022-10-21 16:59:18 +02:00
Phillip Thelen c25b09c7ed Allow sub upgrades/downgrades on iOS 2022-10-21 16:57:12 +02:00
SabreCat 57d3fea523 Merge branch 'group-tracking-modal' into release 2022-09-30 14:47:08 -05:00
SabreCat eea79ce1b6 Merge branch 'develop' into sabrecat/gems-multi-event 2022-09-21 16:03:57 -05:00
CuriousMagpie 719fab8d4b chore: merge develop in 2022-09-16 16:12:34 -04:00
Phillip Thelen 24841346dc Purge Facebook (#13696)
* Don't sign in user when trying to connect a social account that was already created

* Log social users into matching local auth accounts

If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account

* If possible set local authentication email for social users

* Allow password reset emails to be sent to social login users

* lint fixes

* Fix issues and tests

* fix tests

* Fix lint error.

* purge Facebook.

Only keep it in some select places to allow for some compatablilty.

* Fix error

* fix error

* Let settings handle it when you don't have a password set but an email

* fix error

* Fix boolean logic

* fix json conversion

* .

* fix password reset for old social accounts

* Don't sign in user when trying to connect a social account that was already created

* Log social users into matching local auth accounts

If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account

* If possible set local authentication email for social users

* Allow password reset emails to be sent to social login users

* lint fixes

* Fix issues and tests

* fix tests

* Fix lint error.

* purge Facebook.

Only keep it in some select places to allow for some compatablilty.

* Fix error

* fix error

* Let settings handle it when you don't have a password set but an email

* fix error

* Fix boolean logic

* fix json conversion

* fix password reset for old social accounts

* Revert "lint fixes"

This reverts commit c244b1651c.

# Conflicts:
#	website/client/src/components/auth/registerLoginReset.vue
#	website/client/src/components/static/contact.vue

* Revert "fix password reset for old social accounts"

This reverts commit 7e0069a80f.

* fix duplicate code

* chore(misc): remove irrelevant changes

* chore(privacy): update policy page with note about FB

Co-authored-by: SabreCat <sabe@habitica.com>
2022-09-15 18:22:52 -05:00
SabreCat 9a8d1854b9 fix(promo): handle Gems sale defined outside of single top event 2022-09-15 11:40:48 -05:00
CuriousMagpie 4464464c51 Merge branch 'develop' into group-tracking-modal 2022-08-30 15:44:09 -04:00
CuriousMagpie 9a1266677a Merge remote-tracking branch 'upstream/develop' into group-tracking-modal 2022-08-25 13:20:54 -04:00