Skip to content
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

Jump to bottom

Support identity server v2 API #712

Merged
merged 20 commits into from
Aug 30, 2019
Merged

Support identity server v2 API #712

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a8e4283
Create MXIdentityServerRestClient, that makes requests to Matrix iden…
SBiOSoftWhare Aug 21, 2019
4443042
Create MXIdentityService that manages requests to Matrix identity ser…
SBiOSoftWhare Aug 21, 2019
47938f8
MXRestClient: Remove identity server requests.
SBiOSoftWhare Aug 21, 2019
9538385
MXAutoDiscovery : Use MXIdentityService to validate identity server.
SBiOSoftWhare Aug 21, 2019
fc08d5c
MXSession: Add an MXIdentityService property to make identity server …
SBiOSoftWhare Aug 21, 2019
f4a70c9
MXServiceTerms: Fix access token issue.
SBiOSoftWhare Aug 21, 2019
965e5f3
Update pbxproj
SBiOSoftWhare Aug 21, 2019
91fc498
Update changes
SBiOSoftWhare Aug 21, 2019
647b709
Merge pull request #706 from matrix-org/riot_2647
SBiOSoftWhare Aug 21, 2019
f616a13
MXHTTPClient: Add access token renewal plus request retry mechanism.
SBiOSoftWhare Aug 30, 2019
9a56bbc
MXIdentityServerRestClient: Handle identity server v2 API authentific…
SBiOSoftWhare Aug 30, 2019
cc59a34
MXIdentityService: Handle identity server v2 API authentification and…
SBiOSoftWhare Aug 30, 2019
66b4ac2
MXAutoDiscovery: Update MXIdentityService allocation.
SBiOSoftWhare Aug 30, 2019
148cebc
MXSession: Create MXIdentityService on init.
SBiOSoftWhare Aug 30, 2019
82899a8
Update pbxproj
SBiOSoftWhare Aug 30, 2019
0c575b9
Update changes
SBiOSoftWhare Aug 30, 2019
bef04c3
MXIdentityService: Improve API path check.
SBiOSoftWhare Aug 30, 2019
ebb6ba5
MXSession: Improve missing identity service error management.
SBiOSoftWhare Aug 30, 2019
e1b8cad
MXSession: Improve missing identity service error management.
SBiOSoftWhare Aug 30, 2019
da1b83d
Merge branch 'privacy' into identity_server_v2
SBiOSoftWhare Aug 30, 2019
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
8 changes: 7 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ Changes in Matrix iOS SDK in 0.13.2 (2019-08-)

