From edfae5bf6b453a034e9603bb94736eb5ae1890ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Can=20Y=C4=B1lmaz?=
 <devbariscanyilmaz@gmail.com>
Date: Wed, 3 May 2023 16:57:41 +0300
Subject: [PATCH] refactor building formData params

---
 .../app/react-native/src/api/AccountAPI.js     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/templates/app/react-native/src/api/AccountAPI.js b/templates/app/react-native/src/api/AccountAPI.js
index cb3e921d24..76a4b7f914 100644
--- a/templates/app/react-native/src/api/AccountAPI.js
+++ b/templates/app/react-native/src/api/AccountAPI.js
@@ -2,10 +2,11 @@ import api from './API';
 import { getEnvVars } from '../../Environment';
 
 const { oAuthConfig } = getEnvVars();
+
 getLoginData = (username, password) => {
 
-  const formData ={
-    grant_type:'password',
+  const formData = {
+    grant_type: 'password',
     scope: oAuthConfig.scope,
     username: username,
     password: password,
@@ -13,11 +14,11 @@ getLoginData = (username, password) => {
   };
 
   if (oAuthConfig.clientSecret)
-    formData['client_secret']=oAuthConfig.clientSecret;
+    formData['client_secret'] = oAuthConfig.clientSecret;
 
-  return Array.from(Object.entries(formData))
-              .reduce((prev, [key, value]) => prev+=`&${key}=${value}`, '')
-              .slice(1);
+  return Object.entries(formData)
+    .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
+    .join('&');
 }
 
 export const login = ({ username, password }) =>
@@ -25,10 +26,11 @@ export const login = ({ username, password }) =>
     method: 'POST',
     url: '/connect/token',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    data: getLoginData(username,password),
-    baseURL: oAuthConfig.issuer,
+    data: getLoginData(username, password),
+    baseURL: oAuthConfig.issuer
   }).then(({ data }) => data);
 
+
 export const Logout = () =>
   api({
     method: 'GET',