X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fapi%2FCreateCertificate.java;h=41556d131a88052a2652e6adfa6b9682a2bb512e;hb=b373422ceb172e10e2ff32c09141158529b3f48b;hp=6af284c032e19aedc93d6097aa8ee00a922f77b2;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git diff --git a/src/club/wpia/gigi/api/CreateCertificate.java b/src/club/wpia/gigi/api/CreateCertificate.java index 6af284c0..41556d13 100644 --- a/src/club/wpia/gigi/api/CreateCertificate.java +++ b/src/club/wpia/gigi/api/CreateCertificate.java @@ -9,11 +9,11 @@ import javax.servlet.http.HttpServletResponse; import club.wpia.gigi.GigiApiException; import club.wpia.gigi.dbObjects.Certificate; +import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; import club.wpia.gigi.dbObjects.CertificateProfile; import club.wpia.gigi.dbObjects.Job; import club.wpia.gigi.dbObjects.Organisation; import club.wpia.gigi.dbObjects.User; -import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; import club.wpia.gigi.pages.account.certs.CertificateRequest; import club.wpia.gigi.util.AuthorizationContext; import club.wpia.gigi.util.CertExporter; @@ -38,7 +38,7 @@ public class CreateCertificate extends APIPoint { return; } } - AuthorizationContext ctx = new AuthorizationContext(u, u); + AuthorizationContext ctx = new AuthorizationContext(u, u, true); String asOrg = req.getParameter("asOrg"); if (asOrg != null) { try { @@ -54,7 +54,7 @@ public class CreateCertificate extends APIPoint { resp.sendError(500, "Error, Organisation with id " + i + " not found."); return; } else { - ctx = new AuthorizationContext(o0, u); + ctx = new AuthorizationContext(o0, u, true); } } catch (NumberFormatException e) { resp.sendError(500, "Error, as Org is not an integer"); @@ -65,7 +65,7 @@ public class CreateCertificate extends APIPoint { CertificateRequest cr = new CertificateRequest(ctx, csr, cp); Certificate result = cr.draft(); Job job = result.issue(null, "2y", u); - job.waitFor(60000); + job.waitFor(Job.WAIT_MIN); if (result.getStatus() != CertificateStatus.ISSUED) { resp.sendError(510, "Error, issuing timed out"); return;