Bexio fixes #1119

elias-summermatter · 2023-12-06T11:13:02Z

No description provided.

github-actions · 2023-12-06T11:22:37Z

PR 1119 with branch b/fix-bexio-payment-adapter has been deployed to:

Website: https://website-1119.reviews.wepublish.dev
Editor: https://editor-1119.reviews.wepublish.dev
Public API: https://api-1119.reviews.wepublish.dev/v1
Private API: https://api-1119.reviews.wepublish.dev/v1/admin
Media: https://media-1119.reviews.wepublish.dev

…stackoverflow.com/questions/48433783/referenceerror-fetch-is-not-defined

antkiewiczk · 2023-12-07T08:22:38Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

 } from './bexio-errors'
 import {addToStringReplaceMap, mapBexioStatusToPaymentStatus, searchForContact} from './bexio-utils'
+import fetch from 'node-fetch'


why is this imported here? I can't see it used in your changes

I see it on line 150.

it was added by me, but starting with node 18 there's no longer need to import fetch from node-fetch (it's included). But I think it's still ok, it can still be imported as a "fallback" if older version of node is used

WePublish is no node 16 not 18...

antkiewiczk · 2023-12-07T08:27:11Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

-      paymentData: JSON.stringify(bexioResponse.data),
-      customerID: bexioResponse.data.contact_id ? bexioResponse.data.contact_id.toString() : ''
+      paymentID: payment.id,
+      paymentData: JSON.stringify(bexioResponse),


are you sure that you don't want to dive into data, just return response?

I think it's right without data. Once you use json() you get full response and that is:

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

antkiewiczk · 2023-12-07T08:44:11Z

Also please fix tests for bexio

tomaszdurka · 2023-12-07T09:02:23Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-errors.ts

@@ -40,11 +40,18 @@ class NoSubscriptionIdInInvoice extends Error {
  }
 }

