Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: license validity period should be read only #731 #746

Merged
merged 3 commits into from
Feb 1, 2022
Merged

fix: license validity period should be read only #731 #746

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5132c63
Bug: license validity period should be read only #731
duttarnab Jan 28, 2022
fcbd53a
fix: license validity period should be read only #731
duttarnab Jan 31, 2022
164193c
fix: license validity period should be read only #731
duttarnab Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...plugin/src/main/java/io/jans/ca/plugin/adminui/service/license/LicenseDetailsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public Boolean checkLicense() {
License updatedLicense = auiConfiguration.getLicenseConfiguration()
.getLicenseManager()
.checkLicense(activeLicense);
return updatedLicense != null;
return updatedLicense != null && !activeLicense.getData().isExpired();
}
} catch (Exception e) {
log.error(ErrorResponse.CHECK_LICENSE_ERROR.getDescription(), e);
Expand All @@ -64,7 +64,7 @@ public Boolean activateLicense(LicenseRequest licenseRequest) {
ActivationLicense keyBased = ActivationLicense.fromKey(licenseRequest.getLicenseKey());
License license = licenseManager.activateLicense(keyBased);
log.debug("License activated : {} ", license.getProduct());
return true;
return !license.getData().isExpired();
} catch (Exception e) {
log.error(ErrorResponse.ACTIVATE_LICENSE_ERROR.getDescription(), e);
return false;
Expand Down