feat : login api call

2025-05-17 15:24:06 +03:30
parent 0e630e709b
commit 303ff86d85
22 changed files with 518 additions and 522 deletions
--- a/packages/auth/lib/presentation/pages/auth/logic.dart
+++ b/packages/auth/lib/presentation/pages/auth/logic.dart
@@ -2,7 +2,12 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:rasadyar_auth/auth.dart';
+import 'package:rasadyar_auth/data/common/dio_error_handler.dart';
+import 'package:rasadyar_auth/data/models/request/login_request/login_request_model.dart';
+import 'package:rasadyar_auth/data/models/response/auth/auth_response_model.dart';
 import 'package:rasadyar_auth/data/repositories/auth_repository_imp.dart';
+import 'package:rasadyar_auth/data/services/token_storage_service.dart';
+import 'package:rasadyar_auth/presentation/widget/captcha/logic.dart';
 import 'package:rasadyar_core/core.dart';

 enum AuthType { useAndPass, otp }
@@ -12,7 +17,8 @@ enum AuthStatus { init }
 enum OtpStatus { init, sent, verified, reSend }

 class AuthLogic extends GetxController {
-  Rx<GlobalKey<FormState>> formKey = GlobalKey<FormState>().obs;
+  GlobalKey<FormState> formKey = GlobalKey<FormState>();
+
  Rx<GlobalKey<FormState>> formKeyOtp = GlobalKey<FormState>().obs;
  Rx<GlobalKey<FormState>> formKeySentOtp = GlobalKey<FormState>().obs;
  Rx<TextEditingController> phoneNumberController = TextEditingController().obs;
@@ -21,11 +27,12 @@ class AuthLogic extends GetxController {
      TextEditingController().obs;
  Rx<TextEditingController> otpCodeController = TextEditingController().obs;

+  var captchaController = Get.find<CaptchaWidgetLogic>();

  RxnString phoneNumber = RxnString(null);
-  RxnString password = RxnString(null);
-  RxBool isOnError = false.obs;
-  RxBool hidePassword = true.obs;
+  RxBool isLoading = false.obs;
+  TokenStorageService tokenStorageService = diAuth.get<TokenStorageService>();
+
  Rx<AuthType> authType = AuthType.useAndPass.obs;
  Rx<AuthStatus> authStatus = AuthStatus.init.obs;
  Rx<OtpStatus> otpStatus = OtpStatus.init.obs;
@@ -61,7 +68,7 @@ class AuthLogic extends GetxController {
  @override
  void onInit() {
    super.onInit();
-
+    tokenStorageService.init();
  }

  @override
@@ -76,5 +83,46 @@ class AuthLogic extends GetxController {
    super.onClose();
  }

+  bool _isFormValid() {
+    final isCaptchaValid =
+        captchaController.formKey.currentState?.validate() ?? false;
+    final isFormValid = formKey.currentState?.validate() ?? false;
+    return isCaptchaValid && isFormValid;
+  }

+  LoginRequestModel _buildLoginRequest() {
+    final phone = phoneNumberController.value.text;
+    final pass = passwordController.value.text;
+    final code = captchaController.textController.value.text;
+    final key = captchaController.captchaKey.value;
+
+    return LoginRequestModel.createWithCaptcha(
+      username: phone,
+      password: pass,
+      captchaCode: code,
+      captchaKey: key!,
+    );
+  }
+
+  Future<void> submitLoginForm() async {
+    if (!_isFormValid()) return;
+
+    final loginRequestModel = _buildLoginRequest();
+    isLoading.value = true;
+    await safeCall<AuthResponseModel?>(
+      call: () => authRepository.login(authRequest: loginRequestModel.toJson()),
+      onSuccess: (result) async{
+        await tokenStorageService.saveRefreshToken(result!.refresh!);
+        await tokenStorageService.saveAccessToken(result!.access!);
+        //Get.offAndToNamed(Routes.home);
+      },
+      onError: (error, stackTrace) {
+        if (error is DioException) {
+          diAuth.get<DioErrorHandler>().handle(error);
+        }
+        captchaController.getCaptcha();
+      },
+    );
+    isLoading.value = false;
+  }
 }
--- a/packages/auth/lib/presentation/pages/auth/view.dart
+++ b/packages/auth/lib/presentation/pages/auth/view.dart
@@ -1,8 +1,8 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:rasadyar_auth/presentation/widget/captcha/view.dart';
 import 'package:rasadyar_auth/presentation/widget/clear_button.dart';
+import 'package:rasadyar_auth/presentation/widget/logo_widget.dart';
 import 'package:rasadyar_core/core.dart';

 import 'logic.dart';
@@ -17,11 +17,11 @@ class AuthPage extends GetView<AuthLogic> {
        child: Column(
          children: [
            SizedBox(height: 80),
-            logoWidget(),
+            LogoWidget(),
            ObxValue((types) {
              switch (types.value) {
                case AuthType.otp:
-                  //return otpForm();
+                //return otpForm();
                case AuthType.useAndPass:
                  return useAndPassFrom();
              }
@@ -87,180 +87,114 @@ class AuthPage extends GetView<AuthLogic> {
  }

  Widget useAndPassFrom() {
-    return ObxValue((data) {
-      return Padding(
-        padding: EdgeInsets.symmetric(horizontal: 30, vertical: 50),
-        child: Form(
-          key: data.value,
-          child: Column(
-            children: [
-              ObxValue((phoneController) {
-                return TextFormField(
-                  controller: controller.phoneNumberController.value,
-                  decoration: InputDecoration(
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(8),
-                      gapPadding: 11,
-                    ),
-                    labelText: 'نام کاربری',
-                    labelStyle: AppFonts.yekan13,
-                    errorStyle: AppFonts.yekan13.copyWith(
-                      color: AppColor.redNormal,
-                    ),
-
-                    prefixIconConstraints: BoxConstraints(
-                      maxHeight: 40,
-                      minHeight: 40,
-                      maxWidth: 40,
-                      minWidth: 40,
-                    ),
-                    prefixIcon: Padding(
-                      padding: const EdgeInsets.fromLTRB(0, 8, 6, 8),
-                      child: vecWidget(Assets.vecCallSvg),
-                    ),
-                    suffix:
-                        phoneController.value.text.trim().isNotEmpty
-                            ? clearButton(() {
-                              phoneController.value.clear();
-                              phoneController.refresh();
-                            })
-                            : null,
-                    counterText: '',
-                  ),
-                  keyboardType: TextInputType.numberWithOptions(
-                    decimal: false,
-                    signed: false,
-                  ),
-
-                  maxLines: 1,
-                  maxLength: 11,
-                  onChanged: (value) {
-                    if (controller.isOnError.value) {
-                      controller.isOnError.value = !controller.isOnError.value;
-                      data.value.currentState?.reset();
-
-                      data.refresh();
-                      phoneController.value.text = value;
-                    }
-                    phoneController.refresh();
-                  },
-                  textInputAction: TextInputAction.next,
-                  validator: (value) {
-                    if (value == null) {
-                      return '⚠️ شماره موبایل را وارد کنید';
-                    } else if (value.length < 11) {
-                      return '⚠️ شماره موبایل باید 11 رقم باشد';
-                    }
-                    return null;
-                  },
-                  style: AppFonts.yekan13,
-                );
-              }, controller.phoneNumberController),
-
-              SizedBox(height: 26),
-
-              ObxValue((passwordController) {
-                return TextFormField(
-                  controller: passwordController.value,
-                  obscureText: controller.hidePassword.value,
-                  decoration: InputDecoration(
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(8),
-                      gapPadding: 11,
-                    ),
-                    labelText: 'رمز عبور',
-                    labelStyle: AppFonts.yekan13,
-                    errorStyle: AppFonts.yekan13.copyWith(
-                      color: AppColor.redNormal,
-                    ),
-
-                    prefixIconConstraints: BoxConstraints(
-                      maxHeight: 34,
-                      minHeight: 34,
-                      maxWidth: 34,
-                      minWidth: 34,
-                    ),
-                    prefixIcon: Padding(
-                      padding: const EdgeInsets.fromLTRB(0, 8, 8, 8),
-                      child: vecWidget(Assets.vecKeySvg),
-                    ),
-                    suffix:
-                        passwordController.value.text.trim().isNotEmpty
-                            ? GestureDetector(
-                              onTap: () {
-                                controller.hidePassword.value =
-                                    !controller.hidePassword.value;
-                              },
-                              child: Icon(
-                                controller.hidePassword.value
-                                    ? CupertinoIcons.eye
-                                    : CupertinoIcons.eye_slash,
-                              ),
-                            )
-                            : null,
-                    counterText: '',
-                  ),
-                  textInputAction: TextInputAction.done,
-                  keyboardType: TextInputType.visiblePassword,
-                  maxLines: 1,
-                  onChanged: (value) {
-                    if (controller.isOnError.value) {
-                      controller.isOnError.value = !controller.isOnError.value;
-                      data.value.currentState?.reset();
-                      passwordController.value.text = value;
-                    }
-                    passwordController.refresh();
-                  },
-                  validator: (value) {
-                    if (value == null || value.isEmpty) {
-                      return '⚠️ رمز عبور را وارد کنید'; // "Please enter the password"
-                    }
-                    return null;
-                  },
-                  style: AppFonts.yekan13,
-                );
-              }, controller.passwordController),
-              SizedBox(height: 26),
-
-              CaptchaWidget(),
-
-              SizedBox(height: 23),
-              RElevated(
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: 30, vertical: 50),
+      child: Form(
+        key: controller.formKey,
+        child: Column(
+          children: [
+            ObxValue(
+              (phoneController) => RTextField(
+                label: 'نام کاربری',
+                maxLength: 11,
+                maxLines: 1,
+                controller: phoneController.value,
+                keyboardType: TextInputType.number,
+                initText: phoneController.value.text,
+                onChanged: (value) {
+                  phoneController.value.text = value;
+                  phoneController.refresh();
+                },
+                prefixIcon: Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 8, 6, 8),
+                  child: vecWidget(Assets.vecCallSvg),
+                ),
+                suffixIcon:
+                    phoneController.value.text.trim().isNotEmpty
+                        ? clearButton(() {
+                          phoneController.value.clear();
+                          phoneController.refresh();
+                        })
+                        : null,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return '⚠️ شماره موبایل را وارد کنید';
+                  }
+                  /*else if (value.length < 11) {
+                   return '⚠️ شماره موبایل باید 11 رقم باشد';
+                 }*/
+                  return null;
+                },
+                style: AppFonts.yekan13,
+                errorStyle: AppFonts.yekan13.copyWith(
+                  color: AppColor.redNormal,
+                ),
+                labelStyle: AppFonts.yekan13,
+                boxConstraints: const BoxConstraints(
+                  maxHeight: 40,
+                  minHeight: 40,
+                  maxWidth: 40,
+                  minWidth: 40,
+                ),
+              ),
+              controller.phoneNumberController,
+            ),
+            const SizedBox(height: 26),
+            ObxValue(
+              (passwordController) => RTextField(
+                label: 'رمز عبور',
+                filled: false,
+                controller: passwordController.value,
+                variant: RTextFieldVariant.password,
+                initText: passwordController.value.text,
+                onChanged: (value) {
+                  passwordController.refresh();
+                },
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return '⚠️ رمز عبور را وارد کنید';
+                  }
+                  return null;
+                },
+                style: AppFonts.yekan13,
+                errorStyle: AppFonts.yekan13.copyWith(
+                  color: AppColor.redNormal,
+                ),
+                labelStyle: AppFonts.yekan13,
+                prefixIcon: Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 8, 8, 8),
+                  child: vecWidget(Assets.vecKeySvg),
+                ),
+                boxConstraints: const BoxConstraints(
+                  maxHeight: 34,
+                  minHeight: 34,
+                  maxWidth: 34,
+                  minWidth: 34,
+                ),
+              ),
+              controller.passwordController,
+            ),
+            SizedBox(height: 26),
+            CaptchaWidget(),
+            SizedBox(height: 23),
+            ObxValue((data) {
+              return RElevated(
                text: 'ورود',
+                isLoading: data.value,
                onPressed: () async {
-                  Jalali? picked = await showPersianDatePicker(
-                    context: Get.context!,
-
-                    initialDate: Jalali.now(),
-                    firstDate: Jalali(1385, 8),
-                    lastDate: Jalali(1450, 9),
-                    initialEntryMode: PersianDatePickerEntryMode.calendarOnly,
-                    initialDatePickerMode: PersianDatePickerMode.year,
-                  );
+                  await controller.submitLoginForm();
                },
                width: Get.width,
                height: 48,
-              ),
-            ],
-          ),
+              );
+            }, controller.isLoading),
+          ],
        ),
-      );
-    }, controller.formKey);
+      ),
+    );
  }

-/*  Widget otpForm() {
-    return ObxValue((status) {
-      switch (status.value) {
-        case OtpStatus.init:
-          return sendCodeForm();
-        case OtpStatus.sent:
-        case OtpStatus.verified:
-        case OtpStatus.reSend:
-          return confirmCodeForm();
-      }
-    }, controller.otpStatus);
-  }*/
-
+  /*
  Widget sendCodeForm() {
    return ObxValue((data) {
      return Form(
@@ -494,18 +428,5 @@ class AuthPage extends GetView<AuthLogic> {
        ),
      );
    }, controller.formKeySentOtp);
-  }
-
-  Widget logoWidget() {
-    return Column(
-      children: [
-        Row(),
-        Image.asset(Assets.imagesInnerSplash, width: 120, height: 120),
-        Text(
-          'سامانه رصدیار',
-          style: AppFonts.yekan16.copyWith(color: AppColor.darkGreyNormal),
-        ),
-      ],
-    );
-  }
+  }*/
 }