Se ajusta exception de Authentication para que el usuario la pueda ca…

…pturar en caso de que no se brinden credenciales correctas.
lunasoft · Dec 10, 2018 · af30cb2 · af30cb2
1 parent 354a314
commit af30cb2
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);