From af30cb2b71e935d160585fd90c85e71a8ef30a60 Mon Sep 17 00:00:00 2001 From: Juan Gamez Date: Mon, 10 Dec 2018 16:10:51 -0600 Subject: [PATCH] Se ajusta exception de Authentication para que el usuario la pueda capturar en caso de que no se brinden credenciales correctas. --- .../Services/AcceptReject/SWAcceptRejectService.java | 2 +- .../Authentication/SWAuthenticationService.java | 2 +- .../BalanceAccount/SWBalanceAccountService.java | 2 +- .../Services/Cancelation/SWCancelationService.java | 2 +- src/main/java/Services/Issue/SWIssueService.java | 2 +- src/main/java/Services/Pdf/SWPdfService.java | 2 +- src/main/java/Services/Pendings/SWPendingsService.java | 2 +- .../java/Services/Relations/SWRelationsService.java | 2 +- src/main/java/Services/SWService.java | 10 +++++----- src/main/java/Services/Stamp/SWStampService.java | 4 ++-- src/main/java/Services/Validate/SWValidateService.java | 2 +- .../Authentication/SWAuthenticationServiceTest.java | 2 +- src/test/java/Tests/Stamp/SWStampServiceTest.java | 1 - .../java/Tests/StatusCfdi/StatusCfdiServiceTest.java | 2 +- 14 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/Services/AcceptReject/SWAcceptRejectService.java b/src/main/java/Services/AcceptReject/SWAcceptRejectService.java index db50c5a..f645bbd 100644 --- a/src/main/java/Services/AcceptReject/SWAcceptRejectService.java +++ b/src/main/java/Services/AcceptReject/SWAcceptRejectService.java @@ -13,7 +13,7 @@ import Utils.Responses.IResponse; public class SWAcceptRejectService extends SWService{ - public SWAcceptRejectService(String user, String password, String URI) { + public SWAcceptRejectService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/Authentication/SWAuthenticationService.java b/src/main/java/Services/Authentication/SWAuthenticationService.java index 1973f7e..ebaf374 100644 --- a/src/main/java/Services/Authentication/SWAuthenticationService.java +++ b/src/main/java/Services/Authentication/SWAuthenticationService.java @@ -10,7 +10,7 @@ import Utils.Responses.IResponse; public class SWAuthenticationService extends SWService { - public SWAuthenticationService(String user, String password, String URI) { + public SWAuthenticationService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/BalanceAccount/SWBalanceAccountService.java b/src/main/java/Services/BalanceAccount/SWBalanceAccountService.java index 2c884d4..55306f4 100644 --- a/src/main/java/Services/BalanceAccount/SWBalanceAccountService.java +++ b/src/main/java/Services/BalanceAccount/SWBalanceAccountService.java @@ -12,7 +12,7 @@ public class SWBalanceAccountService extends SWService { - public SWBalanceAccountService(String user, String password, String URI) { + public SWBalanceAccountService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/Cancelation/SWCancelationService.java b/src/main/java/Services/Cancelation/SWCancelationService.java index 3e2dbdd..9cfb671 100644 --- a/src/main/java/Services/Cancelation/SWCancelationService.java +++ b/src/main/java/Services/Cancelation/SWCancelationService.java @@ -13,7 +13,7 @@ public class SWCancelationService extends SWService { - public SWCancelationService(String user, String password, String URI) { + public SWCancelationService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/Issue/SWIssueService.java b/src/main/java/Services/Issue/SWIssueService.java index bebadf2..7ed3fec 100644 --- a/src/main/java/Services/Issue/SWIssueService.java +++ b/src/main/java/Services/Issue/SWIssueService.java @@ -12,7 +12,7 @@ public class SWIssueService extends SWService { - public SWIssueService(String user, String password, String URI) { + public SWIssueService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/Pdf/SWPdfService.java b/src/main/java/Services/Pdf/SWPdfService.java index 1acd150..8011215 100644 --- a/src/main/java/Services/Pdf/SWPdfService.java +++ b/src/main/java/Services/Pdf/SWPdfService.java @@ -12,7 +12,7 @@ public class SWPdfService extends SWService { - public SWPdfService(String user, String password, String URI) { + public SWPdfService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/Pendings/SWPendingsService.java b/src/main/java/Services/Pendings/SWPendingsService.java index 4f10b35..ff39393 100644 --- a/src/main/java/Services/Pendings/SWPendingsService.java +++ b/src/main/java/Services/Pendings/SWPendingsService.java @@ -12,7 +12,7 @@ import Utils.Responses.IResponse; public class SWPendingsService extends SWService{ - public SWPendingsService(String user, String password, String URI) { + public SWPendingsService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/Relations/SWRelationsService.java b/src/main/java/Services/Relations/SWRelationsService.java index 08f6ef2..8a2b4df 100644 --- a/src/main/java/Services/Relations/SWRelationsService.java +++ b/src/main/java/Services/Relations/SWRelationsService.java @@ -12,7 +12,7 @@ import Utils.Responses.IResponse; public class SWRelationsService extends SWService{ - public SWRelationsService(String user, String password, String URI) { + public SWRelationsService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/main/java/Services/SWService.java b/src/main/java/Services/SWService.java index 88d3dfa..fd05bee 100644 --- a/src/main/java/Services/SWService.java +++ b/src/main/java/Services/SWService.java @@ -36,18 +36,18 @@ public String getURI() { private String URI; - protected SWService(String user, String password, String URI) { + protected SWService(String user, String password, String URI) throws AuthException { User = user; Password = password; this.URI = URI; try { generateToken(); } catch (AuthException e) { - e.printStackTrace(); + throw new AuthException(e.getHttpStatusCode(), e.getErrorMSG()); } catch (GeneralException e) { - e.printStackTrace(); + throw new AuthException(e.getHttpStatusCode(), e.getErrorMSG()); } catch (IOException e) { - e.printStackTrace(); + throw new AuthException(99, e.getMessage()); } } @@ -75,7 +75,7 @@ public void setPassword(String password) { public void generateToken() throws AuthException, GeneralException, IOException { if (User == null || Password == null) { - throw new AuthException(400, "no existen elementos de autenticación"); + throw new AuthException(400, "no existen elementos de autenticación"); } AuthOptionsRequest settings = new AuthOptionsRequest(URI, getUser(), getPassword()); AuthRequest req = new AuthRequest(); diff --git a/src/main/java/Services/Stamp/SWStampService.java b/src/main/java/Services/Stamp/SWStampService.java index a138771..c87fa09 100644 --- a/src/main/java/Services/Stamp/SWStampService.java +++ b/src/main/java/Services/Stamp/SWStampService.java @@ -13,7 +13,7 @@ public class SWStampService extends SWService { - public SWStampService(String user, String password, String URI) { + public SWStampService(String user, String password, String URI) throws AuthException { super(user, password, URI); } @@ -40,7 +40,7 @@ public IResponse Stamp(String xml, String version, boolean isb64) } } - public IResponse Stamp(byte[] xmlFile, String version, boolean isb64) + public IResponse Stamp(byte[] xmlFile, String version, boolean isb64) throws AuthException, GeneralException, IOException { String xmlProcess = new String(xmlFile, Charset.forName("UTF-8")); StampOptionsRequest settings = new StampOptionsRequest(getToken(), getURI(), xmlProcess, version); diff --git a/src/main/java/Services/Validate/SWValidateService.java b/src/main/java/Services/Validate/SWValidateService.java index ac9c1e2..0a92be3 100644 --- a/src/main/java/Services/Validate/SWValidateService.java +++ b/src/main/java/Services/Validate/SWValidateService.java @@ -15,7 +15,7 @@ public class SWValidateService extends SWService { - public SWValidateService(String user, String password, String URI) { + public SWValidateService(String user, String password, String URI) throws AuthException { super(user, password, URI); } diff --git a/src/test/java/Tests/Authentication/SWAuthenticationServiceTest.java b/src/test/java/Tests/Authentication/SWAuthenticationServiceTest.java index 1e68a7a..3b7bc37 100644 --- a/src/test/java/Tests/Authentication/SWAuthenticationServiceTest.java +++ b/src/test/java/Tests/Authentication/SWAuthenticationServiceTest.java @@ -8,8 +8,8 @@ public class SWAuthenticationServiceTest extends TestCase { public void testAuth(){ - SWAuthenticationService auth = new SWAuthenticationService("demo","123456789","http://services.test.sw.com.mx"); try { + SWAuthenticationService auth = new SWAuthenticationService("demo","123456789","http://services.test.sw.com.mx"); SuccessAuthResponse res = (SuccessAuthResponse) auth.Token(); String expected = "success"; System.out.println(res.token); diff --git a/src/test/java/Tests/Stamp/SWStampServiceTest.java b/src/test/java/Tests/Stamp/SWStampServiceTest.java index 1117372..543cf01 100644 --- a/src/test/java/Tests/Stamp/SWStampServiceTest.java +++ b/src/test/java/Tests/Stamp/SWStampServiceTest.java @@ -615,7 +615,6 @@ public void testStampTOKEN_EXPIRES_NOT_USER_NOT_PASSWORD() throws Exception { Utils ut = new Utils(); response = api.Stamp(ut.StringgenBasico(),"v1"); - }catch (Exception e){ System.out.println(e.getMessage()); System.out.println("Something bad happened"); diff --git a/src/test/java/Tests/StatusCfdi/StatusCfdiServiceTest.java b/src/test/java/Tests/StatusCfdi/StatusCfdiServiceTest.java index fdec3d6..26c41f6 100644 --- a/src/test/java/Tests/StatusCfdi/StatusCfdiServiceTest.java +++ b/src/test/java/Tests/StatusCfdi/StatusCfdiServiceTest.java @@ -21,7 +21,7 @@ public void testStatusCancelationService_Real() throws Exception { Assert.assertTrue(expect_status.equalsIgnoreCase(response.Status)); } public void testStatusCancelationService_Test() throws Exception { - StatusCfdiService app = new StatusCfdiService("http://consultaqrfacturaelectronicatest.sw.com.mx/ConsultaCFDIService.svc", "http://tempuri.org/IConsultaCFDIService/Consulta"); + StatusCfdiService app = new StatusCfdiService("https://pruebacfdiconsultaqr.cloudapp.net/ConsultaCFDIService.svc", "http://tempuri.org/IConsultaCFDIService/Consulta"); StatusCfdiResponse response = null; response = (StatusCfdiResponse) app.StatusCfdi("LAN8507268IA", "LAN7008173R5", "5800.00", "6ab07bef-4446-43ea-a3fd-04a804309457"); System.out.println(response.Status);