From 16046f7375d30810be8c3d73d9be4b5d2aa92572 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 22 Jan 2021 18:10:03 -0500 Subject: [PATCH] [U] Update usage to call encapsulated method --- ProjectClock/AccountViewController.swift | 38 ++++++++++-------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index ba164a6..6a69099 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -83,36 +83,28 @@ class LoginVC: UIViewController return } + // Error messages + let errors = ["409 - [\"A0111\"]": "Account already exists, please login instead.", + "401 -": "Incorrect username/password", + "404 -": "Username does not exist in the database", + ] + // Send register request - let a = alert(login ? "Logging in..." : "Registering...", "Please Wait") - send(login ? APIs.login : APIs.register, ["username": name, "password": pass.sha256]) + sendReq(login ? APIs.login : APIs.register, + title: login ? "Logging in..." : "Registering...", errors: errors, + params: ["username": name, "password": pass.sha256]) { // Store username and password localStorage["name"] = name localStorage["pass"] = pass.sha256 localStorage["id"] = $0 - a.dismiss - { - // Send feedback - if login { self.msg("Login success!", "Now you can use account features, yay!") } - else { self.msg("Registration success!", "Now you have an account, yay!") } - - // Hide registration and show account detail view - AccountViewController.this.login() - } - } - err: - { - // Display error message - print($0) - let messages = ["409 - [\"A0111\"]": "Account already exists, please login instead.", - "401 -": "Incorrect username/password", - "404 -": "Username does not exist in the database", - ] - let message = messages[$0.trimmingCharacters(in: .whitespaces)] - ?? "Maybe the server is on fire, just wait a few hours." - a.dismiss { self.msg("An error occurred", message) } + // Send feedback + if login { self.msg("Login success!", "Now you can use account features, yay!") } + else { self.msg("Registration success!", "Now you have an account, yay!") } + + // Hide registration and show account detail view + AccountViewController.this.login() } }