From e3cd013792b484fbcdbb5cb181660cd5f78b4491 Mon Sep 17 00:00:00 2001 From: Rodrigo Rahman Date: Fri, 8 Mar 2024 14:46:22 -0300 Subject: [PATCH] =?UTF-8?q?fix:=20Mudan=C3=A7a=20na=20estrutura=20dos=20te?= =?UTF-8?q?stes=20e=20criado=20testes=20para=20o=20/me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 6 ++ database.json | 2 +- lib/src/server/json_rest_server.dart | 6 +- pubspec.yaml | 1 + .../auth_handler_custom_fields_test.dart | 6 +- test/server/handlers/auth_handler_test.dart | 8 +- test/server/handlers/get_handler_test.dart | 4 + test/server/handlers/me_handler_test.dart | 62 ++++++++++++++ test/server/handlers/put_handler_test.dart | 4 + .../mock/auth_custom_fields_config.json | 26 ++++++ test/server/mock/auth_default_config.json | 14 ++++ .../mock/auth_default_id_int_config.json | 14 ++++ test/server/mock/basic_config.json | 10 +++ test/server/mock/database_int.json | 84 +++++++++++++++++++ .../database.json => mock/database_uuid.json} | 0 test/server/mock/env_mock.dart | 14 +++- test/server/mock/generate_config.dart | 34 ++++++++ test/server/mock/generate_database.dart | 20 +++++ test/server/server_config/config.yaml | 26 +----- .../config_bk.yaml} | 7 +- test/server/server_config/database.json | 8 +- .../config_auth_fields.yaml | 36 -------- .../server_config_auth/config_default.yaml | 30 ------- 23 files changed, 319 insertions(+), 103 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 test/server/handlers/me_handler_test.dart create mode 100644 test/server/mock/auth_custom_fields_config.json create mode 100644 test/server/mock/auth_default_config.json create mode 100644 test/server/mock/auth_default_id_int_config.json create mode 100644 test/server/mock/basic_config.json create mode 100644 test/server/mock/database_int.json rename test/server/{server_config_auth/database.json => mock/database_uuid.json} (100%) create mode 100644 test/server/mock/generate_config.dart create mode 100644 test/server/mock/generate_database.dart rename test/server/{server_config_auth/config.yaml => server_config/config_bk.yaml} (88%) delete mode 100644 test/server/server_config_auth/config_auth_fields.yaml delete mode 100644 test/server/server_config_auth/config_default.yaml diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..2d768c8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "dart.testAdditionalArgs": [ + "--concurrency", + "1" + ], +} \ No newline at end of file diff --git a/database.json b/database.json index c101663..abe4f18 100644 --- a/database.json +++ b/database.json @@ -1 +1 @@ -{"users":[{"id":"67256120-0258-1e7b-8d18-87b1c7869e63","email":"at1@gmail.com","password":"123123"},{"id":"d51a7d90-4296-1e8a-877a-b36fd069fb19","email":"at1@gmail.com","password":"123123"}],"adm_users":[{"id":"024fb8e0-02fd-1e7b-8d18-87b1c7869e63","email":"terminal1@gmail.com","password":"123123"}],"attendantDeskAssignment":[],"patients":[{"id":"93b3fd10-9dd7-1e82-bfae-fb5426cd6532","name":"Rodrigo Rahman 2","email":"rodrigorahman@academiadoflutter.com.br","phone_number":"(11) 1231212312","document":"123.123.123-12","address":{"cep":"09190390","street_address":"Rua X","number":"51","address_complement":"","state":"SP","city":"Santo André","district":"Jardins"},"guardian":"","guardian_identification_number":""},{"id":"64a62430-4df9-1e83-bfae-fb5426cd6532","name":"teste","email":"teste@teste.com.br","phone_number":"(12) 3123-1231","document":"321.321.321-32","address":{"cep":"11.111-111","street_address":"teste","number":"12","address_complement":"teste","state":"teste","city":"teste","district":"teste"},"guardian":"teste","guardian_identification_number":"123.123.123-13"}],"patientInformationForm":[],"painelCheckin":[],"tests":[{"id":"3b2526a7-96ad-4884-8d89-aac3a8f8d1e1","name":"Endoscopia"},{"id":"89b5ecf8-dcdd-42fd-b1ec-335537b661cc","name":"Exame de Sangue"},{"id":"4c7c2c0e-84fa-4b91-aff1-f8f9a99b4925","name":"Ressonância Magnética"},{"id":"49d4cb2e-afd5-4345-ac03-92ec451c0601","name":"Tomografia Computadorizada"},{"id":"0c4f178f-8b57-4f03-bbd5-5463e228d810","name":"Ultrassonografia"},{"id":"56ec8065-417f-4082-bcb5-1900b504c78d","name":"Eletrocardiograma"},{"id":"fb685fbd-853e-49f2-8a55-1086d08db53e","name":"Raio-X"},{"id":"93d3d43a-2f14-4d00-984b-d46f35c76142","name":"Colonoscopia"},{"id":"957a344b-ec07-4023-8e51-1adfa4e62a05","name":"Teste de Esforço"},{"id":"98b881bc-67cf-4e10-adca-17a1f59d798e","name":"Biopsia"},{"id":"9a4a3733-50cf-47ca-a671-2fbadd319d5b","name":"Eletroencefalograma"},{"id":"222fd2b7-af4e-42e2-8f08-069cbcd0f728","name":"Exame de Urina"},{"id":"590f8160-7920-40f7-9f44-cc6d42dff46d","name":"Holter 24 Horas"},{"id":"c71c2048-0cb8-49a2-a4f2-3b0dcdee6dd6","name":"Mamografia"},{"id":"05a0f0fb-6202-420a-8644-a1c1772c9da6","name":"Densitometria Óssea"},{"id":"2b029e96-eb37-43ad-8475-2d5cd273ef7e","name":"Teste de Gravidez"},{"id":"c0537924-ef52-43f9-8819-1f2a730eb5b7","name":"Teste de Glicemia"},{"id":"0fb498bd-2a27-4c23-9cf4-87b8a633d218","name":"Esprometria"},{"id":"67397c75-6ec4-4699-b52c-dadeb44b4734","name":"Audiometria"},{"id":"09835021-acc2-4792-a167-46d067de7406","name":"Exame de Vista"}]} \ No newline at end of file +{"users":[{"id":"67256120-0258-1e7b-8d18-87b1c7869e63","email":"at1@gmail.com","password":"123123","document":"123.123.123-12","cellphone":11999999999},{"id":"d51a7d90-4296-1e8a-877a-b36fd069fb19","email":"at1@gmail.com","password":"123123","document":"123.123.123-11","cellphone":21999999999}],"adm_users":[{"id":"024fb8e0-02fd-1e7b-8d18-87b1c7869e63","email":"terminal1@gmail.com","password":"123123"}],"attendantDeskAssignment":[],"patients":[{"id":"93b3fd10-9dd7-1e82-bfae-fb5426cd6532","name":"Rodrigo Rahman 2","email":"rodrigorahman@academiadoflutter.com.br","phone_number":"(11) 1231212312","document":"123.123.123-12","address":{"cep":"09190390","street_address":"Rua X","number":"51","address_complement":"","state":"SP","city":"Santo André","district":"Jardins"},"guardian":"","guardian_identification_number":""},{"id":"64a62430-4df9-1e83-bfae-fb5426cd6532","name":"teste","email":"teste@teste.com.br","phone_number":"(12) 3123-1231","document":"321.321.321-32","address":{"cep":"11.111-111","street_address":"teste","number":"12","address_complement":"teste","state":"teste","city":"teste","district":"teste"},"guardian":"teste","guardian_identification_number":"123.123.123-13"}],"patientInformationForm":[],"painelCheckin":[],"tests":[{"id":"3b2526a7-96ad-4884-8d89-aac3a8f8d1e1","name":"Endoscopia"},{"id":"89b5ecf8-dcdd-42fd-b1ec-335537b661cc","name":"Exame de Sangue"},{"id":"4c7c2c0e-84fa-4b91-aff1-f8f9a99b4925","name":"Ressonância Magnética"},{"id":"49d4cb2e-afd5-4345-ac03-92ec451c0601","name":"Tomografia Computadorizada"},{"id":"0c4f178f-8b57-4f03-bbd5-5463e228d810","name":"Ultrassonografia"},{"id":"56ec8065-417f-4082-bcb5-1900b504c78d","name":"Eletrocardiograma"},{"id":"fb685fbd-853e-49f2-8a55-1086d08db53e","name":"Raio-X"},{"id":"93d3d43a-2f14-4d00-984b-d46f35c76142","name":"Colonoscopia"},{"id":"957a344b-ec07-4023-8e51-1adfa4e62a05","name":"Teste de Esforço"},{"id":"98b881bc-67cf-4e10-adca-17a1f59d798e","name":"Biopsia"},{"id":"9a4a3733-50cf-47ca-a671-2fbadd319d5b","name":"Eletroencefalograma"},{"id":"222fd2b7-af4e-42e2-8f08-069cbcd0f728","name":"Exame de Urina"},{"id":"590f8160-7920-40f7-9f44-cc6d42dff46d","name":"Holter 24 Horas"},{"id":"c71c2048-0cb8-49a2-a4f2-3b0dcdee6dd6","name":"Mamografia"},{"id":"05a0f0fb-6202-420a-8644-a1c1772c9da6","name":"Densitometria Óssea"},{"id":"2b029e96-eb37-43ad-8475-2d5cd273ef7e","name":"Teste de Gravidez"},{"id":"c0537924-ef52-43f9-8819-1f2a730eb5b7","name":"Teste de Glicemia"},{"id":"0fb498bd-2a27-4c23-9cf4-87b8a633d218","name":"Esprometria"},{"id":"67397c75-6ec4-4699-b52c-dadeb44b4734","name":"Audiometria"},{"id":"09835021-acc2-4792-a167-46d067de7406","name":"Exame de Vista"}]} \ No newline at end of file diff --git a/lib/src/server/json_rest_server.dart b/lib/src/server/json_rest_server.dart index ac3d7af..8bd7e10 100644 --- a/lib/src/server/json_rest_server.dart +++ b/lib/src/server/json_rest_server.dart @@ -67,7 +67,7 @@ class JsonRestServer { } final serverHandler = cascadeServer.handler; - + _httpServer = await serve(serverHandler, ip, port); if (ip == '0.0.0.0') { final networks = @@ -109,6 +109,8 @@ class JsonRestServer { Future closeServer() async { print('servidor fechado'); - await _httpServer.close(); + await _httpServer.close(force: true); + _socketHandler.server.close(); } + } diff --git a/pubspec.yaml b/pubspec.yaml index d693cae..98a5947 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,6 +26,7 @@ dev_dependencies: dio: ^5.4.0 lints: ^3.0.0 test: ^1.25.0 + yaml_writer: ^2.0.0 executables: json_rest_server: json_rest_server diff --git a/test/server/handlers/auth_handler_custom_fields_test.dart b/test/server/handlers/auth_handler_custom_fields_test.dart index 63ad9d1..d982adc 100644 --- a/test/server/handlers/auth_handler_custom_fields_test.dart +++ b/test/server/handlers/auth_handler_custom_fields_test.dart @@ -3,13 +3,17 @@ import 'package:json_rest_server/src/server/json_rest_server.dart'; import 'package:test/test.dart'; import '../mock/env_mock.dart'; +import '../mock/generate_config.dart'; +import '../mock/generate_database.dart'; void main() { group('Custom Fields Auth Handler Test', () { JsonRestServer? server; setUpAll(() async { print('start server'); - server = JsonRestServer(EnvMockAuth.customFieldsAuth()); + GenerateDatabase.uuid(); + GenerateConfig.customFieldsAuth(); + server = JsonRestServer(EnvMock()); await server!.startServer(); }); diff --git a/test/server/handlers/auth_handler_test.dart b/test/server/handlers/auth_handler_test.dart index 65273b6..6c61efa 100644 --- a/test/server/handlers/auth_handler_test.dart +++ b/test/server/handlers/auth_handler_test.dart @@ -3,19 +3,25 @@ import 'package:json_rest_server/src/server/json_rest_server.dart'; import 'package:test/test.dart'; import '../mock/env_mock.dart'; +import '../mock/generate_config.dart'; +import '../mock/generate_database.dart'; void main() { group('Default Fields Auth Handler Test', () { JsonRestServer? server; setUpAll(() async { print('start server'); - server = JsonRestServer(EnvMockAuth.defaultAuth()); + GenerateDatabase.uuid(); + GenerateConfig.defaultAuth(); + server = JsonRestServer(EnvMock()); await server!.startServer(); }); tearDownAll(() => server?.closeServer()); test('Should login success', () async { + + final Response( data: { 'access_token': accessToken, diff --git a/test/server/handlers/get_handler_test.dart b/test/server/handlers/get_handler_test.dart index 42b3a27..1787121 100644 --- a/test/server/handlers/get_handler_test.dart +++ b/test/server/handlers/get_handler_test.dart @@ -3,11 +3,15 @@ import 'package:json_rest_server/src/server/json_rest_server.dart'; import 'package:test/test.dart'; import '../mock/env_mock.dart'; +import '../mock/generate_config.dart'; +import '../mock/generate_database.dart'; void main() { group('Getter Tests', () { JsonRestServer? server; setUpAll(() async { + GenerateDatabase.uuid(); + GenerateConfig.basic(); server = JsonRestServer(EnvMock()); await server!.startServer(); }); diff --git a/test/server/handlers/me_handler_test.dart b/test/server/handlers/me_handler_test.dart new file mode 100644 index 0000000..af87dea --- /dev/null +++ b/test/server/handlers/me_handler_test.dart @@ -0,0 +1,62 @@ +import 'package:dio/dio.dart'; +import 'package:get_it/get_it.dart'; +import 'package:json_rest_server/src/server/json_rest_server.dart'; +import 'package:test/test.dart'; + +import '../mock/env_mock.dart'; +import '../mock/generate_config.dart'; +import '../mock/generate_database.dart'; + +void main() { + group('Tests get me', () { + setUpAll((){ + GetIt.I.allowReassignment = true; + }); + test('Shoud me data when id int', () async { + GenerateConfig.defaultAuthIdInt(); + GenerateDatabase.int(); + + final server = JsonRestServer(EnvMock()); + await server.startServer(); + + final authToken = await _auth(); + final Response(data: Map(isNotEmpty: hasData)) = await Dio().get( + 'http://localhost:8080/me', + options: Options(headers: {'Authorization': authToken})); + + expect(hasData, isTrue); + await server.closeServer(); + }); + + test('Shoud me data when id UUID', () async { + print(DateTime.now().toIso8601String()); + GenerateConfig.defaultAuth(); + GenerateDatabase.uuid(); + final server = JsonRestServer(EnvMock()); + await server.startServer(); + + final authToken = await _auth(); + final Response(data: Map(isNotEmpty: hasData)) = await Dio().get( + 'http://localhost:8080/me', + options: Options(headers: {'Authorization': authToken})); + + expect(hasData, isTrue); + await server.closeServer(); + }); + }); +} + +Future _auth() async { + final Response( + data: {'access_token': accessToken, 'type': type}, + :statusCode + ) = await Dio().post( + 'http://localhost:8080/auth', + data: { + "email": "at1@gmail.com", + "password": "123123", + }, + ); + expect(statusCode, equals(200)); + return '$type $accessToken'; +} diff --git a/test/server/handlers/put_handler_test.dart b/test/server/handlers/put_handler_test.dart index 62d0cce..85a3f16 100644 --- a/test/server/handlers/put_handler_test.dart +++ b/test/server/handlers/put_handler_test.dart @@ -3,11 +3,15 @@ import 'package:json_rest_server/src/server/json_rest_server.dart'; import 'package:test/test.dart'; import '../mock/env_mock.dart'; +import '../mock/generate_config.dart'; +import '../mock/generate_database.dart'; void main() { group('Put Tests group', () { JsonRestServer? server; setUpAll(() async { + GenerateDatabase.uuid(); + GenerateConfig.basic(); server = JsonRestServer(EnvMock()); await server!.startServer(); }); diff --git a/test/server/mock/auth_custom_fields_config.json b/test/server/mock/auth_custom_fields_config.json new file mode 100644 index 0000000..905414b --- /dev/null +++ b/test/server/mock/auth_custom_fields_config.json @@ -0,0 +1,26 @@ +{ + "name": "Json Rest Server", + "port": 8080, + "host": "0.0.0.0", + "database": "database.json", + "enableSocket": true, + "socketPort": 8081, + "broadcastProvider": "socket", + "idType": "uuid", + "auth": { + "jwtSecret": "cwsMXDtuP447WZQ63nM4dWZ3RppyMl", + "jwtExpire": 3600, + "authFields": [ + { + "document": { + "type": "string" + } + }, + { + "cellphone": { + "type": "int" + } + } + ] + } +} \ No newline at end of file diff --git a/test/server/mock/auth_default_config.json b/test/server/mock/auth_default_config.json new file mode 100644 index 0000000..28543e2 --- /dev/null +++ b/test/server/mock/auth_default_config.json @@ -0,0 +1,14 @@ +{ + "name": "Json Rest Server", + "port": 8080, + "host": "0.0.0.0", + "database": "database.json", + "enableSocket": true, + "socketPort": 8081, + "broadcastProvider": "socket", + "idType": "uuid", + "auth": { + "jwtSecret": "cwsMXDtuP447WZQ63nM4dWZ3RppyMl", + "jwtExpire": 3600 + } +} \ No newline at end of file diff --git a/test/server/mock/auth_default_id_int_config.json b/test/server/mock/auth_default_id_int_config.json new file mode 100644 index 0000000..292065d --- /dev/null +++ b/test/server/mock/auth_default_id_int_config.json @@ -0,0 +1,14 @@ +{ + "name": "Json Rest Server", + "port": 8080, + "host": "0.0.0.0", + "database": "database.json", + "enableSocket": true, + "socketPort": 8081, + "broadcastProvider": "socket", + "idType": "int", + "auth": { + "jwtSecret": "cwsMXDtuP447WZQ63nM4dWZ3RppyMl", + "jwtExpire": 3600 + } +} \ No newline at end of file diff --git a/test/server/mock/basic_config.json b/test/server/mock/basic_config.json new file mode 100644 index 0000000..dbf5ca2 --- /dev/null +++ b/test/server/mock/basic_config.json @@ -0,0 +1,10 @@ +{ + "name": "Json Rest Server", + "port": 8080, + "host": "0.0.0.0", + "database": "database.json", + "enableSocket": true, + "socketPort": 8081, + "broadcastProvider": "socket", + "idType": "uuid" +} \ No newline at end of file diff --git a/test/server/mock/database_int.json b/test/server/mock/database_int.json new file mode 100644 index 0000000..f8bca27 --- /dev/null +++ b/test/server/mock/database_int.json @@ -0,0 +1,84 @@ +{ + "users": [ + { + "id": 1, + "email": "at1@gmail.com", + "password": "123123", + "document":"123.123.123-12", + "cellphone": 11999999999 + }, + { + "id": 2, + "email": "at1@gmail.com", + "password": "123123", + "document":"123.123.123-11", + "cellphone": 21999999999 + } + ], + "adm_users": [ + { + "id": 1, + "email": "terminal1@gmail.com", + "password": "123123" + } + ], + "attendantDeskAssignment": [], + "patients": [ + { + "id": 1, + "name": "Rodrigo Rahman 2", + "email": "rodrigorahman@academiadoflutter.com.br", + "phone_number": "(11) 1231212312", + "document": "123.123.123-12", + "address": { + "cep": "09190390", + "street_address": "Rua X", + "number": "51", + "address_complement": "", + "state": "SP", + "city": "Santo André", + "district": "Jardins" + }, + "guardian": "", + "guardian_identification_number": "" + }, + { + "id": 2, + "name": "teste", + "email": "teste@teste.com.br", + "phone_number": "(12) 3123-1231", + "document": "321.321.321-32", + "address": { + "cep": "11.111-111", + "street_address": "teste", + "number": "12", + "address_complement": "teste", + "state": "teste", + "city": "teste", + "district": "teste" + }, + "guardian": "teste", + "guardian_identification_number": "123.123.123-13" + } + ], + "patientInformationForm": [], + "painelCheckin": [], + "tests": [ + { + "id": 1, + "name": "Endoscopia" + }, + { + "id": 2, + "name": "Exame de Sangue" + }, + { + "id": 3, + "name": "Ressonância Magnética" + }, + { + "id": 4, + "name": "Tomografia Computadorizada" + } + ] +} \ No newline at end of file diff --git a/test/server/server_config_auth/database.json b/test/server/mock/database_uuid.json similarity index 100% rename from test/server/server_config_auth/database.json rename to test/server/mock/database_uuid.json diff --git a/test/server/mock/env_mock.dart b/test/server/mock/env_mock.dart index 98d2dd5..c66f5f8 100644 --- a/test/server/mock/env_mock.dart +++ b/test/server/mock/env_mock.dart @@ -1,7 +1,9 @@ +import 'dart:convert'; import 'dart:io'; import 'package:json_rest_server/src/server/core/env.dart'; import 'package:path/path.dart' as path; +import 'package:yaml_writer/yaml_writer.dart'; class EnvMock extends Env { @override @@ -15,11 +17,15 @@ class EnvMockAuth extends Env { factory EnvMockAuth.defaultAuth() { // Substituir o arquivo pelo template do config_defaults.yaml - final basePath = - path.joinAll([path.current, 'test', 'server', 'server_config_auth']); - final fileBase = File(path.joinAll([basePath, 'config_default.yaml'])); + final basePath = path.joinAll([path.current, 'test', 'server', 'mock']); + + final jsonConfig = + File(path.joinAll([basePath, 'auth_default_config.json'])); + var yamlWriter = YamlWriter(allowUnquotedStrings:true); + var yamlDoc = yamlWriter.write(jsonDecode(jsonConfig.readAsStringSync())); + print(yamlDoc); final finalFile = File(path.joinAll([basePath, 'config.yaml'])); - finalFile.writeAsStringSync(fileBase.readAsStringSync()); + finalFile.writeAsStringSync(yamlDoc); return EnvMockAuth._(); } diff --git a/test/server/mock/generate_config.dart b/test/server/mock/generate_config.dart new file mode 100644 index 0000000..1575ec0 --- /dev/null +++ b/test/server/mock/generate_config.dart @@ -0,0 +1,34 @@ +import 'dart:convert'; +import 'dart:io'; + +import 'package:path/path.dart' as path; +import 'package:yaml_writer/yaml_writer.dart'; + +class GenerateConfig { + static final String _basePath = + path.joinAll([path.current, 'test', 'server']); + + static void basic() => _generateConfig('basic_config.json'); + static void defaultAuth() => _generateConfig('auth_default_config.json'); + static void defaultAuthIntId() => _generateConfig('auth_default_id_int_config.json'); + + static void customFieldsAuth() => + _generateConfig('auth_custom_fields_config.json'); + + + static void defaultAuthIdInt() => + _generateConfig('auth_default_id_int_config.json'); + + + + static void _generateConfig(String mockFile) { + final jsonConfig = File(path.joinAll([_basePath, 'mock', mockFile])); + var yamlWriter = YamlWriter(allowUnquotedStrings: true); + var yamlDoc = yamlWriter.write(jsonDecode(jsonConfig.readAsStringSync())); + print(yamlDoc); + final finalFile = + File(path.joinAll([_basePath, 'server_config', 'config.yaml'])); + + finalFile.writeAsStringSync(yamlDoc); + } +} diff --git a/test/server/mock/generate_database.dart b/test/server/mock/generate_database.dart new file mode 100644 index 0000000..53b0805 --- /dev/null +++ b/test/server/mock/generate_database.dart @@ -0,0 +1,20 @@ +import 'dart:io'; + +import 'package:path/path.dart' as path; + +class GenerateDatabase { + static final String _basePath = + path.joinAll([path.current, 'test', 'server']); + + static void uuid() => _generateConfig('database_uuid.json'); + static void int() => _generateConfig('database_int.json'); + + + static void _generateConfig(String mockFile) { + final jsonConfig = File(path.joinAll([_basePath, 'mock', mockFile])); + final finalFile = + File(path.joinAll([_basePath, 'server_config', 'database.json'])); + + finalFile.writeAsStringSync(jsonConfig.readAsStringSync()); + } +} diff --git a/test/server/server_config/config.yaml b/test/server/server_config/config.yaml index 58d9dd2..9beb10c 100644 --- a/test/server/server_config/config.yaml +++ b/test/server/server_config/config.yaml @@ -4,26 +4,8 @@ host: 0.0.0.0 database: database.json enableSocket: true socketPort: 8081 -broadcastProvider: socket #socket,slack or only socket or only slack +broadcastProvider: socket idType: uuid -slack: - slackUrl: '' #your webhook url from slack - slackChannel: '' #your channel starting with # -# storage: -# folder: storage/ -# name: "file" - -# auth: -# jwtSecret: cwsMXDtuP447WZQ63nM4dWZ3RppyMl -# jwtExpire: 3600 -# unauthorizedStatusCode: 401 -# # enableAdm: true -# # urlUserPermission: -# # - /students -# urlSkip: -# - /users: -# method: post -# - /products: -# method: get -# - /products/{*}: -# method: get +auth: + jwtSecret: cwsMXDtuP447WZQ63nM4dWZ3RppyMl + jwtExpire: 3600 diff --git a/test/server/server_config_auth/config.yaml b/test/server/server_config/config_bk.yaml similarity index 88% rename from test/server/server_config_auth/config.yaml rename to test/server/server_config/config_bk.yaml index ebd9782..58d9dd2 100644 --- a/test/server/server_config_auth/config.yaml +++ b/test/server/server_config/config_bk.yaml @@ -13,10 +13,9 @@ slack: # folder: storage/ # name: "file" -auth: - jwtSecret: cwsMXDtuP447WZQ63nM4dWZ3RppyMl - jwtExpire: 3600 - +# auth: +# jwtSecret: cwsMXDtuP447WZQ63nM4dWZ3RppyMl +# jwtExpire: 3600 # unauthorizedStatusCode: 401 # # enableAdm: true # # urlUserPermission: diff --git a/test/server/server_config/database.json b/test/server/server_config/database.json index ababf7d..65ae4a9 100644 --- a/test/server/server_config/database.json +++ b/test/server/server_config/database.json @@ -3,12 +3,16 @@ { "id": "67256120-0258-1e7b-8d18-87b1c7869e63", "email": "at1@gmail.com", - "password": "123123" + "password": "123123", + "document":"123.123.123-12", + "cellphone": 11999999999 }, { "id": "d51a7d90-4296-1e8a-877a-b36fd069fb19", "email": "at1@gmail.com", - "password": "123123" + "password": "123123", + "document":"123.123.123-11", + "cellphone": 21999999999 } ], "adm_users": [ diff --git a/test/server/server_config_auth/config_auth_fields.yaml b/test/server/server_config_auth/config_auth_fields.yaml deleted file mode 100644 index 3542f40..0000000 --- a/test/server/server_config_auth/config_auth_fields.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Json Rest Server -port: 8080 -host: 0.0.0.0 -database: database.json -enableSocket: true -socketPort: 8081 -broadcastProvider: socket #socket,slack or only socket or only slack -idType: uuid -slack: - slackUrl: '' #your webhook url from slack - slackChannel: '' #your channel starting with # -# storage: -# folder: storage/ -# name: "file" - -auth: - jwtSecret: cwsMXDtuP447WZQ63nM4dWZ3RppyMl - jwtExpire: 3600 - - authFields: - - document: - type: string - - cellphone: - type: int - -# unauthorizedStatusCode: 401 -# # enableAdm: true -# # urlUserPermission: -# # - /students -# urlSkip: -# - /users: -# method: post -# - /products: -# method: get -# - /products/{*}: -# method: get diff --git a/test/server/server_config_auth/config_default.yaml b/test/server/server_config_auth/config_default.yaml deleted file mode 100644 index ebd9782..0000000 --- a/test/server/server_config_auth/config_default.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: Json Rest Server -port: 8080 -host: 0.0.0.0 -database: database.json -enableSocket: true -socketPort: 8081 -broadcastProvider: socket #socket,slack or only socket or only slack -idType: uuid -slack: - slackUrl: '' #your webhook url from slack - slackChannel: '' #your channel starting with # -# storage: -# folder: storage/ -# name: "file" - -auth: - jwtSecret: cwsMXDtuP447WZQ63nM4dWZ3RppyMl - jwtExpire: 3600 - -# unauthorizedStatusCode: 401 -# # enableAdm: true -# # urlUserPermission: -# # - /students -# urlSkip: -# - /users: -# method: post -# - /products: -# method: get -# - /products/{*}: -# method: get