Merge pull request #175 from yaso-meth/NEW--Check-Username-Uniquness
NEW--Check-Username-Uniquness
This commit is contained in:
@@ -12,6 +12,23 @@ import 'package:supertokens_flutter/supertokens.dart';
|
|||||||
class MihUserApis {
|
class MihUserApis {
|
||||||
final baseAPI = AppEnviroment.baseApiUrl;
|
final baseAPI = AppEnviroment.baseApiUrl;
|
||||||
|
|
||||||
|
static Future<bool> isUsernameUnique(
|
||||||
|
String username,
|
||||||
|
BuildContext context,
|
||||||
|
) async {
|
||||||
|
var response = await http.get(Uri.parse(
|
||||||
|
"${AppEnviroment.baseApiUrl}/users/validate/username/$username"));
|
||||||
|
if (response.statusCode == 200) {
|
||||||
|
String body = response.body;
|
||||||
|
var jsonBody = jsonDecode(body);
|
||||||
|
|
||||||
|
return jsonBody["available"];
|
||||||
|
} else {
|
||||||
|
throw Exception(
|
||||||
|
"Error: isUsernameUnique status code ${response.statusCode}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static Future<void> deleteAccount(
|
static Future<void> deleteAccount(
|
||||||
String app_id,
|
String app_id,
|
||||||
BuildContext context,
|
BuildContext context,
|
||||||
|
|||||||
@@ -2,11 +2,13 @@ import 'dart:convert';
|
|||||||
|
|
||||||
import 'package:mzansi_innovation_hub/main.dart';
|
import 'package:mzansi_innovation_hub/main.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart';
|
import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart';
|
||||||
|
import 'package:mzansi_innovation_hub/mih_apis/mih_user_apis.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart';
|
||||||
|
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_alert.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart';
|
import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart';
|
||||||
@@ -38,13 +40,42 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
|
|||||||
late String oldProPicName;
|
late String oldProPicName;
|
||||||
late String env;
|
late String env;
|
||||||
|
|
||||||
|
void notUniqueAlert() {
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) {
|
||||||
|
return MihAppAlert(
|
||||||
|
alertIcon: Icon(
|
||||||
|
Icons.warning_amber_rounded,
|
||||||
|
size: 100,
|
||||||
|
color: MzanziInnovationHub.of(context)!.theme.errorColor(),
|
||||||
|
),
|
||||||
|
alertTitle: "Too Slow, That Username is Taken",
|
||||||
|
alertBody: const Text(
|
||||||
|
"The username you have entered is already taken by another member of Mzansi. Please choose a different username and try again.",
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 15,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> submitForm() async {
|
Future<void> submitForm() async {
|
||||||
// print("============\nsubmiit form\n=================");
|
// print("============\nsubmiit form\n=================");
|
||||||
if (isFieldsFilled()) {
|
if (isFieldsFilled()) {
|
||||||
|
if (widget.arguments.signedInUser.username != usernameController.text) {
|
||||||
|
bool isUsernameUnique = await MihUserApis.isUsernameUnique(
|
||||||
|
usernameController.text, context);
|
||||||
|
print("isUsernameUnique: $isUsernameUnique");
|
||||||
|
if (isUsernameUnique == false) {
|
||||||
|
notUniqueAlert();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (oldProPicName != proPicController.text) {
|
if (oldProPicName != proPicController.text) {
|
||||||
// print("here 1");
|
|
||||||
// print("Pro File Name: ${proPic!.name}");
|
|
||||||
// print("Pro File Bytes: ${proPic!.bytes}");
|
|
||||||
await uploadSelectedFile(proPic);
|
await uploadSelectedFile(proPic);
|
||||||
}
|
}
|
||||||
await updateUserApiCall();
|
await updateUserApiCall();
|
||||||
@@ -134,8 +165,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
|
|||||||
false,
|
false,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
String message =
|
String message = "Your information has been updated successfully!";
|
||||||
"${widget.arguments.signedInUser.email}'s information has been updated successfully!";
|
|
||||||
successPopUp(message);
|
successPopUp(message);
|
||||||
} else {
|
} else {
|
||||||
internetConnectionPopUp();
|
internetConnectionPopUp();
|
||||||
|
|||||||
@@ -66,10 +66,6 @@ async def read_all_users(search: str, session: SessionContainer = Depends(verify
|
|||||||
query = "SELECT * FROM users WHERE LOWER(email) LIKE %s OR LOWER(username) LIKE %s"
|
query = "SELECT * FROM users WHERE LOWER(email) LIKE %s OR LOWER(username) LIKE %s"
|
||||||
search_term = f"%{search.lower()}%" # Add wildcards and lowercase
|
search_term = f"%{search.lower()}%" # Add wildcards and lowercase
|
||||||
cursor.execute(query, (search_term, search_term))
|
cursor.execute(query, (search_term, search_term))
|
||||||
# query = "SELECT * FROM users "
|
|
||||||
# query += "where email like lower('%%%s%%') " % search
|
|
||||||
# query += "or username like lower('%%%s%%')" % search
|
|
||||||
# cursor.execute(query)
|
|
||||||
items = [
|
items = [
|
||||||
{
|
{
|
||||||
"idUser": item[0],
|
"idUser": item[0],
|
||||||
@@ -87,6 +83,19 @@ async def read_all_users(search: str, session: SessionContainer = Depends(verify
|
|||||||
db.close()
|
db.close()
|
||||||
return items
|
return items
|
||||||
|
|
||||||
|
# Get List of all files
|
||||||
|
@router.get("/users/validate/username/{username}", tags=["MIH Users"])
|
||||||
|
async def read_all_users(username: str, session: SessionContainer = Depends(verify_session()) ): #, session: SessionContainer = Depends(verify_session())
|
||||||
|
db = database.dbConnection.dbAppDataConnect()
|
||||||
|
cursor = db.cursor()
|
||||||
|
query = "SELECT * FROM users WHERE LOWER(username) = %s"
|
||||||
|
# search_term = f"%{username.lower()}%" # Add wildcards and lowercase
|
||||||
|
cursor.execute(query, (username.lower(),))
|
||||||
|
available = cursor.fetchone() is None
|
||||||
|
cursor.close()
|
||||||
|
db.close()
|
||||||
|
return {"available": available}
|
||||||
|
|
||||||
# Get List of all files
|
# Get List of all files
|
||||||
@router.get("/user/{app_id}", tags=["MIH Users"])
|
@router.get("/user/{app_id}", tags=["MIH Users"])
|
||||||
async def read_users_by_app_id(app_id: str, session: SessionContainer = Depends(verify_session())):
|
async def read_users_by_app_id(app_id: str, session: SessionContainer = Depends(verify_session())):
|
||||||
|
|||||||
Reference in New Issue
Block a user