Open platform to collect and prioritize feedback
enhancement: add tests for billing
goenningf52f432a461a
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 22d97361a..ac05e0821 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -62,9 +62,11 @@ func routes(r *web.Engine) *web.Engine {r.Get("/oauth/:provider", handlers.SignInByOAuth())r.Get("/oauth/:provider/callback", handlers.OAuthCallback())- wh := r.Group()- {- wh.Post("/webhooks/paddle", webhooks.IncomingPaddleWebhook())+ if env.IsBillingEnabled() {+ wh := r.Group()+ {+ wh.Post("/webhooks/paddle", webhooks.IncomingPaddleWebhook())+ }}//Starting from this step, a Tenant is requireddiff --git a/app/handlers/billing.go b/app/handlers/billing.goindex 8b66cf226..c296e908c 100644--- a/app/handlers/billing.go+++ b/app/handlers/billing.go@@ -19,7 +19,9 @@ func ManageBilling() web.HandlerFunc {return c.Failure(err)}- billingSubscription := &query.GetBillingSubscription{}+ billingSubscription := &query.GetBillingSubscription{+ SubscriptionID: billingState.Result.SubscriptionID,+ }if billingState.Result.Status == enum.BillingActive {if err := bus.Dispatch(c, billingSubscription); err != nil {return c.Failure(err)diff --git a/app/handlers/billing_test.go b/app/handlers/billing_test.gonew file mode 100644index 000000000..f16811457--- /dev/null+++ b/app/handlers/billing_test.go@@ -0,0 +1,99 @@+package handlers_test++import (+ "context"+ "net/http"+ "testing"+ "time"++ "github.com/getfider/fider/app/models/cmd"+ "github.com/getfider/fider/app/models/dto"+ "github.com/getfider/fider/app/models/entity"+ "github.com/getfider/fider/app/models/enum"++ "github.com/getfider/fider/app/models/query"+ . "github.com/getfider/fider/app/pkg/assert"+ "github.com/getfider/fider/app/pkg/bus"+ "github.com/getfider/fider/app/pkg/mock"++ "github.com/getfider/fider/app/handlers"+)++func TestManageBillingHandler_ReturnsCorrectBillingInformation(t *testing.T) {+ RegisterT(t)++ bus.AddHandler(func(ctx context.Context, q *query.GetBillingState) error {+ trialEndsAt := time.Date(2021, time.February, 2, 4, 2, 2, 0, time.UTC)+ q.Result = &entity.BillingState{+ Status: enum.BillingActive,+ PlanID: "PLAN-123",+ SubscriptionID: "SUB-123",+ TrialEndsAt: &trialEndsAt,+ }+ return nil+ })++ bus.AddHandler(func(ctx context.Context, q *query.GetBillingSubscription) error {+ Expect(q.SubscriptionID).Equals("SUB-123")++ q.Result = &entity.BillingSubscription{+ UpdateURL: "https://sandbox-subscription-management.paddle.com/subscription/SUB-123/hash/1111/update",+ CancelURL: "https://sandbox-subscription-management.paddle.com/subscription/SUB-123/hash/1111/cancel",+ PaymentInformation: entity.BillingPaymentInformation{+ PaymentMethod: "card",+ CardType: "visa",+ LastFourDigits: "1111",+ ExpiryDate: "10/2031",+ },+ LastPayment: entity.BillingLastPayment{+ Amount: float64(30),+ Currency: "USD",+ Date: "2021-11-09",+ },+ }+ return nil+ })++ server := mock.NewServer()+ code, page := server.+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ ExecuteAsPage(handlers.ManageBilling())++ Expect(code).Equals(http.StatusOK)+ Expect(page.Data).ContainsProps(dto.Props{+ "status": float64(2),+ "trialEndsAt": "2021-02-02T04:02:02Z",+ "subscriptionEndsAt": nil,+ })++ Expect(page.Data["subscription"]).ContainsProps(dto.Props{+ "updateURL": "https://sandbox-subscription-management.paddle.com/subscription/SUB-123/hash/1111/update",+ "cancelURL": "https://sandbox-subscription-management.paddle.com/subscription/SUB-123/hash/1111/cancel",+ })++ ExpectHandler(&query.GetBillingState{}).CalledOnce()+ ExpectHandler(&query.GetBillingSubscription{}).CalledOnce()+}++func TestGenerateCheckoutLinkHandler_SendsCorrectReturnUrl(t *testing.T) {+ RegisterT(t)++ bus.AddHandler(func(ctx context.Context, c *cmd.GenerateCheckoutLink) error {+ Expect(c.ReturnURL).Equals("http://demo.test.fider.io/admin/billing")++ c.URL = "https://paddle.com/fake-checkout-url"+ return nil+ })++ server := mock.NewServer()+ code, json := server.+ WithURL("http://demo.test.fider.io/_api/billing/checkout-link").+ OnTenant(mock.DemoTenant).+ AsUser(mock.JonSnow).+ ExecuteAsJSON(handlers.GenerateCheckoutLink())++ Expect(code).Equals(http.StatusOK)+ Expect(json.String("url")).Equals("https://paddle.com/fake-checkout-url")+ ExpectHandler(&cmd.GenerateCheckoutLink{}).CalledOnce()+}diff --git a/app/handlers/webhooks/paddle.go b/app/handlers/webhooks/paddle.goindex e82eb6b16..fe085b48e 100644--- a/app/handlers/webhooks/paddle.go+++ b/app/handlers/webhooks/paddle.go@@ -76,7 +76,7 @@ func handlePaddleSubscriptionCancelled(c *web.Context, params url.Values) error}cancellationEffectiveDate := params.Get("cancellation_effective_date")- subscriptionEndsAt, err := time.Parse("2006-01-02 15:04:05", cancellationEffectiveDate)+ subscriptionEndsAt, err := time.Parse("2006-01-02", cancellationEffectiveDate)if err != nil {log.Error(c, errors.Wrap(err, "failed to parse date '%s'", cancellationEffectiveDate))subscriptionEndsAt = time.Now().AddDate(0, 0, 30)diff --git a/app/models/entity/billing.go b/app/models/entity/billing.goindex ee97072b9..678e925c4 100644--- a/app/models/entity/billing.go+++ b/app/models/entity/billing.go@@ -15,7 +15,6 @@ type BillingState struct {}type BillingSubscription struct {- SignupAt string `json:"signupAt"`UpdateURL string `json:"updateURL"`CancelURL string `json:"cancelURL"`PaymentInformation BillingPaymentInformation `json:"paymentInformation"`diff --git a/app/pkg/mock/server.go b/app/pkg/mock/server.goindex 8c24d3905..eb2cbfb45 100644--- a/app/pkg/mock/server.go+++ b/app/pkg/mock/server.go@@ -2,15 +2,18 @@ package mockimport ("context"+ "encoding/json""fmt""io/ioutil""net/http""net/http/httptest""net/url"+ "strings""github.com/getfider/fider/app/models/entity""github.com/getfider/fider/app/models/query""github.com/getfider/fider/app/pkg/bus"+ "github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/jsonq""github.com/getfider/fider/app/pkg/web""github.com/julienschmidt/httprouter"@@ -135,6 +138,38 @@ func (s *Server) ExecutePostAsJSON(handler web.HandlerFunc, body string) (int, *return code, toJSONQuery(response)}+// ExecuteAsPage given handler and return page props+func (s *Server) ExecuteAsPage(handler web.HandlerFunc) (int, *web.Props) {+ code, response := s.Execute(handler)+ bodyString := response.Body.String()++ startTag := "<script id=\"server-data\" type=\"application/json\">"+ endTag := "</script>"++ startIndex := strings.Index(bodyString, startTag) + len(startTag)+ endIndex := strings.Index(bodyString[startIndex:], endTag)++ serverData := strings.TrimSpace(bodyString[startIndex : startIndex+endIndex])+ serverDataJSON := map[string]interface{}{}++ err := json.Unmarshal([]byte(serverData), &serverDataJSON)+ if err != nil {+ panic(errors.Wrap(err, "failed to parse server data"))+ }++ title, _ := serverDataJSON["title"].(string)+ description, _ := serverDataJSON["description"].(string)+ page, _ := serverDataJSON["page"].(string)+ props, _ := serverDataJSON["props"].(map[string]interface{})++ return code, &web.Props{+ Title: title,+ Description: description,+ Page: page,+ Data: props,+ }+}+func toJSONQuery(response *httptest.ResponseRecorder) *jsonq.Query {b, err := ioutil.ReadAll(response.Body)if err != nil {diff --git a/app/services/billing/paddle/paddle.go b/app/services/billing/paddle/paddle.goindex 8e599b981..2e75a3c8a 100644--- a/app/services/billing/paddle/paddle.go+++ b/app/services/billing/paddle/paddle.go@@ -129,7 +129,6 @@ func getBillingSubscription(ctx context.Context, q *query.GetBillingSubscriptionif len(sub) > 0 {q.Result = &entity.BillingSubscription{- SignupAt: sub[0].SignupDate,CancelURL: sub[0].CancelURL,UpdateURL: sub[0].UpdateURL,PaymentInformation: entity.BillingPaymentInformation{diff --git a/package-lock.json b/package-lock.jsonindex 6640a0ca6..b56d70a0c 100644--- a/package-lock.json+++ b/package-lock.json@@ -5,6 +5,7 @@"requires": true,"packages": {"": {+ "name": "fider","version": "0.0.0","dependencies": {"@lingui/react": "3.12.1",@@ -65,7 +66,7 @@},"engines": {"node": "16.x",- "npm": "7.x"+ "npm": "8.x"}},"node_modules/@babel/code-frame": {@@ -6673,19 +6674,6 @@"esbuild-windows-arm64": "0.13.10"}},- "node_modules/esbuild-android-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.10.tgz",- "integrity": "sha512-1sCdVAq64yMp2Uhlu+97/enFxpmrj31QHtThz7K+/QGjbHa7JZdBdBsZCzWJuntKHZ+EU178tHYkvjaI9z5sGg==",- "cpu": [- "arm64"- ],- "dev": true,- "optional": true,- "os": [- "android"- ]- },"node_modules/esbuild-darwin-64": {"version": "0.13.10","resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.10.tgz",@@ -6699,149 +6687,6 @@"darwin"]},- "node_modules/esbuild-darwin-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.10.tgz",- "integrity": "sha512-RZMMqMTyActMrXKkW71IQO8B0tyQm0Bm+ZJQWNaHJchL5LlqazJi7rriwSocP+sKLszHhsyTEBBh6qPdw5g5yQ==",- "cpu": [- "arm64"- ],- "dev": true,- "optional": true,- "os": [- "darwin"- ]- },- "node_modules/esbuild-freebsd-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.10.tgz",- "integrity": "sha512-pf4BEN9reF3jvZEZdxljVgOv5JS4kuYFCI78xk+2HWustbLvTP0b9XXfWI/OD0ZLWbyLYZYIA+VbVe4tdAklig==",- "cpu": [- "x64"- ],- "dev": true,- "optional": true,- "os": [- "freebsd"- ]- },- "node_modules/esbuild-freebsd-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.10.tgz",- "integrity": "sha512-j9PUcuNWmlxr4/ry4dK/s6zKh42Jhh/N5qnAAj7tx3gMbkIHW0JBoVSbbgp97p88X9xgKbXx4lG2sJDhDWmsYQ==",- "cpu": [- "arm64"- ],- "dev": true,- "optional": true,- "os": [- "freebsd"- ]- },- "node_modules/esbuild-linux-32": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.10.tgz",- "integrity": "sha512-imtdHG5ru0xUUXuc2ofdtyw0fWlHYXV7JjF7oZHgmn0b+B4o4Nr6ZON3xxoo1IP8wIekW+7b9exIf/MYq0QV7w==",- "cpu": [- "ia32"- ],- "dev": true,- "optional": true,- "os": [- "linux"- ]- },- "node_modules/esbuild-linux-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.10.tgz",- "integrity": "sha512-O7fzQIH2e7GC98dvoTH0rad5BVLm9yU3cRWfEmryCEIFTwbNEWCEWOfsePuoGOHRtSwoVY1hPc21CJE4/9rWxQ==",- "cpu": [- "x64"- ],- "dev": true,- "optional": true,- "os": [- "linux"- ]- },- "node_modules/esbuild-linux-arm": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.10.tgz",- "integrity": "sha512-R2Jij4A0K8BcmBehvQeUteQEcf24Y2YZ6mizlNFuJOBPxe3vZNmkZ4mCE7Pf1tbcqA65qZx8J3WSHeGJl9EsJA==",- "cpu": [- "arm"- ],- "dev": true,- "optional": true,- "os": [- "linux"- ]- },- "node_modules/esbuild-linux-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.10.tgz",- "integrity": "sha512-bkGxN67S2n0PF4zhh87/92kBTsH2xXLuH6T5omReKhpXdJZF5SVDSk5XU/nngARzE+e6QK6isK060Dr5uobzNw==",- "cpu": [- "arm64"- ],- "dev": true,- "optional": true,- "os": [- "linux"- ]- },- "node_modules/esbuild-linux-mips64le": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.10.tgz",- "integrity": "sha512-UDNO5snJYOLWrA2uOUxM/PVbzzh2TR7Zf2i8zCCuFlYgvAb/81XO+Tasp3YAElDpp4VGqqcpBXLtofa9nrnJGA==",- "cpu": [- "mips64el"- ],- "dev": true,- "optional": true,- "os": [- "linux"- ]- },- "node_modules/esbuild-linux-ppc64le": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.10.tgz",- "integrity": "sha512-xu6J9rMWu1TcEGuEmoc8gsTrJCEPsf+QtxK4IiUZNde9r4Q4nlRVah4JVZP3hJapZgZJcxsse0XiKXh1UFdOeA==",- "cpu": [- "ppc64"- ],- "dev": true,- "optional": true,- "os": [- "linux"- ]- },- "node_modules/esbuild-netbsd-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.10.tgz",- "integrity": "sha512-d+Gr0ScMC2J83Bfx/ZvJHK0UAEMncctwgjRth9d4zppYGLk/xMfFKxv5z1ib8yZpQThafq8aPm8AqmFIJrEesw==",- "cpu": [- "x64"- ],- "dev": true,- "optional": true,- "os": [- "netbsd"- ]- },- "node_modules/esbuild-openbsd-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.10.tgz",- "integrity": "sha512-OuCYc+bNKumBvxflga+nFzZvxsgmWQW+z4rMGIjM5XIW0nNbGgRc5p/0PSDv0rTdxAmwCpV69fezal0xjrDaaA==",- "cpu": [- "x64"- ],- "dev": true,- "optional": true,- "os": [- "openbsd"- ]- },"node_modules/esbuild-plugin-babel": {"version": "0.2.3","resolved": "https://registry.npmjs.org/esbuild-plugin-babel/-/esbuild-plugin-babel-0.2.3.tgz",@@ -6851,58 +6696,6 @@"@babel/core": "^7.0.0"}},- "node_modules/esbuild-sunos-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.10.tgz",- "integrity": "sha512-gUkgivZK11bD56wDoLsnYrsOHD/zHzzLSdqKcIl3wRMulfHpRBpoX8gL0dbWr+8N9c+1HDdbNdvxSRmZ4RCVwg==",- "cpu": [- "x64"- ],- "dev": true,- "optional": true,- "os": [- "sunos"- ]- },- "node_modules/esbuild-windows-32": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.10.tgz",- "integrity": "sha512-C1xJ54E56dGWRaYcTnRy7amVZ9n1/D/D2/qVw7e5EtS7p+Fv/yZxxgqyb1hMGKXgtFYX4jMpU5eWBF/AsYrn+A==",- "cpu": [- "ia32"- ],- "dev": true,- "optional": true,- "os": [- "win32"- ]- },- "node_modules/esbuild-windows-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.10.tgz",- "integrity": "sha512-6+EXEXopEs3SvPFAHcps2Krp/FvqXXsOQV33cInmyilb0ZBEQew4MIoZtMIyB3YXoV6//dl3i6YbPrFZaWEinQ==",- "cpu": [- "x64"- ],- "dev": true,- "optional": true,- "os": [- "win32"- ]- },- "node_modules/esbuild-windows-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.10.tgz",- "integrity": "sha512-xTqM/XKhORo6u9S5I0dNJWEdWoemFjogLUTVLkQMVyUV3ZuMChahVA+bCqKHdyX55pCFxD/8v2fm3/sfFMWN+g==",- "cpu": [- "arm64"- ],- "dev": true,- "optional": true,- "os": [- "win32"- ]- },"node_modules/escalade": {"version": "3.1.1","resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",@@ -20359,6 +20152,7 @@"@babel/types": "^7.11.5","@lingui/babel-plugin-extract-messages": "^3.12.1","@lingui/conf": "^3.12.1",+ "babel-plugin-macros": "^3.0.1","bcp-47": "^1.0.7","chalk": "^4.1.0","chokidar": "3.5.1",@@ -22994,13 +22788,6 @@"esbuild-windows-arm64": "0.13.10"}},- "esbuild-android-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.10.tgz",- "integrity": "sha512-1sCdVAq64yMp2Uhlu+97/enFxpmrj31QHtThz7K+/QGjbHa7JZdBdBsZCzWJuntKHZ+EU178tHYkvjaI9z5sGg==",- "dev": true,- "optional": true- },"esbuild-darwin-64": {"version": "0.13.10","resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.10.tgz",@@ -23008,83 +22795,6 @@"dev": true,"optional": true},- "esbuild-darwin-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.10.tgz",- "integrity": "sha512-RZMMqMTyActMrXKkW71IQO8B0tyQm0Bm+ZJQWNaHJchL5LlqazJi7rriwSocP+sKLszHhsyTEBBh6qPdw5g5yQ==",- "dev": true,- "optional": true- },- "esbuild-freebsd-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.10.tgz",- "integrity": "sha512-pf4BEN9reF3jvZEZdxljVgOv5JS4kuYFCI78xk+2HWustbLvTP0b9XXfWI/OD0ZLWbyLYZYIA+VbVe4tdAklig==",- "dev": true,- "optional": true- },- "esbuild-freebsd-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.10.tgz",- "integrity": "sha512-j9PUcuNWmlxr4/ry4dK/s6zKh42Jhh/N5qnAAj7tx3gMbkIHW0JBoVSbbgp97p88X9xgKbXx4lG2sJDhDWmsYQ==",- "dev": true,- "optional": true- },- "esbuild-linux-32": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.10.tgz",- "integrity": "sha512-imtdHG5ru0xUUXuc2ofdtyw0fWlHYXV7JjF7oZHgmn0b+B4o4Nr6ZON3xxoo1IP8wIekW+7b9exIf/MYq0QV7w==",- "dev": true,- "optional": true- },- "esbuild-linux-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.10.tgz",- "integrity": "sha512-O7fzQIH2e7GC98dvoTH0rad5BVLm9yU3cRWfEmryCEIFTwbNEWCEWOfsePuoGOHRtSwoVY1hPc21CJE4/9rWxQ==",- "dev": true,- "optional": true- },- "esbuild-linux-arm": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.10.tgz",- "integrity": "sha512-R2Jij4A0K8BcmBehvQeUteQEcf24Y2YZ6mizlNFuJOBPxe3vZNmkZ4mCE7Pf1tbcqA65qZx8J3WSHeGJl9EsJA==",- "dev": true,- "optional": true- },- "esbuild-linux-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.10.tgz",- "integrity": "sha512-bkGxN67S2n0PF4zhh87/92kBTsH2xXLuH6T5omReKhpXdJZF5SVDSk5XU/nngARzE+e6QK6isK060Dr5uobzNw==",- "dev": true,- "optional": true- },- "esbuild-linux-mips64le": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.10.tgz",- "integrity": "sha512-UDNO5snJYOLWrA2uOUxM/PVbzzh2TR7Zf2i8zCCuFlYgvAb/81XO+Tasp3YAElDpp4VGqqcpBXLtofa9nrnJGA==",- "dev": true,- "optional": true- },- "esbuild-linux-ppc64le": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.10.tgz",- "integrity": "sha512-xu6J9rMWu1TcEGuEmoc8gsTrJCEPsf+QtxK4IiUZNde9r4Q4nlRVah4JVZP3hJapZgZJcxsse0XiKXh1UFdOeA==",- "dev": true,- "optional": true- },- "esbuild-netbsd-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.10.tgz",- "integrity": "sha512-d+Gr0ScMC2J83Bfx/ZvJHK0UAEMncctwgjRth9d4zppYGLk/xMfFKxv5z1ib8yZpQThafq8aPm8AqmFIJrEesw==",- "dev": true,- "optional": true- },- "esbuild-openbsd-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.10.tgz",- "integrity": "sha512-OuCYc+bNKumBvxflga+nFzZvxsgmWQW+z4rMGIjM5XIW0nNbGgRc5p/0PSDv0rTdxAmwCpV69fezal0xjrDaaA==",- "dev": true,- "optional": true- },"esbuild-plugin-babel": {"version": "0.2.3","resolved": "https://registry.npmjs.org/esbuild-plugin-babel/-/esbuild-plugin-babel-0.2.3.tgz",@@ -23092,34 +22802,6 @@"dev": true,"requires": {}},- "esbuild-sunos-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.10.tgz",- "integrity": "sha512-gUkgivZK11bD56wDoLsnYrsOHD/zHzzLSdqKcIl3wRMulfHpRBpoX8gL0dbWr+8N9c+1HDdbNdvxSRmZ4RCVwg==",- "dev": true,- "optional": true- },- "esbuild-windows-32": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.10.tgz",- "integrity": "sha512-C1xJ54E56dGWRaYcTnRy7amVZ9n1/D/D2/qVw7e5EtS7p+Fv/yZxxgqyb1hMGKXgtFYX4jMpU5eWBF/AsYrn+A==",- "dev": true,- "optional": true- },- "esbuild-windows-64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.10.tgz",- "integrity": "sha512-6+EXEXopEs3SvPFAHcps2Krp/FvqXXsOQV33cInmyilb0ZBEQew4MIoZtMIyB3YXoV6//dl3i6YbPrFZaWEinQ==",- "dev": true,- "optional": true- },- "esbuild-windows-arm64": {- "version": "0.13.10",- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.10.tgz",- "integrity": "sha512-xTqM/XKhORo6u9S5I0dNJWEdWoemFjogLUTVLkQMVyUV3ZuMChahVA+bCqKHdyX55pCFxD/8v2fm3/sfFMWN+g==",- "dev": true,- "optional": true- },"escalade": {"version": "3.1.1","resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",@@ -29051,6 +28733,7 @@"dev": true,"requires": {"purgecss": "^4.0.3",+ "webpack": "^5.4.0","webpack-sources": "^2.0.0"}},diff --git a/package.json b/package.jsonindex f40f1349b..db7d02899 100644--- a/package.json+++ b/package.json@@ -112,7 +112,7 @@}},"engines": {- "npm": "7.x",+ "npm": "8.x","node": "16.x"},"scripts": {diff --git a/public/pages/Administration/pages/ManageBilling.page.tsx b/public/pages/Administration/pages/ManageBilling.page.tsxindex c6ac2fc3e..5e80b003c 100644--- a/public/pages/Administration/pages/ManageBilling.page.tsx+++ b/public/pages/Administration/pages/ManageBilling.page.tsx@@ -13,7 +13,6 @@ interface ManageBillingPageProps {trialEndsAt: stringsubscriptionEndsAt: stringsubscription: {- signupAt: stringupdateURL: stringcancelURL: stringpaymentInformation: {