flutter/apidash
1
0
Fork 0
mirror of https://github.com/foss42/apidash.git synced 2025-12-09 23:02:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #635 from AffanShaikhsurab/patch-9

Browse Source 
Added env variable support for form request body
This commit is contained in:
Ashita Prasad
2025-03-23 07:54:53 +05:30
committed by GitHub
parent 49bacb8b66 3382782f37
commit 8b12a720f3
7 changed files with 106 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/screens/common_widgets/envfield_cell.dart
View File

@@ -27,22 +27,9 @@ class EnvCellField extends StatelessWidget {
style: kCodeStyle.copyWith(
color: clrScheme.onSurface,
),
decoration: InputDecoration(
hintStyle: kCodeStyle.copyWith(
color: clrScheme.outlineVariant,
),
decoration: getTextFieldInputDecoration(
clrScheme,
hintText: hintText,
contentPadding: const EdgeInsets.only(bottom: 12),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: clrScheme.outlineVariant,
),
),
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: clrScheme.surfaceContainerHighest,
),
),
),
onChanged: onChanged,
);

5
lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
View File

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:data_table_2/data_table_2.dart';
import 'package:apidash/providers/providers.dart';
import 'package:apidash/screens/common_widgets/common_widgets.dart';
import 'package:apidash/widgets/widgets.dart';
import 'package:apidash/utils/utils.dart';
import 'package:apidash/consts.dart';
@@ -82,7 +83,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
key: ValueKey("$selectedId-$index-form-row-$seed"),
cells: <DataCell>[
DataCell(
CellField(
EnvCellField(
keyId: "$selectedId-$index-form-k-$seed",
initialValue: formRows[index].name,
hintText: kHintAddFieldName,
@@ -138,7 +139,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
},
initialValue: formRows[index].value,
)
: CellField(
: EnvCellField(
keyId: "$selectedId-$index-form-v-$seed",
initialValue: formRows[index].value,
hintText: kHintAddValue,

69
lib/utils/envvar_utils.dart
View File

@@ -37,59 +37,60 @@ List<EnvironmentVariableModel> getEnvironmentSecrets(
}
String? substituteVariables(
String? input,
Map<String?, List<EnvironmentVariableModel>> envMap,
String? activeEnvironmentId) {
String? input,
Map<String, String> envVarMap,
) {
if (input == null) return null;
final Map<String, String> combinedMap = {};
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;
if (envVarMap.keys.isEmpty) {
return input;
}
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,
Map<String?, List<EnvironmentVariableModel>> envMap,
String? activeEnvironmentId) {
HttpRequestModel httpRequestModel,
Map<String?, List<EnvironmentVariableModel>> envMap,
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(
httpRequestModel.url,
envMap,
activeEnvironmentId,
)!,
url: substituteVariables(httpRequestModel.url, combinedEnvVarMap)!,
headers: httpRequestModel.headers?.map((header) {
return header.copyWith(
name:
substituteVariables(header.name, envMap, activeEnvironmentId) ?? "",
value: substituteVariables(header.value, envMap, activeEnvironmentId),
name: substituteVariables(header.name, combinedEnvVarMap) ?? "",
value: substituteVariables(header.value, combinedEnvVarMap),
);
}).toList(),
params: httpRequestModel.params?.map((param) {
return param.copyWith(
name:
substituteVariables(param.name, envMap, activeEnvironmentId) ?? "",
value: substituteVariables(param.value, envMap, activeEnvironmentId),
name: substituteVariables(param.name, combinedEnvVarMap) ?? "",
value: substituteVariables(param.value, combinedEnvVarMap),
);
}).toList(),
body: substituteVariables(
httpRequestModel.body,
envMap,
activeEnvironmentId,
),
formData: httpRequestModel.formData?.map((formData) {
return formData.copyWith(
name: substituteVariables(formData.name, combinedEnvVarMap) ?? "",
value: substituteVariables(formData.value, combinedEnvVarMap) ?? "",
);
}).toList(),
body: substituteVariables(httpRequestModel.body, combinedEnvVarMap),
);
return newRequestModel;
}

38
packages/apidash_design_system/lib/widgets/decoration_input_textfield.dart Normal file
View File

@@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
import '../tokens/tokens.dart';
InputDecoration getTextFieldInputDecoration(
ColorScheme clrScheme, {
Color? fillColor,
String? hintText,
TextStyle? hintTextStyle,
double? hintTextFontSize,
Color? hintTextColor,
EdgeInsetsGeometry? contentPadding,
Color? focussedBorderColor,
Color? enabledBorderColor,
bool? isDense,
}) {
return InputDecoration(
filled: true,
fillColor: fillColor ?? clrScheme.surfaceContainerLowest,
hintStyle: hintTextStyle ??
kCodeStyle.copyWith(
fontSize: hintTextFontSize,
color: hintTextColor ?? clrScheme.outlineVariant,
),
hintText: hintText,
contentPadding: contentPadding ?? kP10,
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: focussedBorderColor ?? clrScheme.outline,
),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: enabledBorderColor ?? clrScheme.surfaceContainerHighest,
),
),
isDense: isDense,
);
}

