Skip to content

fix: serialize registration timestamps and client URI correctly #1131

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

Open
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −3
Open

fix: serialize registration timestamps and client URI correctly #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/appauth-registration-response.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-native-app-auth": patch
---

Convert Android dynamic-registration epoch seconds to milliseconds before date formatting. Return the iOS registrationClientUri as its absolute URL string rather than an NSURL object that cannot cross the JSON bridge.
6 changes: 4 additions & 2 deletions ...ative-app-auth/android/src/main/java/com/rnappauth/utils/RegistrationResponseFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import net.openid.appauth.RegistrationResponse;

import java.util.concurrent.TimeUnit;

public final class RegistrationResponseFactory {
/*
* Read raw registration response into a React Native map to be passed down the bridge
Expand All @@ -16,15 +18,15 @@ public static final WritableMap registrationResponseToMap(RegistrationResponse r
map.putMap("additionalParameters", MapUtil.createAdditionalParametersMap(response.additionalParameters));

if (response.clientIdIssuedAt != null) {
map.putString("clientIdIssuedAt", DateUtil.formatTimestamp(response.clientIdIssuedAt));
map.putString("clientIdIssuedAt", DateUtil.formatTimestamp(TimeUnit.SECONDS.toMillis(response.clientIdIssuedAt)));
}

if (response.clientSecret != null) {
map.putString("clientSecret", response.clientSecret);
}

if (response.clientSecretExpiresAt != null) {
map.putString("clientSecretExpiresAt", DateUtil.formatTimestamp(response.clientSecretExpiresAt));
map.putString("clientSecretExpiresAt", DateUtil.formatTimestamp(TimeUnit.SECONDS.toMillis(response.clientSecretExpiresAt)));
}

if (response.registrationAccessToken != null) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-app-auth/ios/RNAppAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ - (NSDictionary*)formatRegistrationResponse: (OIDRegistrationResponse*) response
@"clientSecret": response.clientSecret ? response.clientSecret : @"",
@"clientSecretExpiresAt": response.clientSecretExpiresAt ? [dateFormat stringFromDate:response.clientSecretExpiresAt] : @"",
@"registrationAccessToken": response.registrationAccessToken ? response.registrationAccessToken : @"",
@"registrationClientUri": response.registrationClientURI ? response.registrationClientURI : @"",
@"registrationClientUri": response.registrationClientURI ? response.registrationClientURI.absoluteString : @"",
@"tokenEndpointAuthMethod": response.tokenEndpointAuthenticationMethod ? response.tokenEndpointAuthenticationMethod : @"",
};
}
Expand Down