-- redirect a nuevos dominios SMS, VYA
This commit is contained in:
@@ -47,7 +47,7 @@ Partial Class LogIn
|
|||||||
ReturnUrl = Request("ReturnUrl").ToString()
|
ReturnUrl = Request("ReturnUrl").ToString()
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim strdomain = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "")
|
Dim strdomain As String = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "")
|
||||||
If Request.Url.Port <> 80 Then
|
If Request.Url.Port <> 80 Then
|
||||||
strdomain = strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
|
strdomain = strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
|
||||||
End If
|
End If
|
||||||
@@ -210,7 +210,7 @@ Partial Class LogIn
|
|||||||
Dim Usuario As Usuario = Nothing
|
Dim Usuario As Usuario = Nothing
|
||||||
'Dim UsuarioAsignaciones As Usuario = Nothing
|
'Dim UsuarioAsignaciones As Usuario = Nothing
|
||||||
|
|
||||||
Dim isgps = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper())
|
Dim isgps As Boolean = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper())
|
||||||
Usuario = ObjUsuario.ValidaUsuario(txtUsuario.Text, Encripta(TxtContraseña.Text.Trim), IMEI, CvePlataforma:=If(isgps, 3, -1))
|
Usuario = ObjUsuario.ValidaUsuario(txtUsuario.Text, Encripta(TxtContraseña.Text.Trim), IMEI, CvePlataforma:=If(isgps, 3, -1))
|
||||||
'UsuarioAsignaciones = ObjUsuario.ValidaUsuarioAsignacion(Usuario.CveUsuario, Usuario.CveEmpresa)
|
'UsuarioAsignaciones = ObjUsuario.ValidaUsuarioAsignacion(Usuario.CveUsuario, Usuario.CveEmpresa)
|
||||||
If Not isgps AndAlso Usuario IsNot Nothing AndAlso Usuario.CvePlataforma = 3 Then ' SI ES de la plataforma 3(GPS), no debe de entar por liga normal
|
If Not isgps AndAlso Usuario IsNot Nothing AndAlso Usuario.CvePlataforma = 3 Then ' SI ES de la plataforma 3(GPS), no debe de entar por liga normal
|
||||||
@@ -235,13 +235,15 @@ Partial Class LogIn
|
|||||||
If Request.Url.Host.ToUpper().Contains("ALATEL".ToUpper()) Then tcveEmpresa = 183
|
If Request.Url.Host.ToUpper().Contains("ALATEL".ToUpper()) Then tcveEmpresa = 183
|
||||||
If Request.Url.Host.ToUpper().Contains("SERVEC".ToUpper()) Then tcveEmpresa = 153
|
If Request.Url.Host.ToUpper().Contains("SERVEC".ToUpper()) Then tcveEmpresa = 153
|
||||||
If Request.Url.Host.ToUpper().Contains("EMD".ToUpper()) Then tcveEmpresa = 13
|
If Request.Url.Host.ToUpper().Contains("EMD".ToUpper()) Then tcveEmpresa = 13
|
||||||
|
If Request.Url.Host.ToUpper().Contains("SMS".ToUpper()) Then tcveEmpresa = 186
|
||||||
|
If Request.Url.Host.ToUpper().Contains("VYA".ToUpper()) Then tcveEmpresa = 188
|
||||||
Usuario.CveEmpresa = tcveEmpresa
|
Usuario.CveEmpresa = tcveEmpresa
|
||||||
End If
|
End If
|
||||||
CreaObjetoEmpresa(Usuario)
|
CreaObjetoEmpresa(Usuario)
|
||||||
ADSSessionConfig.sessionUser.MultipleEmpresa = True
|
ADSSessionConfig.sessionUser.MultipleEmpresa = True
|
||||||
|
|
||||||
Dim x As New ADSSessionObj(Usuario.CveUsuario, Usuario.CveEmpresa)
|
Dim x As New ADSSessionObj(Usuario.CveUsuario, Usuario.CveEmpresa)
|
||||||
Dim _sessionid = Encripta(String.Format("{0}|{1}", Usuario.CveUsuario, x.SessionID))
|
Dim _sessionid As String = Encripta(String.Format("{0}|{1}", Usuario.CveUsuario, x.SessionID))
|
||||||
ADSSessionConfig.SessionManager(OpcionSession.agregarSession, x)
|
ADSSessionConfig.SessionManager(OpcionSession.agregarSession, x)
|
||||||
|
|
||||||
If Usuario.CvePlataforma = 6 And Usuario.CveRol = 10 Then
|
If Usuario.CvePlataforma = 6 And Usuario.CveRol = 10 Then
|
||||||
@@ -281,7 +283,7 @@ Partial Class LogIn
|
|||||||
End Using
|
End Using
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim cookie = FormsAuthentication.GetAuthCookie(Usuario.CveUsuario.ToString, False)
|
Dim cookie As HttpCookie = FormsAuthentication.GetAuthCookie(Usuario.CveUsuario.ToString, False)
|
||||||
Response.Cookies.Add(cookie)
|
Response.Cookies.Add(cookie)
|
||||||
Dim routeangular As String
|
Dim routeangular As String
|
||||||
Dim puerto As String = ""
|
Dim puerto As String = ""
|
||||||
@@ -291,7 +293,7 @@ Partial Class LogIn
|
|||||||
Else
|
Else
|
||||||
puerto = String.Format(":{0}", 84)
|
puerto = String.Format(":{0}", 84)
|
||||||
End If
|
End If
|
||||||
Dim strdomain = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "")
|
Dim strdomain As String = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "")
|
||||||
If Request.Url.Port <> 80 Then
|
If Request.Url.Port <> 80 Then
|
||||||
strdomain = strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
|
strdomain = strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
|
||||||
End If
|
End If
|
||||||
@@ -323,7 +325,7 @@ Partial Class LogIn
|
|||||||
If Not IsNothing(Context.Session("UsuarioSIG")) Then
|
If Not IsNothing(Context.Session("UsuarioSIG")) Then
|
||||||
|
|
||||||
Dim usuario As Usuario = DirectCast(Context.Session("UsuarioSIG"), Usuario)
|
Dim usuario As Usuario = DirectCast(Context.Session("UsuarioSIG"), Usuario)
|
||||||
Dim tokenDescriptor = New Microsoft.IdentityModel.Tokens.SecurityTokenDescriptor With {
|
Dim tokenDescriptor As New Microsoft.IdentityModel.Tokens.SecurityTokenDescriptor With {
|
||||||
.Subject = New System.Security.Claims.ClaimsIdentity(New System.Security.Claims.Claim() {New System.Security.Claims.Claim("CvePlataforma", usuario.CvePlataforma.ToString()),
|
.Subject = New System.Security.Claims.ClaimsIdentity(New System.Security.Claims.Claim() {New System.Security.Claims.Claim("CvePlataforma", usuario.CvePlataforma.ToString()),
|
||||||
New System.Security.Claims.Claim("CveUsuario", usuario.CveUsuario.ToString()), New System.Security.Claims.Claim("CveEmpresa", usuario.CveEmpresa.ToString()),
|
New System.Security.Claims.Claim("CveUsuario", usuario.CveUsuario.ToString()), New System.Security.Claims.Claim("CveEmpresa", usuario.CveEmpresa.ToString()),
|
||||||
New System.Security.Claims.Claim("CveRol", usuario.CveRol.ToString()), New System.Security.Claims.Claim("Fecha", ClsPaginas.NowADS().ToLongDateString())}),
|
New System.Security.Claims.Claim("CveRol", usuario.CveRol.ToString()), New System.Security.Claims.Claim("Fecha", ClsPaginas.NowADS().ToLongDateString())}),
|
||||||
@@ -331,8 +333,8 @@ Partial Class LogIn
|
|||||||
.SigningCredentials = New Microsoft.IdentityModel.Tokens.SigningCredentials(
|
.SigningCredentials = New Microsoft.IdentityModel.Tokens.SigningCredentials(
|
||||||
New Microsoft.IdentityModel.Tokens.SymmetricSecurityKey(Encoding.ASCII.GetBytes("*_AsistenciaDesarrolloSistemas-SIGAPI_*17-06-2020")),
|
New Microsoft.IdentityModel.Tokens.SymmetricSecurityKey(Encoding.ASCII.GetBytes("*_AsistenciaDesarrolloSistemas-SIGAPI_*17-06-2020")),
|
||||||
Microsoft.IdentityModel.Tokens.SecurityAlgorithms.HmacSha256Signature)}
|
Microsoft.IdentityModel.Tokens.SecurityAlgorithms.HmacSha256Signature)}
|
||||||
Dim tokenHandler = New System.IdentityModel.Tokens.Jwt.JwtSecurityTokenHandler()
|
Dim tokenHandler As New System.IdentityModel.Tokens.Jwt.JwtSecurityTokenHandler()
|
||||||
Dim newtoken = tokenHandler.CreateToken(tokenDescriptor)
|
Dim newtoken As SecurityToken = tokenHandler.CreateToken(tokenDescriptor)
|
||||||
Dim stokenn As String = tokenHandler.WriteToken(newtoken)
|
Dim stokenn As String = tokenHandler.WriteToken(newtoken)
|
||||||
Return stokenn
|
Return stokenn
|
||||||
Else
|
Else
|
||||||
@@ -395,18 +397,16 @@ Partial Class LogIn
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Public Function GenerateJSONWebToken(ByVal user As UserModel) As String
|
Public Function GenerateJSONWebToken(ByVal user As UserModel) As String
|
||||||
Dim securityKey = New SymmetricSecurityKey(Encoding.UTF8.GetBytes("ThisismySecretKey"))
|
Dim securityKey As New SymmetricSecurityKey(Encoding.UTF8.GetBytes("ThisismySecretKey"))
|
||||||
Dim credentials = New SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256)
|
Dim credentials As New SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256)
|
||||||
Dim claims = {New Claim("Nombre", user.Nombre), New Claim("CveUsuario", user.CveUsuario.ToString()), New Claim("CveEmpresa", user.CveEmpresa.ToString()), New Claim("CvePerfil", user.CvePerfil.ToString()), New Claim("Mail", user.Mail.ToString())}
|
Dim claims As IEnumerable(Of Claim) = {New Claim("Nombre", user.Nombre), New Claim("CveUsuario", user.CveUsuario.ToString()), New Claim("CveEmpresa", user.CveEmpresa.ToString()), New Claim("CvePerfil", user.CvePerfil.ToString()), New Claim("Mail", user.Mail.ToString())}
|
||||||
Dim token = New JwtSecurityToken("Test.com", "Test.com", claims, expires:=ClsPaginas.NowADS().AddMinutes(120), signingCredentials:=credentials)
|
Dim token As New JwtSecurityToken("Test.com", "Test.com", claims, expires:=ClsPaginas.NowADS().AddMinutes(120), signingCredentials:=credentials)
|
||||||
Return New JwtSecurityTokenHandler().WriteToken(token)
|
Return New JwtSecurityTokenHandler().WriteToken(token)
|
||||||
End Function
|
End Function
|
||||||
Public Class UserModel
|
Public Class UserModel
|
||||||
Public Sub New()
|
Public Sub New()
|
||||||
Me.CveUsuario = -1
|
Me.CveUsuario = -1
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
||||||
Public Property CveUsuario As Integer
|
Public Property CveUsuario As Integer
|
||||||
Public Property Mail As String
|
Public Property Mail As String
|
||||||
Public Property Nombre As String
|
Public Property Nombre As String
|
||||||
|
|||||||
Reference in New Issue
Block a user