29
packages/apidash_design_system/lib/widgets/textfield_outlined.dart
View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import '../tokens/tokens.dart';
import 'decoration_input_textfield.dart';
class ADOutlinedTextField extends StatelessWidget {
const ADOutlinedTextField({
@@ -65,26 +66,16 @@ class ADOutlinedTextField extends StatelessWidget {
fontSize: textFontSize,
color: textColor ?? clrScheme.onSurface,
),
decoration: InputDecoration(
filled: true,
fillColor: fillColor ?? clrScheme.surfaceContainerLowest,
hintStyle: hintTextStyle ??
kCodeStyle.copyWith(
fontSize: hintTextFontSize,
color: hintTextColor ?? clrScheme.outlineVariant,
),
decoration: getTextFieldInputDecoration(
clrScheme,
fillColor: fillColor,
hintText: hintText,
contentPadding: contentPadding ?? kP10,
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: focussedBorderColor ?? clrScheme.outline,
),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: enabledBorderColor ?? clrScheme.surfaceContainerHighest,
),
),
hintTextStyle: hintTextStyle,
hintTextFontSize: hintTextFontSize,
hintTextColor: hintTextColor,
contentPadding: contentPadding,
focussedBorderColor: focussedBorderColor,
enabledBorderColor: enabledBorderColor,
isDense: isDense,
),
onChanged: onChanged,

1
packages/apidash_design_system/lib/widgets/widgets.dart
View File

@@ -2,6 +2,7 @@ export 'button_filled.dart';
export 'button_icon.dart';
export 'button_text.dart';
export 'checkbox.dart';
export 'decoration_input_textfield.dart';
export 'dropdown.dart';
export 'popup_menu.dart';
export 'snackbar.dart';

52
test/utils/envvar_utils_test.dart
View File

@@ -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 = {};
String? activeEnvironmentId;
expect(substituteVariables(input, envMap, activeEnvironmentId), null);
Map<String, String> envMap = {};
expect(substituteVariables(input, envMap), null);
});
test("Testing substituteVariables with empty input", () {
String input = "";
Map<String?, List<EnvironmentVariableModel>> envMap = {};
String? activeEnvironmentId;
expect(substituteVariables(input, envMap, activeEnvironmentId), "");
Map<String, String> envMap = {};
expect(substituteVariables(input, envMap), "");
});
test("Testing substituteVariables with empty envMap", () {
String input = "{{url}}/humanize/social?num={{num}}";
Map<String?, List<EnvironmentVariableModel>> envMap = {};
String? activeEnvironmentId;
String expected = "/humanize/social?num=";
expect(substituteVariables(input, envMap, activeEnvironmentId), expected);
Map<String, String> envMap = {};
String expected = "{{url}}/humanize/social?num={{num}}";
expect(substituteVariables(input, envMap), 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 = {
kGlobalEnvironmentId: globalVars,
"activeEnvId": activeEnvVars,
};
String? activeEnvironmentId = "activeEnvId";
String expected = "/humanize/social?num=8940000";
expect(substituteVariables(input, envMap, activeEnvironmentId), expected);
String expected = "{{url1}}/humanize/social?num=8940000";
expect(substituteVariables(input, combinedEnvVarsMap), 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"),