忘记密码

punchnet/Views/AppContext.swift

@@ -15,4 +15,5 @@ class AppContext {
     init(noticePort: Int) {
         self.noticePort = noticePort
     }
+
 }

punchnet/Views/Login/LoginView.swift

@@ -8,10 +8,45 @@
 import SwiftUI
 import Observation
 
+enum ContactType {
+    case phone
+    case email
+    case invalid
+}
+
+enum AuthScreen {
+    case login
+    case resetPassword
+    case register
+}
+
+struct LoginRootView: View {
+    @Environment(AppContext.self) var appContext: AppContext
+    @State private var authScreen = AuthScreen.login
+
+    var body: some View {
+        Group {
+            switch self.authScreen {
+            case .login:
+                LoginView(authScreen: $authScreen)
+            case .resetPassword:
+                ResetPasswordView()
+            case .register:
+                ResetPasswordView()
+            }
+        }
+        .onChange(of: self.authScreen) {
+            print("app auth screen changed")
+        }
+    }
+    
+}
+
 // 登陆页面
 struct LoginView: View {
     @Environment(UserContext.self) var userContext: UserContext
     @State private var authMethod: AuthMethod = .account
+    @Binding var authScreen: AuthScreen
 
     enum AuthMethod {
         case token
@@ -61,7 +96,7 @@ struct LoginView: View {
                 case .token:
                     LoginTokenView()
                 case .account:
-                    LoginAccountView()
+                    LoginAccountView(authScreen: $authScreen)
                 }
             }
             
@@ -72,98 +107,213 @@ struct LoginView: View {
     
 }
 
-struct LoginTokenView: View {
+extension LoginView {
-    @Environment(UserContext.self) var userContext: UserContext
-    @State private var token: String = ""
     
-    @State private var showAlert = false
+    struct LoginTokenView: View {
-    @State private var errorMessage = ""
+        @Environment(UserContext.self) var userContext: UserContext
+        @State private var token: String = ""
+        
+        @State private var showAlert = false
+        @State private var errorMessage = ""
+        
+        var body: some View {
+            VStack {
+                TextField("认证密钥", text: $token)
+                    .multilineTextAlignment(.leading)
+                    .textFieldStyle(PlainTextFieldStyle())
+                    .frame(width: 200, height: 25)
+                    .background(Color.clear)
+                    .foregroundColor(Color.black)
+                    .overlay(
+                        Rectangle()
+                            .frame(height: 1)
+                            .foregroundColor(.blue)
+                            .padding(.top, 25)
+                        , alignment: .topLeading)
+                
+                Rectangle()
+                    .overlay {
+                        Text("登陆")
+                            .font(.system(size: 14, weight: .regular))
+                            .foregroundColor(.black)
+                    }
+                    .frame(width: 120, height: 35)
+                    .foregroundColor(Color(red: 74 / 255, green: 207 / 255, blue: 154 / 255))
+                    .cornerRadius(5.0)
+                    .onTapGesture {
+                        Task {
+                            await self.doLogin()
+                        }
+                    }
+            }
+            .onAppear {
+                if let cacheToken = self.userContext.loadCacheToken() {
+                    self.token = cacheToken
+                }
+            }
+        }
+        
+        // 执行登陆操作
+        private func doLogin() async {
+            do {
+                try await self.userContext.loginWithToken(token: self.token)
+                print(self.userContext.networkSession?.accessToken)
+                
+                // 保存信息到KeychainStore
+                //            let store = KeychainStore.shared
+                //            if let tokenData = loginResult.accessToken.data(using: .utf8) {
+                //                try store.save(tokenData, account: self.username)
+                //            }
+                
+            } catch let err as SDLAPIError {
+                await MainActor.run {
+                    self.showAlert = true
+                    self.errorMessage = err.message
+                }
+            } catch {
+                await MainActor.run {
+                    self.showAlert = true
+                    self.errorMessage = "内部错误，请稍后重试"
+                }
+            }
+        }
+        
+    }
+    
+    struct LoginAccountView: View {
+        @Environment(UserContext.self) var userContext: UserContext
+        @Environment(AppContext.self) var appContext: AppContext
+        @Binding var authScreen: AuthScreen
 
-    var body: some View {
+        @State private var username: String = ""
-        VStack {
+        @State private var password: String = ""
-            TextField("认证密钥", text: $token)
+        
-                .multilineTextAlignment(.leading)
+        @State private var showAlert = false
-                .textFieldStyle(PlainTextFieldStyle())
+        @State private var errorMessage = ""
-                .frame(width: 200, height: 25)
+        
-                .background(Color.clear)
+        struct LoginResult: Decodable {
-                .foregroundColor(Color.black)
+            var accessToken: String
-                .overlay(
+            var networkId: Int
-                    Rectangle()
-                        .frame(height: 1)
-                        .foregroundColor(.blue)
-                        .padding(.top, 25)
-                    , alignment: .topLeading)
             
-            Rectangle()
+            enum CodingKeys: String, CodingKey {
-                .overlay {
+                case accessToken = "access_token"
+                case networkId = "network_id"
+            }
+        }
+        
+        var body: some View {
+            VStack(alignment: .center) {
+                VStack(alignment: .leading) {
+                    TextField("手机号/邮箱", text: $username)
+                        .multilineTextAlignment(.leading)
+                        .textFieldStyle(PlainTextFieldStyle())
+                        .frame(width: 200, height: 25)
+                        .background(Color.clear)
+                        .foregroundColor(Color.black)
+                        .overlay(
+                            Rectangle()
+                                .frame(height: 1)
+                                .foregroundColor(.blue)
+                                .padding(.top, 25)
+                            , alignment: .topLeading)
+                    
+                    SecureField("密码", text: $password)
+                        .multilineTextAlignment(.leading)
+                        .textFieldStyle(PlainTextFieldStyle())
+                        .frame(width: 200, height: 25)
+                        .background(Color.clear)
+                        .foregroundColor(Color.black)
+                        .overlay(
+                            Rectangle()
+                                .frame(height: 1)
+                                .foregroundColor(.blue)
+                                .padding(.top, 25)
+                            , alignment: .topLeading)
+                    
+                    Button {
+                        self.authScreen = .resetPassword
+                    } label: {
+                        Text("忘记密码?")
+                            .underline(true, color: .blue)
+                            .font(.system(size: 14, weight: .regular))
+                            .foregroundColor(.blue)
+                    }
+                    .buttonStyle(.plain)
+                }
+                
+                Button {
+                    if self.username.isEmpty {
+                        self.showAlert = true
+                        self.errorMessage = "账号不能为空"
+                    } else if self.password.isEmpty {
+                        self.showAlert = true
+                        self.errorMessage = "密码不能为空"
+                    } else {
+                        Task {
+                            await self.doLogin()
+                        }
+                    }
+                } label: {
                     Text("登陆")
                         .font(.system(size: 14, weight: .regular))
                         .foregroundColor(.black)
+                        .frame(width: 120, height: 35)
                 }
                 .frame(width: 120, height: 35)
-                .foregroundColor(Color(red: 74 / 255, green: 207 / 255, blue: 154 / 255))
+                .background(Color(red: 74 / 255, green: 207 / 255, blue: 154 / 255))
                 .cornerRadius(5.0)
-                .onTapGesture {
+            }
-                    Task {
+            .alert(isPresented: $showAlert) {
-                        await self.doLogin()
+                Alert(title: Text("错误提示"), message: Text("账号密码为空"))
-                    }
+            }
+            .onAppear {
+                if let (cacheUsername, cachePassword) = self.userContext.loadCacheUsernameAndPassword() {
+                    self.username = cacheUsername
+                    self.password = cachePassword
                 }
-        }
-        .onAppear {
-            if let cacheToken = self.userContext.loadCacheToken() {
-                self.token = cacheToken
             }
         }
+        
+        // 执行登陆操作
+        private func doLogin() async {
+            do {
+                try await self.userContext.loginWithAccountAndPassword(username: self.username, password: self.password)
+                
+                // 保存信息到KeychainStore
+                //            let store = KeychainStore.shared
+                //            if let tokenData = loginResult.accessToken.data(using: .utf8) {
+                //                try store.save(tokenData, account: self.username)
+                //            }
+                
+            } catch let err as SDLAPIError {
+                await MainActor.run {
+                    self.showAlert = true
+                    self.errorMessage = err.message
+                }
+            } catch {
+                await MainActor.run {
+                    self.showAlert = true
+                    self.errorMessage = "内部错误，请稍后重试"
+                }
+            }
+        }
+        
     }
-    
-    // 执行登陆操作
-    private func doLogin() async {
-        do {
-            try await self.userContext.loginWithToken(token: self.token)
-            print(self.userContext.networkSession?.accessToken)
-            
-            // 保存信息到KeychainStore
-//            let store = KeychainStore.shared
-//            if let tokenData = loginResult.accessToken.data(using: .utf8) {
-//                try store.save(tokenData, account: self.username)
-//            }
-            
-        } catch let err as SDLAPIError {
-            await MainActor.run {
-                self.showAlert = true
-                self.errorMessage = err.message
-            }
-        } catch {
-            await MainActor.run {
-                self.showAlert = true
-                self.errorMessage = "内部错误，请稍后重试"
-            }
-        }
-    }
-    
 }
 
-struct LoginAccountView: View {
+// 忘记密码
+struct ResetPasswordView: View {
     @Environment(UserContext.self) var userContext: UserContext
-
+    
     @State private var username: String = ""
-    @State private var password: String = ""
     
     @State private var showAlert = false
     @State private var errorMessage = ""
     
-    struct LoginResult: Decodable {
-        var accessToken: String
-        var networkId: Int
-        
-        enum CodingKeys: String, CodingKey {
-            case accessToken = "access_token"
-            case networkId = "network_id"
-        }
-    }
-
     var body: some View {
         VStack {
+            Text("重置密码")
+            
             TextField("手机号/邮箱", text: $username)
                 .multilineTextAlignment(.leading)
                 .textFieldStyle(PlainTextFieldStyle())
@@ -177,78 +327,66 @@ struct LoginAccountView: View {
                         .padding(.top, 25)
                     , alignment: .topLeading)
             
-            SecureField("密码", text: $password)
-                .multilineTextAlignment(.leading)
-                .textFieldStyle(PlainTextFieldStyle())
-                .frame(width: 200, height: 25)
-                .background(Color.clear)
-                .foregroundColor(Color.black)
-                .overlay(
-                    Rectangle()
-                        .frame(height: 1)
-                        .foregroundColor(.blue)
-                        .padding(.top, 25)
-                    , alignment: .topLeading)
             
             Button {
-                if self.username.isEmpty {
+                Task { @MainActor in
-                    self.showAlert = true
+                    await self.sendVerifyCode()
-                    self.errorMessage = "账号不能为空"
-                } else if self.password.isEmpty {
-                    self.showAlert = true
-                    self.errorMessage = "密码不能为空"
-                } else {
-                    Task {
-                        await self.doLogin()
-                    }
                 }
             } label: {
-                Text("登陆")
+                Text("获取验证码")
                     .font(.system(size: 14, weight: .regular))
                     .foregroundColor(.black)
-                    .frame(width: 120, height: 35)
+                    .frame(width: 200, height: 35)
             }
-            .frame(width: 120, height: 35)
+            .frame(width: 200, height: 35)
             .background(Color(red: 74 / 255, green: 207 / 255, blue: 154 / 255))
             .cornerRadius(5.0)
         }
         .alert(isPresented: $showAlert) {
-            Alert(title: Text("错误提示"), message: Text("账号密码为空"))
+            Alert(title: Text("提示"), message: Text(self.errorMessage))
-        }
-        .onAppear {
-            if let (cacheUsername, cachePassword) = self.userContext.loadCacheUsernameAndPassword() {
-                self.username = cacheUsername
-                self.password = cachePassword
-            }
         }
     }
     
-    // 执行登陆操作
+    private func sendVerifyCode() async {
-    private func doLogin() async {
+        if username.isEmpty {
-        do {
+            self.showAlert = true
-           try await self.userContext.loginWithAccountAndPassword(username: self.username, password: self.password)
+            self.errorMessage = "手机号/邮箱为空"
-            
+            return
-            // 保存信息到KeychainStore
+        }
-//            let store = KeychainStore.shared
+        
-//            if let tokenData = loginResult.accessToken.data(using: .utf8) {
+        switch identifyContact(username) {
-//                try store.save(tokenData, account: self.username)
+        case .email, .phone:
-//            }
+            do {
-            
+                let result = try await self.userContext.sendVerifyCode(username: username)
-        } catch let err as SDLAPIError {
+                print("send verify code result: \(result)")
-            await MainActor.run {
+            } catch let err {
                 self.showAlert = true
-                self.errorMessage = err.message
+                self.errorMessage = err.localizedDescription
-            }
-        } catch {
-            await MainActor.run {
-                self.showAlert = true
-                self.errorMessage = "内部错误，请稍后重试"
             }
+        case .invalid:
+            self.showAlert = true
+            self.errorMessage = "手机号/邮箱格式错误"
+        }
+    }
+    
+    private func identifyContact(_ input: String) -> ContactType {
+        let trimmed = input.trimmingCharacters(in: .whitespacesAndNewlines)
+        // 手机号正则（中国手机号为例，以 1 开头，11 位数字）
+        let phoneRegex = /^1[3-9][0-9]{9}$/
+        // 邮箱正则
+        let emailRegex = /^[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$/
+        if trimmed.wholeMatch(of: phoneRegex) != nil {
+            return .phone
+        } else if trimmed.wholeMatch(of: emailRegex) != nil {
+            return .email
+        } else {
+            return .invalid
         }
     }
     
 }
 
 #Preview {
-    LoginView()
+//    ResetPasswordView()
+//        .environment(UserContext())
 }

punchnet/Views/RootView.swift

@@ -15,7 +15,7 @@ struct RootView: View {
             if userContext.isLogined {
                 NetworkView()
             } else {
-                LoginView()
+                LoginRootView()
             }
         }
     }

punchnet/Views/UserContext.swift

@@ -92,6 +92,16 @@ class UserContext {
         }
     }
     
+    @MainActor
+    func sendVerifyCode(username: String) async throws -> String {
+        var params: [String: Any] = [
+            "username": username
+        ]
+        params.merge(baseParams) {$1}
+        
+        return try await SDLAPIClient.doPost(path: "/auth/sendVerifyCode", params: params, as: String.self)
+    }
+    
     func loadCacheToken() -> String? {
         if let data = try? KeychainStore.shared.load(account: "token") {
             return String(data: data, encoding: .utf8)