mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
no message
This commit is contained in:
Peter
@@ -77,60 +77,26 @@ public final class AuthorizationSequenceController: NavigationController {
|
||||
controller.loginWithNumber = { [weak self, weak controller] number in
|
||||
if let strongSelf = self {
|
||||
controller?.inProgress = true
|
||||
let account = strongSelf.account
|
||||
let sendCode = Api.functions.auth.sendCode(flags: 0, phoneNumber: number, currentNumber: nil, apiId: 10840, apiHash: "33c45224029d59cb3ad0c16134215aeb")
|
||||
|
||||
let signal = account.network.request(sendCode, automaticFloodWait: false)
|
||||
|> map { result in
|
||||
return (result, account)
|
||||
} |> `catch` { error -> Signal<(Api.auth.SentCode, UnauthorizedAccount), MTRpcError> in
|
||||
switch error.errorDescription {
|
||||
case Regex("(PHONE_|USER_|NETWORK_)MIGRATE_(\\d+)"):
|
||||
let range = error.errorDescription.range(of: "MIGRATE_")!
|
||||
let updatedMasterDatacenterId = Int32(error.errorDescription.substring(from: range.upperBound))!
|
||||
let updatedAccount = account.changedMasterDatacenterId(updatedMasterDatacenterId)
|
||||
return updatedAccount
|
||||
|> mapToSignalPromotingError { updatedAccount -> Signal<(Api.auth.SentCode, UnauthorizedAccount), MTRpcError> in
|
||||
return updatedAccount.network.request(sendCode, automaticFloodWait: false)
|
||||
|> map { sentCode in
|
||||
return (sentCode, updatedAccount)
|
||||
}
|
||||
}
|
||||
case _:
|
||||
return .fail(error)
|
||||
}
|
||||
}
|
||||
|
||||
strongSelf.actionDisposable.set(signal.start(next: { [weak self] (result, account) in
|
||||
strongSelf.actionDisposable.set((sendAuthorizationCode(account: strongSelf.account, phoneNumber: number, apiId: 10840, apiHash: "33c45224029d59cb3ad0c16134215aeb") |> deliverOnMainQueue).start(next: { [weak self] account in
|
||||
if let strongSelf = self {
|
||||
controller?.inProgress = false
|
||||
strongSelf.account = account
|
||||
let masterDatacenterId = account.masterDatacenterId
|
||||
let _ = (strongSelf.account.postbox.modify { modifier -> Void in
|
||||
switch result {
|
||||
case let .sentCode(_, type, phoneCodeHash, nextType, timeout):
|
||||
var parsedNextType: AuthorizationCodeNextType?
|
||||
if let nextType = nextType {
|
||||
parsedNextType = AuthorizationCodeNextType(apiType: nextType)
|
||||
}
|
||||
modifier.setState(UnauthorizedAccountState(masterDatacenterId: masterDatacenterId, contents: .confirmationCodeEntry(number: number, type: SentAuthorizationCodeType(apiType: type), hash: phoneCodeHash, timeout: timeout, nextType: parsedNextType)))
|
||||
}
|
||||
}).start()
|
||||
}
|
||||
}, error: { error in
|
||||
Queue.mainQueue().async {
|
||||
if let controller = controller {
|
||||
controller.inProgress = false
|
||||
|
||||
var text: String?
|
||||
if error.errorDescription.hasPrefix("FLOOD_WAIT") {
|
||||
if let controller = controller {
|
||||
controller.inProgress = false
|
||||
|
||||
let text: String
|
||||
switch error {
|
||||
case .limitExceeded:
|
||||
text = "You have requested authorization code too many times. Please try again later."
|
||||
} else if error.errorDescription == "PHONE_NUMBER_INVALID" {
|
||||
case .invalidPhoneNumber:
|
||||
text = "The phone number you entered is not valid. Please enter the correct number along with your area code."
|
||||
}
|
||||
if let text = text {
|
||||
controller.present(standardTextAlertController(title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window)
|
||||
}
|
||||
case .generic:
|
||||
text = "An error occurred. Please try again later."
|
||||
}
|
||||
|
||||
controller.present(standardTextAlertController(title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window)
|
||||
}
|
||||
}))
|
||||
}
|
||||
@@ -157,76 +123,22 @@ public final class AuthorizationSequenceController: NavigationController {
|
||||
if let strongSelf = self {
|
||||
controller?.inProgress = true
|
||||
|
||||
let account = strongSelf.account
|
||||
let masterDatacenterId = account.masterDatacenterId
|
||||
let signal = account.postbox.modify { modifier -> Signal<Void, String> in
|
||||
if let state = modifier.getState() as? UnauthorizedAccountState {
|
||||
switch state.contents {
|
||||
case let .confirmationCodeEntry(number, _, hash, _, _):
|
||||
return account.network.request(Api.functions.auth.signIn(phoneNumber: number, phoneCodeHash: hash, phoneCode: code), automaticFloodWait: false) |> map { authorization in
|
||||
return AuthorizationCodeResult.Authorization(authorization)
|
||||
} |> `catch` { error -> Signal<AuthorizationCodeResult, String> in
|
||||
switch (error.errorCode, error.errorDescription) {
|
||||
case (401, "SESSION_PASSWORD_NEEDED"):
|
||||
return account.network.request(Api.functions.account.getPassword(), automaticFloodWait: false)
|
||||
|> mapError { error -> String in
|
||||
return error.errorDescription
|
||||
}
|
||||
|> mapToSignal { result -> Signal<AuthorizationCodeResult, String> in
|
||||
switch result {
|
||||
case .noPassword:
|
||||
return .fail("NO_PASSWORD")
|
||||
case let .password(_, _, hint, _, _):
|
||||
return .single(.Password(hint))
|
||||
}
|
||||
}
|
||||
case _:
|
||||
return .fail(error.errorDescription)
|
||||
}
|
||||
}
|
||||
|> mapToSignal { result -> Signal<Void, String> in
|
||||
return account.postbox.modify { modifier -> Void in
|
||||
switch result {
|
||||
case let .Password(hint):
|
||||
modifier.setState(UnauthorizedAccountState(masterDatacenterId: masterDatacenterId, contents: .passwordEntry(hint: hint)))
|
||||
case let .Authorization(authorization):
|
||||
switch authorization {
|
||||
case let .authorization(_, _, user):
|
||||
let user = TelegramUser(user: user)
|
||||
let state = AuthorizedAccountState(masterDatacenterId: account.masterDatacenterId, peerId: user.id, state: nil)
|
||||
modifier.setState(state)
|
||||
}
|
||||
}
|
||||
} |> mapToSignalPromotingError { result -> Signal<Void, String> in
|
||||
return .complete()
|
||||
}
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
return .complete()
|
||||
}
|
||||
|> mapError { _ -> String in
|
||||
return ""
|
||||
}
|
||||
|> switchToLatest
|
||||
strongSelf.actionDisposable.set(signal.start(error: { error in
|
||||
strongSelf.actionDisposable.set((authorizeWithCode(account: strongSelf.account, code: code) |> deliverOnMainQueue).start(error: { error in
|
||||
Queue.mainQueue().async {
|
||||
if let controller = controller {
|
||||
controller.inProgress = false
|
||||
|
||||
var text: String?
|
||||
if error.hasPrefix("FLOOD_WAIT") {
|
||||
text = "You have entered invalid code too many times. Please try again later."
|
||||
} else if error == "CODE_INVALID" {
|
||||
text = "Invalid code."
|
||||
} else {
|
||||
text = "An error occured.";
|
||||
}
|
||||
if let text = text {
|
||||
controller.present(standardTextAlertController(title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window)
|
||||
let text: String
|
||||
switch error {
|
||||
case .limitExceeded:
|
||||
text = "You have entered invalid code too many times. Please try again later."
|
||||
case .invalidCode:
|
||||
text = "Invalid code. Please try again."
|
||||
case .generic:
|
||||
text = "An error occured."
|
||||
}
|
||||
|
||||
controller.present(standardTextAlertController(title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window)
|
||||
}
|
||||
}
|
||||
}))
|
||||
@@ -254,40 +166,22 @@ public final class AuthorizationSequenceController: NavigationController {
|
||||
if let strongSelf = self {
|
||||
controller?.inProgress = true
|
||||
|
||||
let account = strongSelf.account
|
||||
let signal = verifyPassword(account, password: password)
|
||||
|> `catch` { error -> Signal<Api.auth.Authorization, String> in
|
||||
return .fail(error.errorDescription)
|
||||
}
|
||||
|> mapToSignal { result -> Signal<Void, String> in
|
||||
return account.postbox.modify { modifier -> Void in
|
||||
switch result {
|
||||
case let .authorization(_, _, user):
|
||||
let user = TelegramUser(user: user)
|
||||
let state = AuthorizedAccountState(masterDatacenterId: account.masterDatacenterId, peerId: user.id, state: nil)
|
||||
modifier.setState(state)
|
||||
}
|
||||
}
|
||||
|> mapToSignalPromotingError { _ -> Signal<Void, String> in
|
||||
return .complete()
|
||||
}
|
||||
}
|
||||
strongSelf.actionDisposable.set(signal.start(error: { error in
|
||||
strongSelf.actionDisposable.set((authorizeWithPassword(account: strongSelf.account, password: password) |> deliverOnMainQueue).start(error: { error in
|
||||
Queue.mainQueue().async {
|
||||
if let controller = controller {
|
||||
controller.inProgress = false
|
||||
|
||||
var text: String?
|
||||
if error.hasPrefix("FLOOD_WAIT") {
|
||||
text = "You have entered invalid password too many times. Please try again later."
|
||||
} else if error == "PASSWORD_HASH_INVALID" {
|
||||
text = "Invalid password."
|
||||
} else {
|
||||
text = "An error occured.";
|
||||
}
|
||||
if let text = text {
|
||||
controller.present(standardTextAlertController(title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window)
|
||||
let text: String
|
||||
switch error {
|
||||
case .limitExceeded:
|
||||
text = "You have entered invalid password too many times. Please try again later."
|
||||
case .invalidPassword:
|
||||
text = "Invalid password. Please try again."
|
||||
case .generic:
|
||||
text = "An error occured. Please try again later."
|
||||
}
|
||||
|
||||
controller.present(standardTextAlertController(title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window)
|
||||
}
|
||||
}
|
||||
}))
|
||||
@@ -314,7 +208,7 @@ public final class AuthorizationSequenceController: NavigationController {
|
||||
self.setViewControllers([self.splashController(), self.passwordEntryController(hint: hint)], animated: !self.viewControllers.isEmpty)
|
||||
}
|
||||
} else if let _ = state as? AuthorizedAccountState {
|
||||
self._authorizedAccount.set(accountWithId(self.account.id, appGroupPath: self.account.appGroupPath, logger: .instance(self.account.logger), testingEnvironment: self.account.testingEnvironment) |> mapToSignal { account -> Signal<Account, NoError> in
|
||||
self._authorizedAccount.set(accountWithId(self.account.id, appGroupPath: self.account.appGroupPath, testingEnvironment: self.account.testingEnvironment) |> mapToSignal { account -> Signal<Account, NoError> in
|
||||
if case let .right(authorizedAccount) = account {
|
||||
return .single(authorizedAccount)
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user