Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Conversion logic for expires in field (#12781)

Browse Source
This commit is contained in:
Nidhi 2022-04-11 16:57:24 +05:30 committed by GitHub
parent 6e63290477
commit e36b352a42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2AuthorizationCode.java vendored
View File

@ -142,9 +142,9 @@ public class OAuth2AuthorizationCode extends APIConnection implements UpdatableC
Object expiresInResponse = mappedResponse.get(Authentication.EXPIRES_IN); Object expiresInResponse = mappedResponse.get(Authentication.EXPIRES_IN);
Instant expiresAt = null; Instant expiresAt = null;
if (expiresAtResponse != null) { if (expiresAtResponse != null) {
expiresAt = Instant.ofEpochSecond(Long.valueOf((Integer) expiresAtResponse)); expiresAt = Instant.ofEpochSecond(Long.parseLong(String.valueOf(expiresAtResponse)));
} else if (expiresInResponse != null) { } else if (expiresInResponse != null) {
expiresAt = issuedAt.plusSeconds(Long.valueOf((Integer) expiresInResponse)); expiresAt = issuedAt.plusSeconds(Long.parseLong(String.valueOf(expiresInResponse)));
} }
authenticationResponse.setExpiresAt(expiresAt); authenticationResponse.setExpiresAt(expiresAt);
authenticationResponse.setIssuedAt(issuedAt); authenticationResponse.setIssuedAt(issuedAt);

4
app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/connections/OAuth2ClientCredentials.java vendored
View File

@ -111,9 +111,9 @@ public class OAuth2ClientCredentials extends APIConnection implements UpdatableC
Object expiresInResponse = mappedResponse.get(Authentication.EXPIRES_IN); Object expiresInResponse = mappedResponse.get(Authentication.EXPIRES_IN);
Instant expiresAt = null; Instant expiresAt = null;
if (expiresAtResponse != null) { if (expiresAtResponse != null) {
expiresAt = Instant.ofEpochSecond(Long.parseLong((String) expiresAtResponse)); expiresAt = Instant.ofEpochSecond(Long.parseLong(String.valueOf(expiresAtResponse)));
} else if (expiresInResponse != null) { } else if (expiresInResponse != null) {
expiresAt = issuedAt.plusSeconds(Long.valueOf((Integer) expiresInResponse)); expiresAt = issuedAt.plusSeconds(Long.parseLong(String.valueOf(expiresInResponse)));
} }
authenticationResponse.setExpiresAt(expiresAt); authenticationResponse.setExpiresAt(expiresAt);
authenticationResponse.setIssuedAt(issuedAt); authenticationResponse.setIssuedAt(issuedAt);

4
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
View File

@ -230,9 +230,9 @@ public class AuthenticationServiceCEImpl implements AuthenticationServiceCE {
Object expiresInResponse = response.get(Authentication.EXPIRES_IN); Object expiresInResponse = response.get(Authentication.EXPIRES_IN);
Instant expiresAt = null; Instant expiresAt = null;
if (expiresAtResponse != null) { if (expiresAtResponse != null) {
expiresAt = Instant.ofEpochSecond(Long.valueOf((Integer) expiresAtResponse)); expiresAt = Instant.ofEpochSecond(Long.parseLong(String.valueOf(expiresAtResponse)));
} else if (expiresInResponse != null) { } else if (expiresInResponse != null) {
expiresAt = issuedAt.plusSeconds(Long.parseLong((String) expiresInResponse)); expiresAt = issuedAt.plusSeconds(Long.parseLong(String.valueOf(expiresInResponse)));
} }
authenticationResponse.setExpiresAt(expiresAt); authenticationResponse.setExpiresAt(expiresAt);
// Replacing with returned scope instead // Replacing with returned scope instead