From 4ef79e219c289697eec0c2d100c8af1a5d0889b6 Mon Sep 17 00:00:00 2001
From: Hivert Quentin <quentin.hivert.fr@gmail.com>
Date: Mon, 28 Jul 2025 16:08:17 +0200
Subject: [PATCH] fix(openid): correcly type userTokenInterval

---
 SoObjects/SOGo/SOGoOpenIdSession.h  |  1 -
 SoObjects/SOGo/SOGoOpenIdSession.m  | 12 +++++++-----
 SoObjects/SOGo/SOGoSystemDefaults.h |  1 -
 SoObjects/SOGo/SOGoSystemDefaults.m |  9 ---------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/SoObjects/SOGo/SOGoOpenIdSession.h b/SoObjects/SOGo/SOGoOpenIdSession.h
index fd9d848bc..3e6f65a0c 100644
--- a/SoObjects/SOGo/SOGoOpenIdSession.h
+++ b/SoObjects/SOGo/SOGoOpenIdSession.h
@@ -66,7 +66,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer);
   NSString *openIdClient;
   NSString *openIdClientSecret;
   NSString *openIdEmailParam;
-  NSString *openIdHttpVersion;
   BOOL openIdEnableRefreshToken;
   BOOL sendDomainInfo;
 
diff --git a/SoObjects/SOGo/SOGoOpenIdSession.m b/SoObjects/SOGo/SOGoOpenIdSession.m
index b81b26dea..0f658214d 100644
--- a/SoObjects/SOGo/SOGoOpenIdSession.m
+++ b/SoObjects/SOGo/SOGoOpenIdSession.m
@@ -151,7 +151,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
 - (void) initializeWithConfig: (NSDictionary *) _config
 {
   SOGoSystemDefaults *sd;
-  id refreshTokenBool, domainInfo;
+  id refreshTokenBool, domainInfo, intForKey;
 
   if([_config objectForKey: @"SOGoOpenIdConfigUrl"] &&
       [_config objectForKey: @"SOGoOpenIdScope"] &&
@@ -163,7 +163,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
     openIdClient             = [_config objectForKey: @"SOGoOpenIdClient"];
     openIdClientSecret       = [_config objectForKey: @"SOGoOpenIdClientSecret"];
     openIdEmailParam         = [_config objectForKey: @"SOGoOpenIdEmailParam"];
-    openIdHttpVersion        = [_config objectForKey: @"SOGoOpenIdHttpVersion"];
 
     openIdEnableRefreshToken = NO;
     refreshTokenBool = [_config objectForKey: @"SOGoOpenIdEnableRefreshToken"];
@@ -175,8 +174,12 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
     if (domainInfo && [domainInfo respondsToSelector: @selector (boolValue)])
         sendDomainInfo = [domainInfo boolValue];
 
-      
-    userTokenInterval        = [_config objectForKey: @"SOGoOpenIdTokenCheckInterval"];
+    intForKey = [_config objectForKey: @"SOGoOpenIdTokenCheckInterval"];
+    if (intForKey && [intForKey respondsToSelector: @selector (intValue)])
+          userTokenInterval = [intForKey intValue];
+    else
+      userTokenInterval = 0;
+
     [self _loadSessionFromCache: forDomain];
 
     if(cacheUpdateNeeded)
@@ -222,7 +225,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
     openIdClient             = [sd openIdClient];
     openIdClientSecret       = [sd openIdClientSecret];
     openIdEmailParam         = [sd openIdEmailParam];
-    openIdHttpVersion        = [sd openIdHttpVersion];
     openIdEnableRefreshToken = [sd openIdEnableRefreshToken];
     userTokenInterval        = [sd openIdTokenCheckInterval];
     sendDomainInfo           = [sd openIdSendDomainInfo];
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 671ba294e..a7e29c82c 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -107,7 +107,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context);
 - (NSString *) openIdClient;
 - (NSString *) openIdClientSecret;
 - (NSString *) openIdEmailParam;
-- (NSString *) openIdHttpVersion;
 - (BOOL) openIdEnableRefreshToken;
 - (BOOL) openIdLogoutEnabled: (NSString *) _domain;
 - (int) openIdTokenCheckInterval;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 38fdc5b85..abca1d906 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -784,15 +784,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context)
   return emailParam;
 }
 
-- (NSString *) openIdHttpVersion
-{
-  NSString *httpVersion;
-  httpVersion = [self stringForKey: @"SOGoOpenIdHttpVersion"];
-  if(!httpVersion)
-    httpVersion = @"HTTP/1.1";
-  return httpVersion;
-}
-
 - (BOOL) openIdLogoutEnabled: (NSString *) _domain
 {
   if(_domain && [self doesLoginTypeByDomain])