+class PaymentNotFound extends Error {
+  constructor(message = 'While checking intent, payment not found!') {


Looking at the error class name its message should not determine the reason why it's thrown.

What is your proposal here?

@tomaszdurka Can you give me more datails here?

tomaszdurka · 2023-12-07T09:04:10Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

 } from './bexio-errors'
 import {addToStringReplaceMap, mapBexioStatusToPaymentStatus, searchForContact} from './bexio-utils'
+import fetch from 'node-fetch'


I see it on line 150.

tomaszdurka · 2023-12-07T09:05:24Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

@@ -232,7 +249,7 @@ export class BexioPaymentProvider extends BasePaymentProvider {

      return {
        intentID: newInvoice.id.toString(),
-        intentSecret: '',
+        intentSecret: successURL,


Questions @elias-summermatter:

Why are we storing things like successUrl in the intentSecret?

Btw I understand this is something used by frontend website, right?

Let's have a call about that. It's faster that way, just call me when you got time.

Can we have a summary here? I guess it's for the redirect on the frontend?

Sure. Intent is where the frontend is redirected to do the payment (for payrexx and stripe checkout). In case of Bexio the invoice is already created, so we just redirect the UI to the success url because in case of Bexio there is no extra action required on a bexio page. It allows bexio integration in the fronted without any significant changes.

tomaszdurka · 2023-12-07T09:21:54Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

    const bexioInvoice: InvoicesStatic.InvoiceCreate = {
      title: isRenewal ? this.invoiceTitleRenewalMembership : this.invoiceTitleNewMembership,
      contact_id: contact.id,
      user_id: this.userId,
      mwst_type: 0,
      mwst_is_net: false,
+      // Override for wrong library implementation!
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore


We hardly want to use ts-ignore so let's change add special type like:

type InvoiceCreate = Omit<InvoicesStatic.InvoiceCreate, 'api_reference'> & { "api_reference"?: string | null };

I made a pr to the bexio library to fix that, as soon as the fix is deployed we can remove this hack but it was needed to be able to deploy and test it on hauptstadt site. Was never intended to stay in there:
mathewmeconry/bexio#61

tomaszdurka · 2023-12-07T09:23:28Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

@@ -122,7 +124,7 @@ export class BexioPaymentProvider extends BasePaymentProvider {
   * @returns {Promise<void>} Resolves when the remote invoice is successfully created.
   */
  async createRemoteInvoice(props: CreateRemoteInvoiceProps) {
-    await this.bexioCreate(props.invoice.id, true)
+    await this.bexioCreate('', props.invoice.id, true)


Let's make successUrl optional and not pass it here.

tomaszdurka · 2023-12-07T09:26:54Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

-      paymentData: JSON.stringify(bexioResponse.data),
-      customerID: bexioResponse.data.contact_id ? bexioResponse.data.contact_id.toString() : ''
+      paymentID: payment.id,
+      paymentData: JSON.stringify(bexioResponse),


I think it's right without data. Once you use json() you get full response and that is:

Itrulia · 2023-12-12T11:24:19Z

.env

@@ -61,10 +61,11 @@ ENABLE_ANONYMOUS_COMMENTS=false

 MAX_AUTO_RENEW_SUBSCRIPTION_BATCH=false

-BEXIO_API_KEY=secret
-BEXIO_USER_ID=1
+BEXIO_API_KEY=eyJraWQiOiI2ZGM2YmJlOC1iMjZjLTExZTgtOGUwZC0wMjQyYWMxMTAwMDIiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJtYXRoaWFzLnN0cmVpdEBoYXVwdHN0YWR0LmJlIiwibG9naW5faWQiOiI5ZmNlMTNkOS1hN2ZhLTRiZmItOWFhNy03ZmI0NjY1ZTMxOTMiLCJjb21wYW55X2lkIjoiam41ZXlmejF2dmV1IiwidXNlcl9pZCI6MzE0MDMzLCJhenAiOiJldmVybGFzdC10b2tlbi1vZmZpY2UtY2xpZW50Iiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBlbWFpbCBhbGwgdGVjaG5pY2FsIiwiaXNzIjoiaHR0cHM6XC9cL2lkcC5iZXhpby5jb20iLCJleHAiOjMyNzg2NjQ4NDksImlhdCI6MTcwMTg2NDg0OSwiY29tcGFueV91c2VyX2lkIjoyLCJqdGkiOiI0OGM5ODg1ZS1hOTI2LTRlZTQtOTU0Zi02YTI1NGFiMDIwMGEifQ.ByaZmYhguwjFmzvkAXABwr4sFzMEPKID4clV7ygdpRNKbQ8FkoGmk0XWkyjW6q2pWOAeOQcwmw5p3uxkUtqMN8QsycW2Q4kFSlRxAu4SH69OqqypcaSmeBCI4UmewYjZykBEBpgBy0Ex9n9hkz9ty96Me-eRr4bVDS1CApEX7PVixLOMWkbgEySAA2S_JP9ZHdhzRqBfsLoIOK_DzZd-w8tGi29wPgjl4oTDmt_iokgg1lownQ0_UqhtvRLvGp_hJHMqiEpUryDhBLnHDWIPPofJf442ZeI1eQdAcN2vzdGAUxWpkztLfe1Q1_3WOBQvOs87pLGwprbcDSjbGnl1LmnPuj8tVRnBq4LtjMk1oC7v3gXDIjtyFNyPKNOFOrPDKJ-CIg25NwoGeZukQ4m2SrsSkAuGK2avuDZoU6Z9Krv9KvAw2JKJRfdvD2ICseIyaudgC2hRDk493G_auq2tM4nsqVWi_79owd2MhljqZazLGbBZAtS42soVTy4sUyy36mLbSTy5YXFVlXZysCLZEPa7ItNv3pGd4nQtww133GkOzgzBQzodW2EoWoxUnTssBk6L9c4f4wOiAOVGVH_1rAu-XloYHkvhlp--qO1nLXqjFUuS1Zgh8Vuof2L5LI1tKPR9T8SiqbvrNTlZAjnyOizK0R0c68JuJH1KulvD_t4


Was this intended?

If you want to override specific env variables then you can create a .env.local

Ou fuck... I revoked the key.... Thanks for noticing...

apps/api-example/prisma/seed.ts

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts

…provider.ts Co-authored-by: Itrulia <[email protected]>

Itrulia

in case this was forgotten

elias-summermatter · 2024-01-15T15:27:05Z

@antkiewiczk & @tomaszdurka can you review it again that we can merge it if ok. Thanks :-)

codecov · 2024-01-15T15:39:29Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (99d94f9) 40.67% compared to head (d334c86) 41.03%.
Report is 6 commits behind head on master.

Files	Patch %	Lines
...b/payment-provider/bexio/bexio-payment-provider.ts	90.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1119      +/-   ##
==========================================
+ Coverage   40.67%   41.03%   +0.36%     
==========================================
  Files         296      296              
  Lines        7548     7554       +6     
  Branches     1561     1561              
==========================================
+ Hits         3070     3100      +30     
+ Misses       4312     4283      -29     
- Partials      166      171       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

antkiewiczk · 2024-01-16T10:17:23Z

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.spec.ts

+  }
+})
+
+jest.mock('node-fetch', () =>


elias-summermatter · 2024-01-16T14:58:52Z

@antkiewiczk improved test coverage can you also review it :-)

Isue is discuss and cleared

Mssing !

e313e1d

elias-summermatter requested review from tomaszdurka, Itrulia and antkiewiczk as code owners December 6, 2023 11:13

elias-summermatter self-assigned this Dec 6, 2023

elias-summermatter marked this pull request as draft December 6, 2023 11:13

elias-summermatter added 6 commits December 6, 2023 12:36

Added redirect url when invoice is created

90dbb6c

Reworked some code

87ea918

fetch is only from version 18 on not required to be imported https://…

1710299

…stackoverflow.com/questions/48433783/referenceerror-fetch-is-not-defined

Fixed passing of payment id

ee90de9

Imprved some of the payment handling

6450fd6

Imoved error handling

277fd49

elias-summermatter marked this pull request as ready for review December 6, 2023 16:13

antkiewiczk reviewed Dec 7, 2023

View reviewed changes

tomaszdurka previously requested changes Dec 7, 2023

View reviewed changes

elias-summermatter added 2 commits December 8, 2023 10:58

Fixed test

a6f3d41

Make success url parameter optional

39a02e7

Itrulia reviewed Dec 12, 2023

View reviewed changes

apps/api-example/prisma/seed.ts Outdated Show resolved Hide resolved

Itrulia reviewed Dec 12, 2023

View reviewed changes

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.ts Outdated Show resolved Hide resolved

elias-summermatter and others added 5 commits December 12, 2023 13:06

Update libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-…

6832a3c

…provider.ts Co-authored-by: Itrulia <[email protected]>

Fixed wrongly commited stuff

319ab71

Update bexio libary to remove ts-ignore

61adc41

Added updated package lock json

dcc034d

Merge branch 'master' into b/fix-bexio-payment-adapter

85ae60b

Itrulia reviewed Jan 15, 2024

View reviewed changes

elias-summermatter added 2 commits January 15, 2024 15:57

Fixed tests

8bd076d

Fix tests again

5eb5190

elias-summermatter requested a review from tomaszdurka January 15, 2024 15:24

elias-summermatter requested a review from antkiewiczk January 15, 2024 15:27

michael-scheurer previously approved these changes Jan 16, 2024

View reviewed changes

Merge branch 'master' into b/fix-bexio-payment-adapter

1bdc5ea

antkiewiczk previously approved these changes Jan 16, 2024

View reviewed changes

libs/payment/api/src/lib/payment-provider/bexio/bexio-payment-provider.spec.ts

}

})

