Password reset by phone (basic).

UI isn't fully functional yet.

Author: aforge

TinodeSDK/AuthScheme.swift

@@ -7,13 +7,14 @@
 
 import Foundation
 
-struct AuthScheme {
+public struct AuthScheme {
     enum AuthSchemeError: Error {
         case invalidParams(String)
     }
     static let kLoginBasic = "basic"
     static let kLoginToken = "token"
     static let kLoginReset = "reset"
+    static let kLoginCode  = "code"
 
     let scheme: String
     let secret: String
@@ -74,6 +75,11 @@ struct AuthScheme {
     static func tokenInstance(secret: String) -> AuthScheme {
         return AuthScheme(scheme: kLoginToken, secret: secret)
     }
+
+    public static func codeInstance(code: String, method: String, value: String) throws -> AuthScheme {
+        // The secret is structured as <code>:<cred_method>:<cred_value>, "123456:email:[email protected]".
+        return AuthScheme(scheme: AuthScheme.kLoginCode, secret: try encodeResetToken(scheme: code, method: method, value: value))
+    }
 }
 
 extension String {

TinodeSDK/Tinode.swift

@@ -835,9 +835,9 @@ public class Tinode {
     ///   - desc: default access parameters for this account
     ///   - creds: creds
     /// - Returns: PromisedReply of the reply ctrl message
-    public func account<Pu: Codable, Pr: Codable>(uid: String?, scheme: String, secret: String, loginNow: Bool, tags: [String]?, desc: MetaSetDesc<Pu, Pr>?, creds: [Credential]?) -> PromisedReply<ServerMessage> {
+    public func account<Pu: Codable, Pr: Codable>(uid: String?, tmpscheme: String? = nil, tmpsecret: String? = nil, scheme: String, secret: String, loginNow: Bool, tags: [String]?, desc: MetaSetDesc<Pu, Pr>?, creds: [Credential]?) -> PromisedReply<ServerMessage> {
         let msgId = getNextMsgId()
-        let msga = MsgClientAcc(id: msgId, uid: uid, scheme: scheme, secret: secret, doLogin: loginNow, desc: desc)
+        let msga = MsgClientAcc(id: msgId, uid: uid, tmpscheme: tmpscheme, tmpsecret: tmpsecret, scheme: scheme, secret: secret, doLogin: loginNow, desc: desc)
 
         if let creds = creds, creds.count > 0 {
             for c in creds {
@@ -967,8 +967,10 @@ public class Tinode {
             }
         }
     }
-    private func updateAccountSecret(uid: String?, scheme: String, secret: String) -> PromisedReply<ServerMessage> {
-        return account(uid: uid, scheme: scheme, secret: secret, loginNow: false, tags: nil, desc: nil as MetaSetDesc<Int, Int>?, creds: nil)
+    private func updateAccountSecret(uid: String?,
+                                     tmpscheme: String? = nil, tmpsecret: String? = nil,
+                                     scheme: String, secret: String) -> PromisedReply<ServerMessage> {
+        return account(uid: uid, tmpscheme: tmpscheme, tmpsecret: tmpsecret, scheme: scheme, secret: secret, loginNow: false, tags: nil, desc: nil as MetaSetDesc<Int, Int>?, creds: nil)
     }
     @discardableResult
     public func updateAccountBasic(uid: String?, username: String, password: String) -> PromisedReply<ServerMessage> {
@@ -979,6 +981,17 @@ public class Tinode {
             return PromisedReply(error: error)
         }
     }
+
+    @discardableResult
+    public func updateAccountBasic(usingAuthScheme auth: AuthScheme, username: String, password: String) -> PromisedReply<ServerMessage> {
+        do {
+            return try updateAccountSecret(uid: nil, tmpscheme: auth.scheme, tmpsecret: auth.secret, scheme: AuthScheme.kLoginBasic,
+                secret: AuthScheme.encodeBasicToken(uname: username, password: password))
+        } catch {
+            return PromisedReply(error: error)
+        }
+    }
+
     public func requestResetPassword(method: String, newValue: String) -> PromisedReply<ServerMessage> {
         do {
             return try login(scheme: AuthScheme.kLoginReset, secret: AuthScheme.encodeResetToken(scheme: AuthScheme.kLoginBasic, method: method, value: newValue), creds: nil)

TinodeSDK/model/ClientMessages.swift

@@ -76,6 +76,8 @@ public class Credential: Codable, Comparable, CustomStringConvertible {
 public class MsgClientAcc<Pu: Codable, Pr: Codable>: Codable {
     var id: String?
     var user: String?
+    var tmpscheme: String?
+    var tmpsecret: String?
     var scheme: String?
     var secret: String?
     var login: Bool?
@@ -85,12 +87,16 @@ public class MsgClientAcc<Pu: Codable, Pr: Codable>: Codable {
 
     init(id: String?,
          uid: String?,
+         tmpscheme: String? = nil,
+         tmpsecret: String? = nil,
          scheme: String?,
          secret: String?,
          doLogin: Bool,
          desc: MetaSetDesc<Pu, Pr>?) {
         self.id = id
         self.user = uid
+        self.tmpscheme = tmpscheme
+        self.tmpsecret = tmpsecret
         self.scheme = scheme
         self.login = doLogin
         self.desc = desc