From d01becaa21e08b19b765daa9792afe97e6265473 Mon Sep 17 00:00:00 2001 From: Akshat Gandhi <54901287+AkshatG6@users.noreply.github.com> Date: Thu, 23 Jul 2026 15:32:01 -0700 Subject: [PATCH 1/2] Fix crash in additionalTokenRefreshParameters when emmSupport is nil --- GoogleSignIn/Sources/GIDEMMSupport.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleSignIn/Sources/GIDEMMSupport.m b/GoogleSignIn/Sources/GIDEMMSupport.m index 0914d841..e812c0e3 100644 --- a/GoogleSignIn/Sources/GIDEMMSupport.m +++ b/GoogleSignIn/Sources/GIDEMMSupport.m @@ -95,7 +95,7 @@ + (void)handleTokenFetchEMMError:(nullable NSError *)error emmSupport:(nullable NSString *)emmSupport isPasscodeInfoRequired:(BOOL)isPasscodeInfoRequired { if (!emmSupport) { - return parameters; + return [GIDEMMSupport dictionaryWithStringValuesFromDictionary:parameters]; } NSMutableDictionary *allParameters = [(parameters ?: @{}) mutableCopy]; allParameters[kEMMSupportParameterName] = emmSupport; From c233c8439ad54dfb9f0016bdbd66e9fa5a36f041 Mon Sep 17 00:00:00 2001 From: Akshat Gandhi <54901287+AkshatG6@users.noreply.github.com> Date: Mon, 27 Jul 2026 13:42:18 -0700 Subject: [PATCH 2/2] Added comment to GIDEMMSupport header file --- GoogleSignIn/Sources/GIDEMMSupport.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GoogleSignIn/Sources/GIDEMMSupport.h b/GoogleSignIn/Sources/GIDEMMSupport.h index 61f445a4..7a5de88f 100644 --- a/GoogleSignIn/Sources/GIDEMMSupport.h +++ b/GoogleSignIn/Sources/GIDEMMSupport.h @@ -38,6 +38,8 @@ NS_ASSUME_NONNULL_BEGIN (NSDictionary *)parameters; /// Gets a new set of URL parameters that also contains EMM-related URL parameters if needed. +/// +/// @note This function only returns parameter keys in the `NSDictionary` for string/number/bools. + (NSDictionary *)parametersWithParameters:(NSDictionary *)parameters emmSupport:(nullable NSString *)emmSupport isPasscodeInfoRequired:(BOOL)isPasscodeInfoRequired;