feat: log terms of service acceptance #2028

e-schneid · 2022-10-12T22:27:17Z

This adds terms of service acceptance logging. When a customer accepts the terms of service, we then send web3.storage-tos-v1 as the agreement value to the API. This then gets stored in a table with a foreign key of the userId.

github-actions · 2022-10-12T22:31:14Z

Website preview 🔗✨

build log

packages/api/src/utils/billing.js

packages/api/src/errors.js

packages/api/src/utils/billing-types.ts

packages/api/src/utils/billing.js

…erface

…agreement

… payment method' for backend and make website payment page make use of the two different use-cases for calling PUT /user/payment

… kind

gobengo · 2022-10-21T16:10:00Z

As I added tests for the different ways of invoking the http api and what should require agreements (vs not), I had to change even more than I realized in backend code (not your stuff, more like my old stuff). Basically because before the two places the frontend did PUT /user/payment were kinda the same. But now they're kinda different because when the AddPaymentForm just wants to update your payment method, that should require an agreement (ie because we don't even show that agreement to the end user in that part of the UI).

The other thing that's major is I got rid of the uniquness requirement on the agreement table. Now we'll record the timestamp of each time the user agrees to the thing. It might be more than we need, but it won't be a ton of data that I think should be problematic. The main reason I did this is I think the code that was there before would have had an uncaught error the second time savePaymentSettings was called with same agreement due to the uniqueness constraint in the db, and this was a quick way of avoiding that without having to do more clever queries.

gobengo · 2022-10-21T16:13:07Z

@e-schneid any concerns about the updates I made?

e-schneid · 2022-10-21T17:36:45Z

packages/db/index.js

