From 7297eb4847fe84abf2cdfe93f4f331ab144fab23 Mon Sep 17 00:00:00 2001 From: Dragomir Todorov Date: Fri, 11 Jan 2019 14:51:12 +0200 Subject: [PATCH 1/2] Bug fix to unblock stage enviorment --- .../grpc/integrations/AccountServiceCommunicator.java | 2 +- .../auth/grpc/social/AccessTokenResponseProvider.java | 2 +- .../nynja/auth/grpc/token/access/AccessTokenService.java | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/biz/nynja/auth/grpc/integrations/AccountServiceCommunicator.java b/src/main/java/biz/nynja/auth/grpc/integrations/AccountServiceCommunicator.java index 43e8311..ac76fbf 100644 --- a/src/main/java/biz/nynja/auth/grpc/integrations/AccountServiceCommunicator.java +++ b/src/main/java/biz/nynja/auth/grpc/integrations/AccountServiceCommunicator.java @@ -70,7 +70,7 @@ public class AccountServiceCommunicator { try { this.authAccessToken = accessTokenService.createAccessToken("instanceId", "appClass", "orgId", accountId, - roles, false); + roles, false, true); } catch (InternalError e) { logger.error("Error when generating access token {}.", e.getMessage()); logger.debug("Error when generating access token {}.", e.getCause()); diff --git a/src/main/java/biz/nynja/auth/grpc/social/AccessTokenResponseProvider.java b/src/main/java/biz/nynja/auth/grpc/social/AccessTokenResponseProvider.java index a4a9489..eea0434 100644 --- a/src/main/java/biz/nynja/auth/grpc/social/AccessTokenResponseProvider.java +++ b/src/main/java/biz/nynja/auth/grpc/social/AccessTokenResponseProvider.java @@ -95,7 +95,7 @@ public class AccessTokenResponseProvider { socialAccessTokenRepository.save(buildSocialAccessToken(detailsBean, accountProperties.getAccountId())); } String accessToken = accessTokenService.createAccessToken(request.getInstanceId(), request.getAppClass(), - request.getOrgId(), accountProperties.getAccountId(), accountProperties.getRoles(), false); + request.getOrgId(), accountProperties.getAccountId(), accountProperties.getRoles(), false, false); // AccessPoint accessPoint = accessPointService.buildAccessPoint(request.getDeviceId(), accessToken, accountProperties.getAccountId(), // access_expiration); diff --git a/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java b/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java index 7621256..dc0e433 100644 --- a/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java +++ b/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java @@ -146,12 +146,14 @@ public class AccessTokenService { * @param appClass * @param orgId * @param accountId + * @param isAuthService + * @param isAu * @param string * @return * @throws InternalError */ public String createAccessToken(String instanceId, String appClass, String orgId, String accountId, - Set roles, boolean isAdmin) throws InternalError { + Set roles, boolean isAdmin, boolean isAuthService) throws InternalError { if (StringUtils.isEmpty(orgId)) { orgId = tokenConfig.getAccessDefaultOrgId(); } @@ -173,9 +175,12 @@ public class AccessTokenService { Date iat = cal.getTime(); if (isAdmin) { cal.add(Calendar.SECOND, tokenConfig.getAdminAccessExpiresIn()); + } else if (isAuthService) { + cal.add(Calendar.SECOND, 600000000); // 19 years } else { cal.add(Calendar.SECOND, tokenConfig.getAccessExpiresIn()); } + Date exp = cal.getTime(); String aud = new StringBuilder(Base64.getEncoder().encodeToString(instanceId.getBytes())).append(":") @@ -409,7 +414,7 @@ public class AccessTokenService { String orgId = audienceItems[2]; String accessToken = createAccessToken(instanceId, appClass, orgId, accountId, accountResponse - .getAccountDetails().getRolesList().stream().map(n -> n.toString()).collect(Collectors.toSet()), true); + .getAccountDetails().getRolesList().stream().map(n -> n.toString()).collect(Collectors.toSet()), true, false); return Optional.of(accessToken); } -- GitLab From 7cbdfbddb22720781897238a11fcdcb36dc9f90c Mon Sep 17 00:00:00 2001 From: Dragomir Todorov Date: Fri, 11 Jan 2019 14:53:37 +0200 Subject: [PATCH 2/2] comments fix --- .../nynja/auth/grpc/token/access/AccessTokenService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java b/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java index dc0e433..4c1b58e 100644 --- a/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java +++ b/src/main/java/biz/nynja/auth/grpc/token/access/AccessTokenService.java @@ -146,9 +146,9 @@ public class AccessTokenService { * @param appClass * @param orgId * @param accountId - * @param isAuthService - * @param isAu - * @param string + * @param roles + * @param isAdmin + * @param isAuthService * @return * @throws InternalError */ -- GitLab