Update substituteVariables

lib/utils/envvar_utils.dart

@@ -37,66 +37,60 @@ List<EnvironmentVariableModel> getEnvironmentSecrets(
 }
 
 String? substituteVariables(
-    String? input,
+  String? input,
-    Map<String?, List<EnvironmentVariableModel>> envMap,
+  Map<String, String> envVarMap,
-    String? activeEnvironmentId) {
+) {
   if (input == null) return null;
-
+  if (envVarMap.keys.isEmpty) {
-  final Map<String, String> combinedMap = {};
+    return input;
-  final activeEnv = envMap[activeEnvironmentId] ?? [];
-  final globalEnv = envMap[kGlobalEnvironmentId] ?? [];
-
-  for (var variable in globalEnv) {
-    combinedMap[variable.key] = variable.value;
-  }
-  for (var variable in activeEnv) {
-    combinedMap[variable.key] = variable.value;
   }
+  final regex = RegExp("{{(${envVarMap.keys.join('|')})}}");
 
-  String result = input.replaceAllMapped(kEnvVarRegEx, (match) {
+  String result = input.replaceAllMapped(regex, (match) {
     final key = match.group(1)?.trim() ?? '';
-    return combinedMap[key] ?? '';
+    return envVarMap[key] ?? '{{$key}}';
   });
 
   return result;
 }
 
 HttpRequestModel substituteHttpRequestModel(
-    HttpRequestModel httpRequestModel,
+  HttpRequestModel httpRequestModel,
-    Map<String?, List<EnvironmentVariableModel>> envMap,
+  Map<String?, List<EnvironmentVariableModel>> envMap,
-    String? activeEnvironmentId) {
+  String? activeEnvironmentId,
+) {
+  final Map<String, String> combinedEnvVarMap = {};
+  final activeEnv = envMap[activeEnvironmentId] ?? [];
+  final globalEnv = envMap[kGlobalEnvironmentId] ?? [];
+
+  for (var variable in globalEnv) {
+    combinedEnvVarMap[variable.key] = variable.value;
+  }
+  for (var variable in activeEnv) {
+    combinedEnvVarMap[variable.key] = variable.value;
+  }
+
   var newRequestModel = httpRequestModel.copyWith(
-    url: substituteVariables(
+    url: substituteVariables(httpRequestModel.url, combinedEnvVarMap)!,
-      httpRequestModel.url,
-      envMap,
-      activeEnvironmentId,
-    )!,
     headers: httpRequestModel.headers?.map((header) {
       return header.copyWith(
-        name:
+        name: substituteVariables(header.name, combinedEnvVarMap) ?? "",
-            substituteVariables(header.name, envMap, activeEnvironmentId) ?? "",
+        value: substituteVariables(header.value, combinedEnvVarMap),
-        value: substituteVariables(header.value, envMap, activeEnvironmentId),
       );
     }).toList(),
     params: httpRequestModel.params?.map((param) {
       return param.copyWith(
-        name:
+        name: substituteVariables(param.name, combinedEnvVarMap) ?? "",
-            substituteVariables(param.name, envMap, activeEnvironmentId) ?? "",
+        value: substituteVariables(param.value, combinedEnvVarMap),
-        value: substituteVariables(param.value, envMap, activeEnvironmentId),
       );
     }).toList(),
     formData: httpRequestModel.formData?.map((formData) {
       return formData.copyWith(
-        name: 
+        name: substituteVariables(formData.name, combinedEnvVarMap) ?? "",
-            substituteVariables(formData.name, envMap, activeEnvironmentId) ?? "",
+        value: substituteVariables(formData.value, combinedEnvVarMap) ?? "",
-        value: substituteVariables(formData.value, envMap, activeEnvironmentId) ?? "",
       );
     }).toList(),
-    body: substituteVariables(
+    body: substituteVariables(httpRequestModel.body, combinedEnvVarMap),
-      httpRequestModel.body,
-      envMap,
-      activeEnvironmentId,
-    ),
   );
   return newRequestModel;
 }

test/utils/envvar_utils_test.dart

@@ -48,10 +48,13 @@ const globalVars = [
   EnvironmentVariableModel(key: "num", value: "5670000"),
   EnvironmentVariableModel(key: "token", value: "token"),
 ];
+final globalVarsMap = {for (var item in globalVars) item.key: item.value};
 const activeEnvVars = [
   EnvironmentVariableModel(key: "url", value: "api.apidash.dev"),
   EnvironmentVariableModel(key: "num", value: "8940000"),
 ];
+final activeEnvVarsMap = {for (var item in activeEnvVars) item.key: item.value};
+final combinedEnvVarsMap = mergeMaps(globalVarsMap, activeEnvVarsMap);
 
 void main() {
   group("Testing getEnvironmentTitle function", () {
@@ -125,66 +128,45 @@ void main() {
   group("Testing substituteVariables function", () {
     test("Testing substituteVariables with null", () {
       String? input;
-      Map<String?, List<EnvironmentVariableModel>> envMap = {};
+      Map<String, String> envMap = {};
-      String? activeEnvironmentId;
+      expect(substituteVariables(input, envMap), null);
-      expect(substituteVariables(input, envMap, activeEnvironmentId), null);
     });
 
     test("Testing substituteVariables with empty input", () {
       String input = "";
-      Map<String?, List<EnvironmentVariableModel>> envMap = {};
+      Map<String, String> envMap = {};
-      String? activeEnvironmentId;
+      expect(substituteVariables(input, envMap), "");
-      expect(substituteVariables(input, envMap, activeEnvironmentId), "");
     });
 
     test("Testing substituteVariables with empty envMap", () {
       String input = "{{url}}/humanize/social?num={{num}}";
-      Map<String?, List<EnvironmentVariableModel>> envMap = {};
+      Map<String, String> envMap = {};
-      String? activeEnvironmentId;
+      String expected = "{{url}}/humanize/social?num={{num}}";
-      String expected = "/humanize/social?num=";
+      expect(substituteVariables(input, envMap), expected);
-      expect(substituteVariables(input, envMap, activeEnvironmentId), expected);
     });
 
     test("Testing substituteVariables with empty activeEnvironmentId", () {
       String input = "{{url}}/humanize/social?num={{num}}";
-      Map<String?, List<EnvironmentVariableModel>> envMap = {
-        kGlobalEnvironmentId: globalVars,
-      };
       String expected = "api.foss42.com/humanize/social?num=5670000";
-      expect(substituteVariables(input, envMap, null), expected);
+      expect(substituteVariables(input, globalVarsMap), expected);
     });
 
     test("Testing substituteVariables with non-empty activeEnvironmentId", () {
       String input = "{{url}}/humanize/social?num={{num}}";
-      Map<String?, List<EnvironmentVariableModel>> envMap = {
-        kGlobalEnvironmentId: globalVars,
-        "activeEnvId": activeEnvVars,
-      };
-      String? activeEnvId = "activeEnvId";
       String expected = "api.apidash.dev/humanize/social?num=8940000";
-      expect(substituteVariables(input, envMap, activeEnvId), expected);
+      expect(substituteVariables(input, combinedEnvVarsMap), expected);
     });
 
     test("Testing substituteVariables with incorrect paranthesis", () {
       String input = "{{url}}}/humanize/social?num={{num}}";
-      Map<String?, List<EnvironmentVariableModel>> envMap = {
-        kGlobalEnvironmentId: globalVars,
-        "activeEnvId": activeEnvVars,
-      };
-      String? activeEnvId = "activeEnvId";
       String expected = "api.apidash.dev}/humanize/social?num=8940000";
-      expect(substituteVariables(input, envMap, activeEnvId), expected);
+      expect(substituteVariables(input, combinedEnvVarsMap), expected);
     });
 
     test("Testing substituteVariables function with unavailable variables", () {
       String input = "{{url1}}/humanize/social?num={{num}}";
-      Map<String?, List<EnvironmentVariableModel>> envMap = {
+      String expected = "{{url1}}/humanize/social?num=8940000";
-        kGlobalEnvironmentId: globalVars,
+      expect(substituteVariables(input, combinedEnvVarsMap), expected);
-        "activeEnvId": activeEnvVars,
-      };
-      String? activeEnvironmentId = "activeEnvId";
-      String expected = "/humanize/social?num=8940000";
-      expect(substituteVariables(input, envMap, activeEnvironmentId), expected);
     });
   });
 
@@ -251,9 +233,9 @@ void main() {
       };
       String? activeEnvironmentId = "activeEnvId";
       const expected = HttpRequestModel(
-        url: "/humanize/social",
+        url: "{{url1}}/humanize/social",
         headers: [
-          NameValueModel(name: "Authorization", value: "Bearer "),
+          NameValueModel(name: "Authorization", value: "Bearer {{token1}}"),
         ],
         params: [
           NameValueModel(name: "num", value: "8940000"),