Skip to content

Commit 823e33e

Browse files
committed
Mejoras de comentarios
1 parent 3926c21 commit 823e33e

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

LIN.Identity.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Http", "..\..\Tipos\Http\Ht
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LIN.Types.Auth", "..\..\Tipos\LIN.Types.Auth\LIN.Types.Auth.csproj", "{CDED4C37-3998-4F64-8C87-85A9D0AB6CBD}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LIN.Access.Logger", "..\..\AccesoAPI\LIN.Access.Logger\LIN.Access.Logger.csproj", "{6CB65EA1-51C6-4450-B174-F0A04C489FB5}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LIN.Access.Logger", "..\..\AccesoAPI\LIN.Access.Logger\LIN.Access.Logger.csproj", "{6CB65EA1-51C6-4450-B174-F0A04C489FB5}"
1717
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution

LIN.Identity/Areas/Accounts/AccountController.cs

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,22 @@ public async Task<HttpCreateResponse> Create([FromBody] AccountModel? modelo)
5454
public async Task<HttpReadOneResponse<AccountModel>> Read([FromQuery] int id, [FromHeader] string token)
5555
{
5656

57+
// Id es invalido.
5758
if (id <= 0)
5859
return new(Responses.InvalidParam);
5960

61+
// Información del token.
6062
var (isValid, _, user, orgId, _) = Jwt.Validate(token);
6163

64+
// Token es invalido.
6265
if (!isValid)
63-
{
6466
return new ReadOneResponse<AccountModel>()
6567
{
6668
Response = Responses.Unauthorized,
6769
Message = "Token invalido."
6870
};
69-
}
7071

71-
// Obtiene el usuario
72+
// Obtiene el usuario.
7273
var response = await Data.Accounts.Read(id, new()
7374
{
7475
ContextOrg = orgId,
@@ -83,8 +84,7 @@ public async Task<HttpReadOneResponse<AccountModel>> Read([FromQuery] int id, [F
8384
if (response.Response != Responses.Success)
8485
return new ReadOneResponse<AccountModel>()
8586
{
86-
Response = response.Response,
87-
Model = new()
87+
Response = response.Response
8888
};
8989

9090
// Retorna el resultado
@@ -103,23 +103,22 @@ public async Task<HttpReadOneResponse<AccountModel>> Read([FromQuery] int id, [F
103103
public async Task<HttpReadOneResponse<AccountModel>> Read([FromQuery] string user, [FromHeader] string token)
104104
{
105105

106+
// Usuario es invalido.
106107
if (string.IsNullOrWhiteSpace(user))
107108
return new(Responses.InvalidParam);
108109

109-
110+
// Información del token.
110111
var (isValid, _, userId, orgId, _) = Jwt.Validate(token);
111112

113+
// Token es invalido.
112114
if (!isValid)
113-
{
114-
return new ReadOneResponse<AccountModel>()
115+
return new()
115116
{
116117
Response = Responses.Unauthorized,
117118
Message = "Token invalido."
118119
};
119-
}
120-
121-
122120

121+
// Obtiene el usuario.
123122
var response = await Data.Accounts.Read(user, new()
124123
{
125124
ContextOrg = orgId,
@@ -129,8 +128,6 @@ public async Task<HttpReadOneResponse<AccountModel>> Read([FromQuery] string use
129128
OrgLevel = FilterModels.IncludeOrgLevel.Advance
130129
});
131130

132-
133-
134131
// Si es erróneo
135132
if (response.Response != Responses.Success)
136133
return new ReadOneResponse<AccountModel>()
@@ -164,13 +161,11 @@ public async Task<HttpReadAllResponse<AccountModel>> Search([FromQuery] string p
164161

165162
// Token es invalido
166163
if (!isValid)
167-
{
168164
return new ReadAllResponse<AccountModel>
169165
{
170166
Message = "Token es invalido",
171167
Response = Responses.Unauthorized
172168
};
173-
}
174169

175170
// Obtiene el usuario
176171
var response = await Data.Accounts.Search(pattern, new()
@@ -196,13 +191,17 @@ public async Task<HttpReadAllResponse<AccountModel>> Search([FromQuery] string p
196191
public async Task<HttpReadAllResponse<AccountModel>> ReadAll([FromBody] List<int> ids, [FromHeader] string token)
197192
{
198193

194+
// Información del token.
199195
var (isValid, _, userId, orgId, _) = Jwt.Validate(token);
200196

197+
// Es invalido.
201198
if (!isValid)
202-
{
203-
return new(Responses.Unauthorized);
204-
}
205-
199+
return new()
200+
{
201+
Response = Responses.Unauthorized,
202+
Message = "Token invalido."
203+
};
204+
206205
// Obtiene el usuario
207206
var response = await Data.Accounts.FindAll(ids, new()
208207
{
@@ -292,8 +291,10 @@ public async Task<HttpResponseBase> Update([FromBody] UpdatePasswordModel modelo
292291
public async Task<HttpResponseBase> Delete([FromHeader] string token)
293292
{
294293

294+
// Información del token.
295295
var (isValid, _, userId, _, _) = Jwt.Validate(token);
296296

297+
// Si es invalido.
297298
if (!isValid)
298299
return new ResponseBase
299300
{

LIN.Identity/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using LIN.Identity.Data;
2+
3+
24
{
35

46
LIN.Access.Logger.Logger.AppName = "LIN.IDENTITY";

0 commit comments

Comments
 (0)