From 2411a373e1330aa57391cd086fa0e2670891dcca Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 23 Aug 2023 19:27:06 +0200 Subject: [PATCH 1/3] compatibility --- MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h | 1 + MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m | 3 +++ 2 files changed, 4 insertions(+) diff --git a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h index 6fbfe1e965..247fd8aece 100644 --- a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h +++ b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h @@ -31,6 +31,7 @@ extern NSString *const MXLoginSSOFlowIdentityProvidersKey; List of all SSO Identity Providers supported */ @property (nonatomic, readonly) NSArray *identityProviders; +@property (atomic, readonly) BOOL isOIDC; @end diff --git a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m index cf6cae656c..f88151d9ef 100644 --- a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m +++ b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m @@ -17,10 +17,12 @@ #import "MXLoginSSOFlow.h" NSString *const MXLoginSSOFlowIdentityProvidersKey = @"identity_providers"; +NSString *const MXLoginSSOFlowDelegatedOIDCCompatibilityKey = @"org.matrix.msc3824.delegated_oidc_compatibility"; @interface MXLoginSSOFlow() @property (nonatomic, readwrite) NSArray *identityProviders; +@property (atomic, readwrite) BOOL isOIDC; @end @@ -50,6 +52,7 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary loginFlow.identityProviders = identityProviders; + MXJSONModelSetBoolean(loginFlow.isOIDC, JSONDictionary[MXLoginSSOFlowDelegatedOIDCCompatibilityKey]); } return loginFlow; From d70e4c4e3766e267ccd7f2fa6e6e11d36278046f Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 23 Aug 2023 19:28:50 +0200 Subject: [PATCH 2/3] changelog --- changelog.d/pr-1811.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-1811.feature diff --git a/changelog.d/pr-1811.feature b/changelog.d/pr-1811.feature new file mode 100644 index 0000000000..a2a36f75bd --- /dev/null +++ b/changelog.d/pr-1811.feature @@ -0,0 +1 @@ +Delegate OIDC compatibility flag added. \ No newline at end of file From 9964bfe9a078584806fe8a9e47a4ff6693017764 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 23 Aug 2023 19:46:41 +0200 Subject: [PATCH 3/3] renaming --- MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h | 2 +- MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h index 247fd8aece..2aec96d6a2 100644 --- a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h +++ b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.h @@ -31,7 +31,7 @@ extern NSString *const MXLoginSSOFlowIdentityProvidersKey; List of all SSO Identity Providers supported */ @property (nonatomic, readonly) NSArray *identityProviders; -@property (atomic, readonly) BOOL isOIDC; +@property (atomic, readonly) BOOL delegatedOIDCCompatibility; @end diff --git a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m index f88151d9ef..95083abb8a 100644 --- a/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m +++ b/MatrixSDK/JSONModels/Login/MXLoginSSOFlow.m @@ -22,7 +22,7 @@ @interface MXLoginSSOFlow() @property (nonatomic, readwrite) NSArray *identityProviders; -@property (atomic, readwrite) BOOL isOIDC; +@property (atomic, readwrite) BOOL delegatedOIDCCompatibility; @end @@ -52,7 +52,7 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary loginFlow.identityProviders = identityProviders; - MXJSONModelSetBoolean(loginFlow.isOIDC, JSONDictionary[MXLoginSSOFlowDelegatedOIDCCompatibilityKey]); + MXJSONModelSetBoolean(loginFlow.delegatedOIDCCompatibility, JSONDictionary[MXLoginSSOFlowDelegatedOIDCCompatibilityKey]); } return loginFlow;