+  async createUserAgreement (userId, agreement) {
+    const { error } = await this._client
+      .from('agreement')
+      .insert({


@gobengo As an insert, won't error be populated if the same user adds the same agreement? Then this will throw and it doesn't seem like it's being caught. It's possible this intended (also possible I'm misreading), but just wanted to call it out just in case.

Everything else looks great! I love the solution.

I got rid of the uniqueness constraint in tables and in the migration. So... I think it won't error in that case eh?
here is the relevant test: 5c84b5b

Or am I misunderstanding?

e-schneid · 2022-10-21T17:40:57Z

@e-schneid any concerns about the updates I made?

@gobengo All looks great to me. You considered a lot of things I hadn't. 👍 Just left the one question above regarding insert.

gobengo

go team 🎉

🤖 I have created a release *beep* *boop* --- ## [7.10.0](api-v7.9.1...api-v7.10.0) (2022-10-23) ### Features * log terms of service acceptance ([#2028](#2028)) ([47c3540](47c3540)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ## [2.31.0](website-v2.30.0...website-v2.31.0) (2022-10-23) ### Features * AddPaymentMethodForm shows a more end-user-friendly error message when it encounters an error ([#2058](#2058)) ([376e05b](376e05b)) * log terms of service acceptance ([#2028](#2028)) ([47c3540](47c3540)) ### Bug Fixes * clarity on web3.storage PSA ([#2062](#2062)) ([62dadb1](62dadb1)) * properly center align the loading icon within login/logout button ([#2043](#2043)) ([4fa8ec3](4fa8ec3)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

e-schneid requested a review from jsdevel October 12, 2022 22:27

jsdevel reviewed Oct 13, 2022

View reviewed changes

packages/api/src/utils/billing.js Outdated Show resolved Hide resolved

jsdevel reviewed Oct 13, 2022

View reviewed changes

packages/api/src/utils/billing.js Outdated Show resolved Hide resolved

e-schneid force-pushed the feat/e-schneid/terms-of-service branch 6 times, most recently from a9fd64f to 2cd3a86 Compare October 17, 2022 15:58

e-schneid had a problem deploying to production October 17, 2022 16:04 Failure

e-schneid force-pushed the feat/e-schneid/terms-of-service branch 2 times, most recently from db97836 to 7d4e041 Compare October 17, 2022 18:19

e-schneid temporarily deployed to production October 17, 2022 18:27 Inactive

e-schneid force-pushed the feat/e-schneid/terms-of-service branch 3 times, most recently from 6c449f9 to 60e2e75 Compare October 17, 2022 18:34

e-schneid requested review from jsdevel and gobengo October 17, 2022 18:35

e-schneid force-pushed the feat/e-schneid/terms-of-service branch 5 times, most recently from 7300c9d to 2e6bc7f Compare October 17, 2022 20:15

feat: log terms of service acceptance

d5f42c8

e-schneid force-pushed the feat/e-schneid/terms-of-service branch from 2e6bc7f to d5f42c8 Compare October 17, 2022 21:50

e-schneid temporarily deployed to production October 17, 2022 21:57 Inactive

gobengo reviewed Oct 18, 2022

View reviewed changes

packages/api/src/errors.js Outdated Show resolved Hide resolved

gobengo reviewed Oct 18, 2022

View reviewed changes

packages/api/src/utils/billing-types.ts Outdated Show resolved Hide resolved

gobengo reviewed Oct 18, 2022

View reviewed changes

packages/api/src/utils/billing.js Outdated Show resolved Hide resolved

gobengo added 2 commits October 20, 2022 17:06

adjust migration 29 to use RENAME instead of drop/create

51dd747

lint

3c90b01

gobengo temporarily deployed to production October 20, 2022 16:20 Inactive

createMockUserCustomerService no longer also has AgreementService int…

f7b8f71

…erface

gobengo temporarily deployed to production October 20, 2022 16:47 Inactive

gobengo temporarily deployed to production October 20, 2022 19:08 Inactive

test that savePaymentSettings wont save a subscription without a tos …

0356086

…agreement

gobengo force-pushed the feat/e-schneid/terms-of-service branch from 28634e9 to 0356086 Compare October 20, 2022 19:16

gobengo temporarily deployed to production October 20, 2022 19:22 Inactive

test savePaymentSettings cases involving tos agreement

1c1dbaf

gobengo temporarily deployed to production October 20, 2022 20:04 Inactive

gobengo added 5 commits October 21, 2022 16:36

add test 'can save storage subscription, then update only the default…

eb506e3

… payment method' for backend and make website payment page make use of the two different use-cases for calling PUT /user/payment

get rid of type assertion override in user-payment.spec.js

122cc70

db createUserAgreement impl has a @returns

7631d7a

Merge branch 'main' into feat/e-schneid/terms-of-service

b98c7dd

db createUserAgreement now doesnt error upon second agreement of same…

5c84b5b

… kind

gobengo temporarily deployed to production October 21, 2022 16:04 Inactive

gobengo requested a review from yusefnapora October 21, 2022 16:05

e-schneid commented Oct 21, 2022

View reviewed changes

gobengo self-requested a review October 23, 2022 14:52

gobengo approved these changes Oct 23, 2022

View reviewed changes

gobengo merged commit 47c3540 into main Oct 23, 2022

gobengo deleted the feat/e-schneid/terms-of-service branch October 23, 2022 14:52

This was referenced Oct 23, 2022

chore(main): release website 2.31.0 #2059

Merged

chore(main): release api 7.10.0 #2063

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: log terms of service acceptance #2028

feat: log terms of service acceptance #2028

e-schneid commented Oct 12, 2022 •

edited

github-actions bot commented Oct 12, 2022 •

edited

gobengo commented Oct 21, 2022 •

edited

gobengo commented Oct 21, 2022

e-schneid Oct 21, 2022 •

edited

gobengo Oct 22, 2022

e-schneid commented Oct 21, 2022 •

edited

gobengo left a comment

feat: log terms of service acceptance #2028

feat: log terms of service acceptance #2028

Conversation

e-schneid commented Oct 12, 2022 • edited

github-actions bot commented Oct 12, 2022 • edited

Website preview 🔗✨

gobengo commented Oct 21, 2022 • edited

gobengo commented Oct 21, 2022

e-schneid Oct 21, 2022 • edited

Choose a reason for hiding this comment

gobengo Oct 22, 2022

Choose a reason for hiding this comment

e-schneid commented Oct 21, 2022 • edited

gobengo left a comment

Choose a reason for hiding this comment

e-schneid commented Oct 12, 2022 •

edited

github-actions bot commented Oct 12, 2022 •

edited

gobengo commented Oct 21, 2022 •

edited

e-schneid Oct 21, 2022 •

edited

e-schneid commented Oct 21, 2022 •

edited