From 1d5b64c71e1110c5b2bc1f8150dc2d723d1077cf Mon Sep 17 00:00:00 2001 From: Claus Haas Date: Thu, 24 Oct 2024 14:51:02 -0300 Subject: [PATCH 1/3] update user subscription initial creation on login --- app/services/subscription.service.server.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/services/subscription.service.server.ts b/app/services/subscription.service.server.ts index e610e0c..572e6b7 100644 --- a/app/services/subscription.service.server.ts +++ b/app/services/subscription.service.server.ts @@ -172,13 +172,20 @@ export default class SubscriptionService { try { const {data: hotmartSubscriptions} = await this._hotmartService.getUserFormationSubscriptions(user); - if (hotmartSubscriptions.length > 0) { - await Promise.all([ // eslint-disable-line unicorn/no-single-promise-in-promise-methods - hotmartSubscriptions.map(async subscription => { + if (hotmartSubscriptions.length > 0 || (hotmartSubscriptions.length === 0 && user.roles?.includes('novaFormacao'))) { + await Promise.all([ + hotmartSubscriptions.length > 0 && hotmartSubscriptions.map(async subscription => { await this.createOrUpdate(subscription); }), + (hotmartSubscriptions.length === 0 && user.roles?.includes('novaFormacao')) && this.createOrUpdate({ + userId: user.id, + courseSlug: convertSubscriptionIdentifierToCourseSlug('1392822'), + provider: 'hotmart', + providerSubscriptionId: `no-hotmart-formation-${user.id}`, + expiresAt: new Date(2_556_113_460_000), + }), ]); - } else if (hotmartSubscriptions.length === 0) { + } else if (hotmartSubscriptions.length === 0 && !user.roles?.includes('novaFormacao')) { await this.createOrUpdate({ userId: user.id, courseSlug: convertSubscriptionIdentifierToCourseSlug('1392822'), From 67a074de379e8f8d3741a2732e2706c34ab11522 Mon Sep 17 00:00:00 2001 From: Claus Haas Date: Thu, 24 Oct 2024 15:08:34 -0300 Subject: [PATCH 2/3] bump package versions --- package-lock.json | 266 +++++++++++++++++++++++----------------------- package.json | 8 +- 2 files changed, 137 insertions(+), 137 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ad87aa..2657b3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,10 +7,10 @@ "name": "yoga-em-movimento", "license": "UNLICENSED", "dependencies": { - "@aws-sdk/client-cognito-identity-provider": "^3.677.0", - "@aws-sdk/client-secrets-manager": "^3.677.0", - "@aws-sdk/client-sesv2": "^3.677.0", - "@aws-sdk/credential-providers": "^3.677.0", + "@aws-sdk/client-cognito-identity-provider": "^3.678.0", + "@aws-sdk/client-secrets-manager": "^3.678.0", + "@aws-sdk/client-sesv2": "^3.678.0", + "@aws-sdk/credential-providers": "^3.678.0", "@cloudflare/stream-react": "^1.9.1", "@epic-web/remember": "^1.1.0", "@heroicons/react": "^2.1.5", @@ -236,26 +236,26 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz", - "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.678.0.tgz", + "integrity": "sha512-cSIWC9q3GBFjTzqTZTOHILxWln9YQGce3o7Jx1m4XCN16ITRiliFgiw3rbAc1H1vtYy4LfvymhC55iU80jB+4A==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.677.0", - "@aws-sdk/client-sts": "3.677.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", + "@aws-sdk/client-sso-oidc": "3.678.0", + "@aws-sdk/client-sts": "3.678.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -288,26 +288,26 @@ } }, "node_modules/@aws-sdk/client-cognito-identity-provider": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity-provider/-/client-cognito-identity-provider-3.677.0.tgz", - "integrity": "sha512-vsuQXjsd2bpCGsYfx6K8vPfHuPBeT9s6JPnED9aLO6yx91wuFtHxlhjgoq6+kjL7AOEAHelFMaWQQzr9DXF3/Q==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity-provider/-/client-cognito-identity-provider-3.678.0.tgz", + "integrity": "sha512-dIfTuBoDvEjoPku043AdEWqcsPHkD6qLOvRUBf0I3YpAcZwdhXVJ1Z76KP16IwKHxLOszVx5U3BYOg0zuTmTag==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.677.0", - "@aws-sdk/client-sts": "3.677.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", + "@aws-sdk/client-sso-oidc": "3.678.0", + "@aws-sdk/client-sts": "3.678.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -340,26 +340,26 @@ } }, "node_modules/@aws-sdk/client-secrets-manager": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.677.0.tgz", - "integrity": "sha512-ggSAyB0juwfZyVXK8D9IZ/B8rvtgdv0kRAv/uVrry2sciwBb/w3V6dTo08s1NxJYe6Xv3tDIN/pDLoIZ9+LZag==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.678.0.tgz", + "integrity": "sha512-5C2w5bKJ2MOOtlIrsJ/lAR4PwB06LciFxLWM+whCeIiwLgYptszJ9s4fOFUhWhG23h6TshVpIql6UZi4k8cPpA==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.677.0", - "@aws-sdk/client-sts": "3.677.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", + "@aws-sdk/client-sso-oidc": "3.678.0", + "@aws-sdk/client-sts": "3.678.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -394,26 +394,26 @@ } }, "node_modules/@aws-sdk/client-sesv2": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sesv2/-/client-sesv2-3.677.0.tgz", - "integrity": "sha512-Bsva22gSdTc6W2GzuZJeBzkotkj4Vhkxib8XqkirVb2KF1kCu29wizBg4N9Am3wdfx5lkD8Mxmac8b6cGTkAYQ==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sesv2/-/client-sesv2-3.678.0.tgz", + "integrity": "sha512-QQaOEYgWJwjy7jKWi8TrTlqxTn/r2VyyVFjCCB4U7myfsg4nya/VlFRMHeI5H/bmbrdT9Yb92M72CggYVejkMg==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.677.0", - "@aws-sdk/client-sts": "3.677.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", + "@aws-sdk/client-sso-oidc": "3.678.0", + "@aws-sdk/client-sts": "3.678.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -446,23 +446,23 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz", - "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.678.0.tgz", + "integrity": "sha512-5Fg2BkR1En8iBbiZ18STvLDGPK9Re5MyCmX+hfIhQzPsEf1FRkAkOluEXX79aBva8iWn2oCD/xKBUku4x3eusw==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.677.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -495,24 +495,24 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz", - "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.678.0.tgz", + "integrity": "sha512-sgj9Y4zGiwLePLDjqhGoghoZgseh88JkKkwWH558IIte/cf/ix7ezOvptnA0WUlI5Z/329LtkN6O8TRqSJ7MWw==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -544,29 +544,29 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.677.0" + "@aws-sdk/client-sts": "^3.678.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz", - "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.678.0.tgz", + "integrity": "sha512-oRtDnbqIuTbBq0xd7XlaugDA41EqRFzWLpPNr4uwkH8L7xwtIByfJG/qXx2OtOiFFasAhMWJLu/DDqWZyp819A==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.677.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", + "@aws-sdk/client-sso-oidc": "3.678.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@aws-sdk/util-user-agent-browser": "3.675.0", - "@aws-sdk/util-user-agent-node": "3.677.0", + "@aws-sdk/util-user-agent-node": "3.678.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", "@smithy/fetch-http-handler": "^3.2.9", @@ -599,9 +599,9 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz", - "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.678.0.tgz", + "integrity": "sha512-ZTzybFZqSaPQymgRkTl08vk6xilaxr8LnJOc0h3KhcHLK4TJmdOcxqPpa6QxrBKcn2rmxzGiPRbAHLGI+BIxBw==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/types": "3.667.0", @@ -621,12 +621,12 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz", - "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.678.0.tgz", + "integrity": "sha512-t9bgu2Kc0H8FdQsSrkIJ42vis0CaVxUlA0wmmNyh268ZZyT9lKXUmf91QIhWbZ1zHx8Ek2u301xusoIaj4mLHA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.677.0", + "@aws-sdk/client-cognito-identity": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", @@ -637,12 +637,12 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz", - "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.678.0.tgz", + "integrity": "sha512-29uhXAB7uJqHtvJ2U3pi1YkMfv0WefW9EmSMoFAunjudXXBVktwTlWg0lyCM+KHrGKLkQyfs5UF/A9IelS8tdQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.677.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", @@ -653,12 +653,12 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz", - "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.678.0.tgz", + "integrity": "sha512-EvpmP0nc7ddRp0qwJOSu0uBXa+MMk4+OLlyEJcdaHnZI4/BoyVWr5fJUD5eQYZk11LZPZSvnsliYXWwLyVNXHQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.677.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/fetch-http-handler": "^3.2.9", "@smithy/node-http-handler": "^3.2.4", @@ -674,17 +674,17 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz", - "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.678.0.tgz", + "integrity": "sha512-8kHy7V5rRO73EpBCUclykP9T/QIBVi0SkQsc88ZRxpdh59/JY2N6DT5khMTzrz9+Vvlw3FDMJN4AI/qWjJHhdw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-env": "3.677.0", - "@aws-sdk/credential-provider-http": "3.677.0", - "@aws-sdk/credential-provider-process": "3.677.0", - "@aws-sdk/credential-provider-sso": "3.677.0", - "@aws-sdk/credential-provider-web-identity": "3.677.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-env": "3.678.0", + "@aws-sdk/credential-provider-http": "3.678.0", + "@aws-sdk/credential-provider-process": "3.678.0", + "@aws-sdk/credential-provider-sso": "3.678.0", + "@aws-sdk/credential-provider-web-identity": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", @@ -696,21 +696,21 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.677.0" + "@aws-sdk/client-sts": "^3.678.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz", - "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.678.0.tgz", + "integrity": "sha512-KGRBVD/oNr/aD+Wy5zc5AjfeSv5b4ahAu5eAUbOz+eGjGpGgrMtjY+R2rDY/3i3wFj9/DvOIfFGeZQMwtDzIuA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.677.0", - "@aws-sdk/credential-provider-http": "3.677.0", - "@aws-sdk/credential-provider-ini": "3.677.0", - "@aws-sdk/credential-provider-process": "3.677.0", - "@aws-sdk/credential-provider-sso": "3.677.0", - "@aws-sdk/credential-provider-web-identity": "3.677.0", + "@aws-sdk/credential-provider-env": "3.678.0", + "@aws-sdk/credential-provider-http": "3.678.0", + "@aws-sdk/credential-provider-ini": "3.678.0", + "@aws-sdk/credential-provider-process": "3.678.0", + "@aws-sdk/credential-provider-sso": "3.678.0", + "@aws-sdk/credential-provider-web-identity": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", @@ -723,12 +723,12 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz", - "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.678.0.tgz", + "integrity": "sha512-5TpzzHKwPOvUJig0bvTt+brtXfLPaSVLwea9re+XGrS5T6Hz65IaX2RL6uY1GQ0UVOqgwQ5nAti1WOfBoSJ5BA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.677.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/shared-ini-file-loader": "^3.1.8", @@ -740,13 +740,13 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz", - "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.678.0.tgz", + "integrity": "sha512-PXydLUsLYd1rkhZ7zwf0613u5sofxIEhh7C1QGP1MSY3L1jt8bu7pZIcMzubfvmaGZI5k84aHhhjQEiAJUxIMg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.677.0", - "@aws-sdk/core": "3.677.0", + "@aws-sdk/client-sso": "3.678.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/token-providers": "3.667.0", "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", @@ -759,12 +759,12 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz", - "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.678.0.tgz", + "integrity": "sha512-fcYZjTTFcef99l+BhcEAhHS4tEK1kE6Xj5Zz5lT4tFA07BkQt3d6kUKRVVfJnsbcHH4RDBUCnLhU8HPfc/kvjA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.677.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/property-provider": "^3.1.7", "@smithy/types": "^3.5.0", @@ -774,27 +774,27 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.677.0" + "@aws-sdk/client-sts": "^3.678.0" } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz", - "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.678.0.tgz", + "integrity": "sha512-cF6IvQI1Jf5nJrK/Q7y3yFSQ8hv6MQ1g7HmZNo1tZTkywhfB3/zKcIFe6YftQul/s6RGHotXC2fr8jDkYQFDSQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.677.0", - "@aws-sdk/client-sso": "3.677.0", - "@aws-sdk/client-sts": "3.677.0", - "@aws-sdk/core": "3.677.0", - "@aws-sdk/credential-provider-cognito-identity": "3.677.0", - "@aws-sdk/credential-provider-env": "3.677.0", - "@aws-sdk/credential-provider-http": "3.677.0", - "@aws-sdk/credential-provider-ini": "3.677.0", - "@aws-sdk/credential-provider-node": "3.677.0", - "@aws-sdk/credential-provider-process": "3.677.0", - "@aws-sdk/credential-provider-sso": "3.677.0", - "@aws-sdk/credential-provider-web-identity": "3.677.0", + "@aws-sdk/client-cognito-identity": "3.678.0", + "@aws-sdk/client-sso": "3.678.0", + "@aws-sdk/client-sts": "3.678.0", + "@aws-sdk/core": "3.678.0", + "@aws-sdk/credential-provider-cognito-identity": "3.678.0", + "@aws-sdk/credential-provider-env": "3.678.0", + "@aws-sdk/credential-provider-http": "3.678.0", + "@aws-sdk/credential-provider-ini": "3.678.0", + "@aws-sdk/credential-provider-node": "3.678.0", + "@aws-sdk/credential-provider-process": "3.678.0", + "@aws-sdk/credential-provider-sso": "3.678.0", + "@aws-sdk/credential-provider-web-identity": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", "@smithy/property-provider": "^3.1.7", @@ -850,12 +850,12 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz", - "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.678.0.tgz", + "integrity": "sha512-tg9cC5COgGP0cznD2ys9kxPtVeKUygPZshDWXLAfA/cH/4m2ZUBvoEVv1SxkIbvOjnPwa976rdPLQUwRZvsL0g==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.677.0", + "@aws-sdk/core": "3.678.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", "@smithy/core": "^2.4.8", @@ -956,12 +956,12 @@ } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.677.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz", - "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw==", + "version": "3.678.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.678.0.tgz", + "integrity": "sha512-bKRemCdHMPAlEYE9KuQiMQG9/b4n8C+9DlJAL/X00Q7Zvm9Gv6h0+i5EZ+Xx8sbHq5oUv9a4W4tb+nkUZ0ltpw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.677.0", + "@aws-sdk/middleware-user-agent": "3.678.0", "@aws-sdk/types": "3.667.0", "@smithy/node-config-provider": "^3.1.8", "@smithy/types": "^3.5.0", diff --git a/package.json b/package.json index 6fef36c..3244955 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,10 @@ "db:reset": "npx prisma migrate reset" }, "dependencies": { - "@aws-sdk/client-cognito-identity-provider": "^3.677.0", - "@aws-sdk/client-secrets-manager": "^3.677.0", - "@aws-sdk/client-sesv2": "^3.677.0", - "@aws-sdk/credential-providers": "^3.677.0", + "@aws-sdk/client-cognito-identity-provider": "^3.678.0", + "@aws-sdk/client-secrets-manager": "^3.678.0", + "@aws-sdk/client-sesv2": "^3.678.0", + "@aws-sdk/credential-providers": "^3.678.0", "@cloudflare/stream-react": "^1.9.1", "@epic-web/remember": "^1.1.0", "@heroicons/react": "^2.1.5", From 7fcfe27289319e5bc167e4b82a44125cad013043 Mon Sep 17 00:00:00 2001 From: Claus Haas Date: Thu, 24 Oct 2024 15:08:59 -0300 Subject: [PATCH 3/3] add reset user subscriptions to admin panel --- app/routes/admin.students.$username.tsx | 42 +++++++++++++++++++++ app/services/subscription.service.server.ts | 20 ++++++++++ 2 files changed, 62 insertions(+) diff --git a/app/routes/admin.students.$username.tsx b/app/routes/admin.students.$username.tsx index ee619b1..5f72bfd 100644 --- a/app/routes/admin.students.$username.tsx +++ b/app/routes/admin.students.$username.tsx @@ -132,6 +132,16 @@ export const action = async ({request, params}: ActionFunctionArgs) => { break; } + case 'subscriptions': { + const {data: user} = await userService.getUserData(username!); + + await new SubscriptionService().resetUserSubscriptions(user); + + userSession.flash('success', 'Matrículas do aluno resetadas com sucesso'); + + break; + } + default: { userSession.flash('error', 'Tipo de formulário inválido'); break; @@ -541,6 +551,38 @@ export default function Student() {

Matrículas

+ + +
+ + + + + + + + + + + + + + +