Skip to content

Commit

Permalink
PR remarks.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pixlwave
pixlwave committed Jul 4, 2022
1 parent 5173a29 commit e8852bc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 26 deletions.
10 changes: 5 additions & 5 deletions ElementX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -279,7 +279,7 @@
EE8491AD81F47DF3C192497B /* DecorationTimelineItemProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 184CF8C196BE143AE226628D /* DecorationTimelineItemProtocol.swift */; };
EEC40663922856C65D1E0DF5 /* KeychainControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDB9C37196A4C79F24CE80C6 /* KeychainControllerTests.swift */; };
EF99A92701E401C4CD5ADC50 /* SplashScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE978A6118C131D7F2A04B3 /* SplashScreenModels.swift */; };
F03E16ED043C62FED5A07AE0 /* MatrixEntitityRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B81C8227BBEA95CCE86037 /* MatrixEntitityRegex.swift */; };
F03E16ED043C62FED5A07AE0 /* MatrixEntityRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B81C8227BBEA95CCE86037 /* MatrixEntityRegex.swift */; };
F040ABFEB0A2B142D948BA12 /* Untranslated.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = F75DF9500D69A3AAF8339E69 /* Untranslated.stringsdict */; };
F2DD8661B5C0BA2BB526FA6C /* KeychainControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD51F9FDC91C231906D76C8 /* KeychainControllerProtocol.swift */; };
F4C3FEDB1B3A05376A1723A3 /* KeychainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4427F9E0571B4E6E048A2B /* KeychainController.swift */; };
Expand Down Expand Up @@ -691,7 +691,7 @@
F6A8C632CEF4600107792899 /* TextRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineItem.swift; sourceTree = "<group>"; };
F73FF1A33198F5FAE9D34B1F /* FormattedBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormattedBodyText.swift; sourceTree = "<group>"; };
F77C060C2ACC4CB7336A29E7 /* EmoteRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineItem.swift; sourceTree = "<group>"; };
F7B81C8227BBEA95CCE86037 /* MatrixEntitityRegex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatrixEntitityRegex.swift; sourceTree = "<group>"; };
F7B81C8227BBEA95CCE86037 /* MatrixEntityRegex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatrixEntityRegex.swift; sourceTree = "<group>"; };
F9E785D5137510481733A3E8 /* TextRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineView.swift; sourceTree = "<group>"; };
FA154570F693D93513E584C1 /* RoomMessageFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMessageFactory.swift; sourceTree = "<group>"; };
FAB10E673916D2B8D21FD197 /* TemplateModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateModels.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1443,7 +1443,7 @@
CF4B39D52CAE7D21D276ABEE /* ElementNavigationController.swift */,
1027BB9A852F445B7623897F /* ElementSettings.swift */,
12A626D74BBE9F4A60763B45 /* ImageAnonymizer.swift */,
F7B81C8227BBEA95CCE86037 /* MatrixEntitityRegex.swift */,
F7B81C8227BBEA95CCE86037 /* MatrixEntityRegex.swift */,
44BBB96FAA2F0D53C507396B /* Extensions */,
8F9A844EB44B6AD7CA18FD96 /* HTMLParsing */,
06501F0E978B2D5C92771DC7 /* Logging */,
Expand Down Expand Up @@ -1997,7 +1997,7 @@
2F30EFEB7BD39242D1AD96F3 /* LoginViewModelProtocol.swift in Sources */,
B94368839BDB69172E28E245 /* MXLog.swift in Sources */,
BCC3EDB7AD0902797CB4BBC2 /* MXLogger.m in Sources */,
F03E16ED043C62FED5A07AE0 /* MatrixEntitityRegex.swift in Sources */,
F03E16ED043C62FED5A07AE0 /* MatrixEntityRegex.swift in Sources */,
EA1E7949533E19C6D862680A /* MediaProvider.swift in Sources */,
7002C55A4C917F3715765127 /* MediaProviderProtocol.swift in Sources */,
62BBF5BE7B905222F0477FF2 /* MediaSource.swift in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions ElementX/Sources/Other/Extensions/String.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,12 @@ extension String {

return string
}

/// Whether or not the string is a Matrix user ID.
var isMatrixUserID: Bool {
let range = NSRange(location: 0, length: count)

let detector = try? NSRegularExpression(pattern: MatrixEntityRegex.userId.rawValue, options: .caseInsensitive)
return detector?.numberOfMatches(in: self, range: range) ?? 0 == 1
}
}
0 ...X/Sources/Other/MatrixEntitityRegex.swift → ...ntX/Sources/Other/MatrixEntityRegex.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ final class LoginCoordinator: Coordinator, Presentable {

/// Parses the specified username and looks up the homeserver when a Matrix ID is entered.
private func parseUsername(_ username: String) {
guard authenticationService.usernameIsMatrixID(username) else { return }
guard username.isMatrixUserID else { return }

let homeserverDomain = String(username.split(separator: ":")[1])

Expand Down
9 changes: 1 addition & 8 deletions ElementX/Sources/Services/Authentication/AuthenticationService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ class AuthenticationService: AuthenticationServiceProtocol {

// MARK: - Public

func usernameIsMatrixID(_ username: String) -> Bool {
let range = NSRange(location: 0, length: username.count)

let detector = try? NSRegularExpression(pattern: MatrixEntityRegex.userId.rawValue, options: .caseInsensitive)
return detector?.numberOfMatches(in: username, range: range) ?? 0 == 1
}

func startLogin(for homeserverAddress: String) async -> Result<Void, AuthenticationServiceError> {
homeserver = LoginHomeserver(address: homeserverAddress)
return .success(())
Expand All @@ -42,7 +35,7 @@ class AuthenticationService: AuthenticationServiceProtocol {
Benchmark.startTrackingForIdentifier("Login", message: "Started new login")

// Workaround whilst the SDK requires a full MXID.
let username = usernameIsMatrixID(username) ? username : "@\(username):\(homeserver.address)"
let username = username.isMatrixUserID ? username : "@\(username):\(homeserver.address)"

let basePath = userSessionStore.baseDirectoryPath(for: username)
let builder = ClientBuilder()
Expand Down
2 changes: 0 additions & 2 deletions ElementX/Sources/Services/Authentication/AuthenticationServiceProtocol.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ enum AuthenticationServiceError: Error {
protocol AuthenticationServiceProtocol {
var homeserver: LoginHomeserver { get }

/// Checks whether the specified username is a Matrix ID or not.
func usernameIsMatrixID(_ username: String) -> Bool
/// Sets up the service for login on the specified homeserver address.
func startLogin(for homeserverAddress: String) async -> Result<Void, AuthenticationServiceError>
/// Performs a password login using the current homeserver.
Expand Down
13 changes: 3 additions & 10 deletions ElementX/Sources/Services/Authentication/MockAuthenticationService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ class MockAuthenticationService: AuthenticationServiceProtocol {
let validCredentials = (username: "alice", password: "12345678")
private(set) var homeserver: LoginHomeserver = .mockMatrixDotOrg

func usernameIsMatrixID(_ username: String) -> Bool {
let range = NSRange(location: 0, length: username.count)

let detector = try? NSRegularExpression(pattern: MatrixEntityRegex.userId.rawValue, options: .caseInsensitive)
return detector?.numberOfMatches(in: username, range: range) ?? 0 == 1
}

func startLogin(for homeserverAddress: String) async -> Result<Void, AuthenticationServiceError> {
// Map the address to the mock homeservers
if LoginHomeserver.mockMatrixDotOrg.address.contains(homeserverAddress) {
Expand All @@ -33,10 +26,10 @@ class MockAuthenticationService: AuthenticationServiceProtocol {
} else if LoginHomeserver.mockUnsupported.address.contains(homeserverAddress) {
homeserver = .mockUnsupported
return .success(())
} else {
// Otherwise fail with an invalid server.
return .failure(.invalidServer)
}

// Otherwise fail with an invalid server.
return .failure(.invalidServer)
}

func login(username: String, password: String) async -> Result<UserSessionProtocol, AuthenticationServiceError> {
Expand Down

0 comments on commit e8852bc

Please sign in to comment.