jest.mock('node-fetch', () =>

Copy link

Contributor

antkiewiczk Jan 16, 2024

Choose a reason for hiding this comment

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

👍

Itrulia previously approved these changes Jan 16, 2024

View reviewed changes

Itrulia added the PR: Bug Fix 🐛 label Jan 16, 2024

Improved tests and some code

0450ff8

elias-summermatter dismissed stale reviews from Itrulia, antkiewiczk, and michael-scheurer via 0450ff8 January 16, 2024 14:43

Fix lint

d334c86

Itrulia approved these changes Jan 16, 2024

View reviewed changes

elias-summermatter requested a review from michael-scheurer January 16, 2024 15:18

antkiewiczk approved these changes Jan 16, 2024

View reviewed changes

elias-summermatter merged commit df0e4f1 into master Jan 16, 2024
11 checks passed

elias-summermatter deleted the b/fix-bexio-payment-adapter branch January 16, 2024 15:50

tomaszdurka mentioned this pull request Jan 18, 2024

Release 10.1.0 #1143

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bexio fixes #1119

Bexio fixes #1119

elias-summermatter commented Dec 6, 2023

github-actions bot commented Dec 6, 2023

antkiewiczk Dec 7, 2023

tomaszdurka Dec 7, 2023

antkiewiczk Dec 7, 2023

elias-summermatter Dec 8, 2023

antkiewiczk Dec 7, 2023

tomaszdurka Dec 7, 2023

antkiewiczk Dec 7, 2023

antkiewiczk commented Dec 7, 2023

tomaszdurka Dec 7, 2023

elias-summermatter Dec 8, 2023 •

edited

Loading

elias-summermatter Jan 3, 2024

tomaszdurka Dec 7, 2023

tomaszdurka Dec 7, 2023

elias-summermatter Dec 8, 2023

Itrulia Dec 13, 2023

elias-summermatter Dec 13, 2023 •

edited

Loading

tomaszdurka Dec 7, 2023

elias-summermatter Dec 8, 2023

tomaszdurka Dec 7, 2023

tomaszdurka Dec 7, 2023

Itrulia Dec 12, 2023 •

edited

Loading

elias-summermatter Dec 12, 2023

Itrulia left a comment

elias-summermatter commented Jan 15, 2024

codecov bot commented Jan 15, 2024 •

edited

Loading

antkiewiczk Jan 16, 2024

elias-summermatter commented Jan 16, 2024

Bexio fixes #1119

Bexio fixes #1119

Conversation

elias-summermatter commented Dec 6, 2023

github-actions bot commented Dec 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

antkiewiczk commented Dec 7, 2023

Choose a reason for hiding this comment

elias-summermatter Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elias-summermatter Dec 13, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Itrulia Dec 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Itrulia left a comment

Choose a reason for hiding this comment

elias-summermatter commented Jan 15, 2024

codecov bot commented Jan 15, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

elias-summermatter commented Jan 16, 2024

elias-summermatter Dec 8, 2023 •

edited

Loading

elias-summermatter Dec 13, 2023 •

edited

Loading

Itrulia Dec 12, 2023 •

edited

Loading

codecov bot commented Jan 15, 2024 •

edited

Loading