Improvements:
* MXServiceTerms: A class to support MSC2140 (Terms of Service API) (vector-im/riot-ios#2600).
* MXRestClient: Remove Identity Server URL fallback to homeserver one's when there is no Identity Server configured.
* MXRestClient: Remove identity server URL fallback to homeserver one's when there is no Identity Server configured.
* Create MXIdentityServerRestClient and MXIdentityService to manage identity server requests (vector-im/riot-ios#2647).
* MXHTTPClient: Add access token renewal plus request retry mechanism.
* MXIdentityService: Support identity server v2 API. Handle identity server v2 API authentification and use the hashed v2 lookup API for 3PIDs (vector-im/riot-ios#2603 and /vector-im/riot-ios#2652).

API break:
* MXRestClient: Remove identity server requests. Now MXIdentityService is used to perform identity server requests.

Changes in Matrix iOS SDK in 0.13.1 (2019-08-08)
===============================================
Expand Down
49 changes: 49 additions & 0 deletions MatrixSDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,12 @@
B10AFB4422A970060092E6AF /* MXEventReplace.m in Sources */ = {isa = PBXBuildFile; fileRef = B10AFB4222A970060092E6AF /* MXEventReplace.m */; };
B10AFB4722AA8A8E0092E6AF /* MXEventEditsListener.h in Headers */ = {isa = PBXBuildFile; fileRef = B10AFB4522AA8A8D0092E6AF /* MXEventEditsListener.h */; };
B10AFB4822AA8A8E0092E6AF /* MXEventEditsListener.m in Sources */ = {isa = PBXBuildFile; fileRef = B10AFB4622AA8A8D0092E6AF /* MXEventEditsListener.m */; };
B1136962230AC9D900E2B2FA /* MXIdentityService.h in Headers */ = {isa = PBXBuildFile; fileRef = B113695E230AC9D900E2B2FA /* MXIdentityService.h */; settings = {ATTRIBUTES = (Public, ); }; };
B1136963230AC9D900E2B2FA /* MXIdentityServerRestClient.h in Headers */ = {isa = PBXBuildFile; fileRef = B113695F230AC9D900E2B2FA /* MXIdentityServerRestClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
B1136964230AC9D900E2B2FA /* MXIdentityServerRestClient.m in Sources */ = {isa = PBXBuildFile; fileRef = B1136960230AC9D900E2B2FA /* MXIdentityServerRestClient.m */; };
B1136965230AC9D900E2B2FA /* MXIdentityService.m in Sources */ = {isa = PBXBuildFile; fileRef = B1136961230AC9D900E2B2FA /* MXIdentityService.m */; };
B1136967230C1E8600E2B2FA /* MXIdentityService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1136966230C1E8600E2B2FA /* MXIdentityService.swift */; };
B11556EE230C45C600B2A2CF /* MXIdentityServerRestClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11556ED230C45C600B2A2CF /* MXIdentityServerRestClient.swift */; };
B11BD44822CB56790064D8B0 /* MXReplyEventParser.h in Headers */ = {isa = PBXBuildFile; fileRef = B11BD44622CB56790064D8B0 /* MXReplyEventParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
B11BD44922CB56790064D8B0 /* MXReplyEventParser.m in Sources */ = {isa = PBXBuildFile; fileRef = B11BD44722CB56790064D8B0 /* MXReplyEventParser.m */; };
B11BD44C22CB56E80064D8B0 /* MXReplyEventParts.h in Headers */ = {isa = PBXBuildFile; fileRef = B11BD44A22CB56E80064D8B0 /* MXReplyEventParts.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -419,6 +425,8 @@
B17982FB2119E4A2001FD722 /* MXRoomPredecessorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = B17982F32119E4A1001FD722 /* MXRoomPredecessorInfo.m */; };
B17982FC2119E4A2001FD722 /* MXRoomPowerLevels.m in Sources */ = {isa = PBXBuildFile; fileRef = B17982F42119E4A2001FD722 /* MXRoomPowerLevels.m */; };
B1798304211B3649001FD722 /* MXRoomSummary.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1798303211B3649001FD722 /* MXRoomSummary.swift */; };
B182B08723167A640057972E /* MXIdentityServerHashDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = B182B08523167A640057972E /* MXIdentityServerHashDetails.h */; settings = {ATTRIBUTES = (Public, ); }; };
B182B08823167A640057972E /* MXIdentityServerHashDetails.m in Sources */ = {isa = PBXBuildFile; fileRef = B182B08623167A640057972E /* MXIdentityServerHashDetails.m */; };
B18D18C22152B8E4003677D1 /* MXRoomMember.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18D18C12152B8E4003677D1 /* MXRoomMember.swift */; };
C60165381E3AA57900B92CFA /* MXSDKOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = F0C34CB91C18C80000C36F09 /* MXSDKOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
C602B58C1F2268F700B67D87 /* MXRoom.swift in Sources */ = {isa = PBXBuildFile; fileRef = C602B58B1F2268F700B67D87 /* MXRoom.swift */; };
Expand Down Expand Up @@ -852,6 +860,12 @@
B10AFB4222A970060092E6AF /* MXEventReplace.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXEventReplace.m; sourceTree = "<group>"; };
B10AFB4522AA8A8D0092E6AF /* MXEventEditsListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXEventEditsListener.h; sourceTree = "<group>"; };
B10AFB4622AA8A8D0092E6AF /* MXEventEditsListener.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXEventEditsListener.m; sourceTree = "<group>"; };
B113695E230AC9D900E2B2FA /* MXIdentityService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXIdentityService.h; sourceTree = "<group>"; };
B113695F230AC9D900E2B2FA /* MXIdentityServerRestClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXIdentityServerRestClient.h; sourceTree = "<group>"; };
B1136960230AC9D900E2B2FA /* MXIdentityServerRestClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXIdentityServerRestClient.m; sourceTree = "<group>"; };
B1136961230AC9D900E2B2FA /* MXIdentityService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXIdentityService.m; sourceTree = "<group>"; };
B1136966230C1E8600E2B2FA /* MXIdentityService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXIdentityService.swift; sourceTree = "<group>"; };
B11556ED230C45C600B2A2CF /* MXIdentityServerRestClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXIdentityServerRestClient.swift; sourceTree = "<group>"; };
B11BD44622CB56790064D8B0 /* MXReplyEventParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXReplyEventParser.h; sourceTree = "<group>"; };
B11BD44722CB56790064D8B0 /* MXReplyEventParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXReplyEventParser.m; sourceTree = "<group>"; };
B11BD44A22CB56E80064D8B0 /* MXReplyEventParts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXReplyEventParts.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -907,6 +921,8 @@
B17982F32119E4A1001FD722 /* MXRoomPredecessorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXRoomPredecessorInfo.m; sourceTree = "<group>"; };
B17982F42119E4A2001FD722 /* MXRoomPowerLevels.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXRoomPowerLevels.m; sourceTree = "<group>"; };
B1798303211B3649001FD722 /* MXRoomSummary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXRoomSummary.swift; sourceTree = "<group>"; };
B182B08523167A640057972E /* MXIdentityServerHashDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXIdentityServerHashDetails.h; sourceTree = "<group>"; };
B182B08623167A640057972E /* MXIdentityServerHashDetails.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXIdentityServerHashDetails.m; sourceTree = "<group>"; };
B18D18C12152B8E4003677D1 /* MXRoomMember.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXRoomMember.swift; sourceTree = "<group>"; };
B1F1AE550CF4C15B653DDE6E /* Pods-MatrixSDKTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MatrixSDKTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MatrixSDKTests/Pods-MatrixSDKTests.debug.xcconfig"; sourceTree = "<group>"; };
C602B58B1F2268F700B67D87 /* MXRoom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MXRoom.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1459,6 +1475,7 @@
3275FD9121A6B46600B9C13D /* Authentication */,
327E9AB9228451E500A98BC1 /* Event */,
32999DDC22DCD139004FF987 /* Push */,
B182B08423167A1C0057972E /* IdentityServer */,
3281E8B319E42DFE00976E1A /* MXJSONModel.h */,
3281E8B419E42DFE00976E1A /* MXJSONModel.m */,
3281E8B519E42DFE00976E1A /* MXJSONModels.h */,
Expand Down Expand Up @@ -1652,6 +1669,7 @@
3245A74B1AF7B2930001D8A7 /* VoIP */,
32A151581DB5254D00400192 /* Lib */,
C6F935791E5B390D00FC34BF /* Contrib */,
B113695D230AC9D900E2B2FA /* IdentityServer */,
32C6F93219DD814400EA4E9C /* MatrixSDK.h */,
C61A4CC31E5F38CB00442158 /* SwiftMatrixSDK.h */,
320DFDD419DD99B60068622A /* MXRestClient.h */,
Expand Down Expand Up @@ -1827,6 +1845,17 @@
name = Frameworks;
sourceTree = "<group>";
};
B113695D230AC9D900E2B2FA /* IdentityServer */ = {
isa = PBXGroup;
children = (
B113695E230AC9D900E2B2FA /* MXIdentityService.h */,
B1136961230AC9D900E2B2FA /* MXIdentityService.m */,
B113695F230AC9D900E2B2FA /* MXIdentityServerRestClient.h */,
B1136960230AC9D900E2B2FA /* MXIdentityServerRestClient.m */,
);
path = IdentityServer;
sourceTree = "<group>";
};
B11BD45122CB57BD0064D8B0 /* ReplyEvent */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1922,6 +1951,16 @@
path = Event;
sourceTree = "<group>";
};
B182B08423167A1C0057972E /* IdentityServer */ = {
isa = PBXGroup;
children = (
B182B08523167A640057972E /* MXIdentityServerHashDetails.h */,
B182B08623167A640057972E /* MXIdentityServerHashDetails.m */,
);
name = IdentityServer;
path = MatrixSDK/JSONModels/IdentityServer;
sourceTree = SOURCE_ROOT;
};
C6F935791E5B390D00FC34BF /* Contrib */ = {
isa = PBXGroup;
children = (
Expand All @@ -1937,6 +1976,8 @@
C6F935851E5B3BE600FC34BF /* JSONModels */,
C6F9357E1E5B3ACA00FC34BF /* MXResponse.swift */,
C6F9357B1E5B39CA00FC34BF /* MXRestClient.swift */,
B1136966230C1E8600E2B2FA /* MXIdentityService.swift */,
B11556ED230C45C600B2A2CF /* MXIdentityServerRestClient.swift */,
C6D5D60D1E4FBD2900706C0F /* MXSession.swift */,
C6D5D6091E4FA74000706C0F /* MXEnumConstants.swift */,
C602B58D1F22A8D700B67D87 /* MXImage.swift */,
Expand Down Expand Up @@ -2104,6 +2145,7 @@
F03EF5081DF071D5009DF592 /* MXEncryptedAttachments.h in Headers */,
320BBF421D6C81550079890E /* MXEventsByTypesEnumeratorOnArray.h in Headers */,
3252DCB6224BEA610032264F /* MXDeviceVerificationTransaction.h in Headers */,
B182B08723167A640057972E /* MXIdentityServerHashDetails.h in Headers */,
3271877B1DA7CAA60071C818 /* MXEncrypting.h in Headers */,
B146D50221A5C6D700D8C2C6 /* MXScanManager.h in Headers */,
32A31BC420D3FFB0005916C7 /* MXFilter.h in Headers */,
Expand All @@ -2116,6 +2158,7 @@
C61A4CC41E5F38CB00442158 /* SwiftMatrixSDK.h in Headers */,
321CFDFF2254E8C4004D31DF /* MXEmojiRepresentation.h in Headers */,
324BE4681E3FADB1008D99D4 /* MXMegolmExportEncryption.h in Headers */,
B1136963230AC9D900E2B2FA /* MXIdentityServerRestClient.h in Headers */,
32CAB10B1A925B41008C5BB9 /* MXHTTPOperation.h in Headers */,
3275FD9521A6B46600B9C13D /* MXLoginTerms.h in Headers */,
32F945F81FAB83D900622468 /* MXIncomingRoomKeyRequestCancellation.h in Headers */,
Expand Down Expand Up @@ -2177,6 +2220,7 @@
32C235721F827F3800E38FC5 /* MXRoomOperation.h in Headers */,
71DE22E11BC7C51200284153 /* MXReceiptData.h in Headers */,
327E9AD62284803100A98BC1 /* MXEventAnnotation.h in Headers */,
B1136962230AC9D900E2B2FA /* MXIdentityService.h in Headers */,
9274AFE81EE580240009BEB6 /* MXCallKitAdapter.h in Headers */,
321CFDE622525A49004D31DF /* MXSASTransaction.h in Headers */,
32DC15D01A8CF7AE006F9AD3 /* MXNotificationCenter.h in Headers */,
Expand Down Expand Up @@ -2379,9 +2423,12 @@
B146D4E321A5AEF200D8C2C6 /* MXRealmMediaScan.m in Sources */,
32C235731F827F3800E38FC5 /* MXRoomOperation.m in Sources */,
322A51C41D9AC8FE00C8536D /* MXCryptoAlgorithms.m in Sources */,
B182B08823167A640057972E /* MXIdentityServerHashDetails.m in Sources */,
329FB1761A0A3A1600A5E88E /* MXRoomMember.m in Sources */,
B1136965230AC9D900E2B2FA /* MXIdentityService.m in Sources */,
B11BD44922CB56790064D8B0 /* MXReplyEventParser.m in Sources */,
323360701A403A0D0071A488 /* MXFileStore.m in Sources */,
B1136967230C1E8600E2B2FA /* MXIdentityService.swift in Sources */,
32A9770521626E5C00919CC0 /* MXServerNotices.m in Sources */,
32D7767E1A27860600FC4AA2 /* MXMemoryStore.m in Sources */,
327E9AE82285A8C400A98BC1 /* MXAggregationPaginatedResponse.m in Sources */,
Expand Down Expand Up @@ -2492,6 +2539,7 @@
B146D47B21A5958400D8C2C6 /* MXAntivirusScanStatusFormatter.m in Sources */,
32133022228BF7BC0070BA9B /* MXReactionCountChange.m in Sources */,
32A151491DAF7C0C00400192 /* MXKey.m in Sources */,
B1136964230AC9D900E2B2FA /* MXIdentityServerRestClient.m in Sources */,
F0C34CBB1C18C93700C36F09 /* MXSDKOptions.m in Sources */,
320BBF441D6C81550079890E /* MXEventsEnumeratorOnArray.m in Sources */,
32618E7220ED2DF500E1D2EA /* MXFilterJSONModel.m in Sources */,
Expand All @@ -2502,6 +2550,7 @@
F08B8D5D1E014711006171A8 /* NSData+MatrixSDK.m in Sources */,
3291D4D51A68FFEB00C3BA41 /* MXFileRoomStore.m in Sources */,
329FB1801A0B665800A5E88E /* MXUser.m in Sources */,
B11556EE230C45C600B2A2CF /* MXIdentityServerRestClient.swift in Sources */,
321CFDE722525A49004D31DF /* MXSASTransaction.m in Sources */,
32720D9D222EAA6F0086FFF5 /* MXDiscoveredClientConfig.m in Sources */,
B146D4F321A5AF7F00D8C2C6 /* MXRealmEventScan.m in Sources */,
Expand Down
Loading