🔧 feat(frontend): Change frontend to send adapted POST requests to th…

…e membership service
dynatrace-oss · May 13, 2024 · 6e22a44 · 6e22a44
1 parent ace7b49
commit 6e22a44
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/src/frontend/site.js b/src/frontend/site.js
@@ -24,6 +24,7 @@ const adManagerRouter = require('./controller/adManager');
 const cheerio = require('cheerio');
 const express = require('express');
 const router = express.Router();
+const querystring = require('querystring');
 
 // Global Timeline route
 router.get('/', showGlobalTimeline);
@@ -71,7 +72,7 @@ function showGlobalTimeline(req, res) {
                     username: getJwtUser(req.cookies),
                     isAdManager: hasJwtRole(req.cookies, roles.AD_MANAGER),
                     baseData: baseRequestFactory.baseData,
-                    membership: membership.data.membership
+                    membership: membership.data
 
                 }, req);
                 res.render('index.njk', data)
@@ -109,7 +110,7 @@ function showUsers(req, res) {
                 username: getJwtUser(req.cookies),
                 isAdManager: hasJwtRole(req.cookies, roles.AD_MANAGER),
                 baseData: baseRequestFactory.baseData,
-                membership: membership.data.membership
+                membership: membership.data
 
             }, req);
             res.render('users.njk', data);
@@ -130,7 +131,7 @@ function showPersonalTimeline(req, res) {
                     username: getJwtUser(req.cookies),
                     isAdManager: hasJwtRole(req.cookies, roles.AD_MANAGER),
                     baseData: baseRequestFactory.baseData,
-                    membership: membership.data.membership
+                    membership: membership.data
                 }, req);
                 res.render('index.njk', data);
             }, (err) => displayError(err, res))
@@ -154,7 +155,7 @@ function showUserProfile(req, res) {
                 isAdManager: hasJwtRole(req.cookies, roles.AD_MANAGER),
                 bio: bioText,
                 baseData: baseRequestFactory.baseData,
-                membership: membership.data.membership
+                membership: membership.data
             }, req);
 
             res.render('profile.njk', data);
@@ -189,7 +190,7 @@ function showMembership(req, res) {
                 username: getJwtUser(req.cookies),
                 isAdManager: hasJwtRole(req.cookies, roles.AD_MANAGER),
                 baseData: baseRequestFactory.baseData,
-                membership: membership.data.membership
+                membership: membership.data
             }, req);
 
             res.render('membership.njk', data);
@@ -373,11 +374,28 @@ function unlikePost(req, res) {
 }
 
 function postMembership(req, res) {
-    const membership = {userid: getJwtUserId(req.cookies), membership: req.body.membershipText};
-    fetchUsingDeploymentBase(req, () => req.MEMBERSHIP_SERVICE_API.post('/', membership)).then((response) => {
-        res.redirect(extendURL(`/user/${getJwtUser(req.cookies)}`));
-    }, (error) => res.status(statusCodeForError(error)).render('error.njk', handleError(error)));
-
+    const formData = {
+        membership: req.body.membershipText,
+    };
+    fetchUsingDeploymentBase(req, () =>
+        req.MEMBERSHIP_SERVICE_API.post(
+            `/add/${getJwtUserId(req.cookies)}`,
+            querystring.stringify(formData),
+            {
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                },
+            }
+        )
+    ).then(
+        (response) => {
+            res.redirect(extendURL(`/user/${getJwtUser(req.cookies)}`));
+        },
+        (error) =>
+            res
+                .status(statusCodeForError(error))
+                .render("error.njk", handleError(error))
+    );
 }
 
 function postBio(req, res) {

diff --git a/src/frontend/views/membership.njk b/src/frontend/views/membership.njk
@@ -1,4 +1,4 @@
-{# 
+{#
 Copyright 2023 Dynatrace LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,6 +48,7 @@ limitations under the License.
                     </ul>
                   </div>
                 </div>
+              </div>
         </div>
 
         <form method="post">
@@ -66,6 +67,6 @@ limitations under the License.
                     Update membership plan
                 </button>
             </div>
-        </post>
+        </form>
     </div>
 {% endblock %}