b472af532c
Merge branch 'apple_sub_fix' into release
2023-03-21 13:54:16 -05:00
bbea789700
fix(test): don't cross two month boundaries when anticipating +1 perk
2023-03-14 16:27:09 -05:00
8dcacdc92e
Only update user objects that don’t have notification yet ( #14514 )
...
* build(deps): bump stopword from 2.0.5 to 2.0.7 in /website/client (#14504 )
Bumps [stopword](https://github.com/fergiemcdowall/stopword ) from 2.0.5 to 2.0.7.
- [Release notes](https://github.com/fergiemcdowall/stopword/releases )
- [Commits](https://github.com/fergiemcdowall/stopword/commits/v.2.0.7 )
---
updated-dependencies:
- dependency-name: stopword
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump stripe from 11.6.0 to 11.10.0 (#14503 )
Bumps [stripe](https://github.com/stripe/stripe-node ) from 11.6.0 to 11.10.0.
- [Release notes](https://github.com/stripe/stripe-node/releases )
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-node/compare/v11.6.0...v11.10.0 )
---
updated-dependencies:
- dependency-name: stripe
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump apidoc from 0.53.1 to 0.54.0 (#14501 )
Bumps [apidoc](https://github.com/apidoc/apidoc ) from 0.53.1 to 0.54.0.
- [Release notes](https://github.com/apidoc/apidoc/releases )
- [Changelog](https://github.com/apidoc/apidoc/blob/master/CHANGELOG.md )
- [Commits](https://github.com/apidoc/apidoc/compare/0.53.1...0.54.0 )
---
updated-dependencies:
- dependency-name: apidoc
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump @sideway/formula in /website/client (#14495 )
Bumps [@sideway/formula](https://github.com/sideway/formula ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sideway/formula/releases )
- [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: "@sideway/formula"
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump validator from 13.7.0 to 13.9.0 in /website/client (#14492 )
Bumps [validator](https://github.com/validatorjs/validator.js ) from 13.7.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/validatorjs/validator.js/compare/13.7.0...13.9.0 )
---
updated-dependencies:
- dependency-name: validator
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump validator from 13.7.0 to 13.9.0 (#14488 )
Bumps [validator](https://github.com/validatorjs/validator.js ) from 13.7.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/validatorjs/validator.js/compare/13.7.0...13.9.0 )
---
updated-dependencies:
- dependency-name: validator
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump hellojs from 1.19.5 to 1.20.0 in /website/client (#14479 )
Bumps [hellojs](https://github.com/MrSwitch/hello.js ) from 1.19.5 to 1.20.0.
- [Release notes](https://github.com/MrSwitch/hello.js/releases )
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.19.5...v1.20.0 )
---
updated-dependencies:
- dependency-name: hellojs
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump ua-parser-js from 0.7.31 to 0.7.33 in /website/client (#14463 )
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js ) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases )
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md )
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33 )
---
updated-dependencies:
- dependency-name: ua-parser-js
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump cookiejar from 2.1.3 to 2.1.4 (#14462 )
Bumps [cookiejar](https://github.com/bmeck/node-cookiejar ) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases )
- [Commits](https://github.com/bmeck/node-cookiejar/commits )
---
updated-dependencies:
- dependency-name: cookiejar
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump glob from 8.0.3 to 8.1.0 (#14448 )
Bumps [glob](https://github.com/isaacs/node-glob ) from 8.0.3 to 8.1.0.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v8.0.3...v8.1.0 )
---
updated-dependencies:
- dependency-name: glob
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump dompurify from 2.4.1 to 2.4.3 in /website/client (#14443 )
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.4.1 to 2.4.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.1...2.4.3 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fixed typo (#14417 )
In "weaponSpecialWinter2023RogueNotes", changed "Incrases" to "Increases"
* Only update user objects that don’t have notification yet
* fix test
* fix spy
---------
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: gwenexner <49045733+gwenexner@users.noreply.github.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2023-03-13 16:24:00 -05:00
def24142ca
remove wrong test
2023-02-27 13:30:44 +01:00
62b171ffa5
fix linting
2023-02-24 10:47:50 +01:00
3f56b7fa3f
fix offset calculation
2023-02-17 15:42:31 +01:00
6ee2e3a379
Merge remote-tracking branch 'origin/develop' into apple_sub_fix
2023-02-13 17:38:14 +01:00
0335eb1f7e
chore(content): add February backgrounds and Enchanted Armoire Items ( #14482 )
...
* chore(content): add February backgrounds and Enchanted Armoire Items
* fix(test): birthday week adjustment
* fix(strings): .
* fix(strings): correct background tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2023-02-07 09:12:19 -06:00
aec2409227
lint fixes
2023-02-06 12:59:54 +01:00
a3bc20f855
Fix case where a number was sometimes a string
2023-02-06 11:17:35 +01:00
12479edb77
fix tests and some cases
2023-02-06 11:17:35 +01:00
c0c6657536
handle upgrades and creations better
2023-02-06 11:17:35 +01:00
0f7001b609
fix lint
2023-02-06 11:17:35 +01:00
87558a325e
Handle subscription cancelation better
2023-02-06 11:17:35 +01:00
614850e56c
fix tests
2023-02-06 11:17:35 +01:00
64a3515c10
Add logic for different types of sub upgrades
2023-02-06 11:17:35 +01:00
8dfa21a4b8
Add field to track when current subscription type started
2023-02-06 11:17:35 +01:00
ddf1b4060d
Better handling for cancellation when user had multiple subs
2023-02-06 11:17:35 +01:00
967717a010
Fix logic for apple subscriptions
2023-02-06 11:17:35 +01:00
9b791b4ba0
fix(test): save user to avoid lock errors
2023-02-06 11:17:35 +01:00
5aca5b4be7
fix(test): linting
2023-02-06 11:17:35 +01:00
0dd25b6431
fix issue where subs would be applied multiple times
2023-02-06 11:17:35 +01:00
cf75d941fa
fix test
2023-02-06 11:17:35 +01:00
f07d0f6441
Implement correct handling for when subs are up/downgraded
2023-02-06 11:17:24 +01:00
98ec1757f9
fix tests
2023-02-06 11:16:24 +01:00
ac239e32ce
fix(payments): wrap up adjusted test expectations
2023-01-23 00:45:31 -06:00
3474cbf138
fix(payments): correct more tests
2023-01-22 23:02:18 -06:00
f845bbd7a0
fix(payments): address some test failures
2023-01-22 22:30:48 -06:00
e5bbde7e97
feat(event): 10th Birthday Bash
...
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
f1fa6a8456
Revert "Allow sub upgrades/downgrades on iOS ( #14303 )"
...
This reverts commit 9e98e56e9b
2022-11-21 16:40:56 -06:00
f2aaee15f3
Merge branch 'release' into develop
2022-11-18 15:29:06 -06:00
febffb3f07
Revert "Fix double subscriptions, second attempt ( #14345 )"
...
This reverts commit 1a5cba57b7
2022-11-18 14:26:49 -06:00
fdfa2d6df4
Merge branch 'release' into develop
2022-11-15 19:29:37 -06:00
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
9b1a726875
Revert "feat(subs): allow upgrade/downgrade on iOS"
...
This reverts commit 27440772f0
2022-11-02 09:00:29 -05:00
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
27440772f0
feat(subs): allow upgrade/downgrade on iOS
...
by @phillipthelen
2022-11-01 20:53:04 -05:00
aea0be3245
fix(subs): establish lock to prevent race condition
2022-11-01 20:47:21 -05:00
f7a03d2eb5
improve transactions logs + split createSubscription ( #14289 )
...
* improve transactions logs + split createSubscription
2022-10-27 08:39:06 +02:00
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
40997854dd
fix(test): restore event list function
2022-09-30 14:32:21 -05:00
e0eed8238e
fix(test): stub full event list
2022-09-23 16:42:15 -05:00
eea79ce1b6
Merge branch 'develop' into sabrecat/gems-multi-event
2022-09-21 16:03:57 -05:00
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 c244b1651c7e0069a80fsabe@habitica.com >
2022-09-15 18:22:52 -05:00
4c34c68d78
fix(test): stub newly relevant function
2022-09-15 12:20:11 -05:00
149da578fd
fix(teams): fix fix fix
...
Removed testing banner
Fixed a JS console error when assigning a user to a previously open task
Fixed a potential abuse where user might be able to score someone else's
task via API call
Fixed an issue where finding tasks by alias could return tasks belonging
to other users
Fixed an issue that was appending the user's party ID to their list of
Guilds
Fixed an issue where group tasks were not receiving the default tag
needed for filtering them on user's personal list
2022-08-22 16:16:23 -05:00
35d963a397
fix(teams): tweak FAQ and fix sync test
2022-08-22 14:43:21 -05:00
65d2eac4c3
Correctly handle google accounts with multiple subscriptions ( #13982 )
2022-06-10 14:07:36 -05:00
1a74d2b3b0
refactor(achievements): crush down to much fewer notification types
...
most work by @CuriousMagpie
2022-05-12 15:25:40 -05:00
d132b057eb
Fix XML Data Export Error by Modifying XML Format ( #13942 )
...
* Added XML code to parse json + convert formatting before exporting as XML + XML Marshall tests
* Add linting fixes
linting errors still present in xmlMarshaller.test.js but, certain keys starting with digits (for example '800ed0') must be enclosed in quotes , so to maintain consistency within the test file I kept all keys enclosed by single quotes.
* fix(lint): unquote, EOF
Co-authored-by: SabreCat <sabe@habitica.com >
2022-05-12 15:24:17 -05:00
SabreCat