refactor for digest

lib/screens/common_widgets/auth/consts.dart

@@ -16,3 +16,22 @@ const kHintUsername = "Username";
 const kHintPassword = "Password";
 
 const kHintToken = "Token";
+
+const kInfoDigestUsername =
+    "Your username for digest authentication. This will be sent to the server for credential verification.";
+const kInfoDigestPassword =
+    "Your password for digest authentication. This is hashed and not sent in plain text to the server.";
+const kHintRealm = "Realm";
+const kInfoDigestRealm =
+    "Authentication realm as specified by the server. This defines the protection space for the credentials.";
+const kHintNonce = "Nonce";
+const kInfoDigestNonce =
+    "Server-generated random value used to prevent replay attacks.";
+const kAlgorithm = "Algorithm";
+const kTooltipAlgorithm = "Algorithm that will be used to produce the digest";
+const kHintQop = "QOP";
+const kInfoDigestQop =
+    "Quality of Protection. Typically 'auth' for authentication only, or 'auth-int' for authentication with integrity protection.";
+const kHintDataString = "Opaque";
+const kInfoDigestDataString =
+    "Server-specified data string that should be returned unchanged in the authorization header. Usually obtained from server's 401 response.";

lib/screens/common_widgets/auth/digest_auth_fields.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:apidash_core/apidash_core.dart';
 import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:apidash/widgets/widgets.dart';
+import 'consts.dart';
 
 class DigestAuthFields extends StatefulWidget {
   final AuthModel? authData;
@@ -36,8 +37,8 @@ class _DigestAuthFieldsState extends State<DigestAuthFields> {
     _passwordController = TextEditingController(text: digest?.password ?? '');
     _realmController = TextEditingController(text: digest?.realm ?? '');
     _nonceController = TextEditingController(text: digest?.nonce ?? '');
-    _algorithmController = digest?.algorithm ?? 'MD5';
+    _algorithmController = digest?.algorithm ?? kDigestAlgos[0];
-    _qopController = TextEditingController(text: digest?.qop ?? 'auth');
+    _qopController = TextEditingController(text: digest?.qop ?? kQop[0]);
     _opaqueController = TextEditingController(text: digest?.opaque ?? '');
   }
 
@@ -50,42 +51,38 @@ class _DigestAuthFieldsState extends State<DigestAuthFields> {
           AuthTextField(
             readOnly: widget.readOnly,
             controller: _usernameController,
-            hintText: "Username",
+            hintText: kHintUsername,
-            infoText:
+            infoText: kInfoDigestUsername,
-                "Your username for digest authentication. This will be sent to the server for credential verification.",
             onChanged: (_) => _updateDigestAuth(),
           ),
           const SizedBox(height: 12),
           AuthTextField(
             readOnly: widget.readOnly,
             controller: _passwordController,
-            hintText: "Password",
+            hintText: kHintPassword,
             isObscureText: true,
-            infoText:
+            infoText: kInfoDigestPassword,
-                "Your password for digest authentication. This is hashed and not sent in plain text to the server.",
             onChanged: (_) => _updateDigestAuth(),
           ),
           const SizedBox(height: 12),
           AuthTextField(
             readOnly: widget.readOnly,
             controller: _realmController,
-            hintText: "Realm",
+            hintText: kHintRealm,
-            infoText:
+            infoText: kInfoDigestRealm,
-                "Authentication realm as specified by the server. This defines the protection space for the credentials.",
             onChanged: (_) => _updateDigestAuth(),
           ),
           const SizedBox(height: 12),
           AuthTextField(
             readOnly: widget.readOnly,
             controller: _nonceController,
-            hintText: "Nonce",
+            hintText: kHintNonce,
-            infoText:
+            infoText: kInfoDigestNonce,
-                "Server-generated random value used to prevent replay attacks.",
             onChanged: (_) => _updateDigestAuth(),
           ),
           const SizedBox(height: 12),
           Text(
-            "Algorithm",
+            kAlgorithm,
             style: TextStyle(
               fontWeight: FontWeight.normal,
               fontSize: 14,
@@ -94,13 +91,8 @@ class _DigestAuthFieldsState extends State<DigestAuthFields> {
           SizedBox(height: 4),
           ADPopupMenu<String>(
             value: _algorithmController.trim(),
-            values: const [
+            values: kDigestAlgos.map((i) => (i, null)),
-              ('MD5', 'MD5'),
+            tooltip: kTooltipAlgorithm,
-              ('MD5-sess', 'MD5-sess'),
-              ('SHA-256', 'SHA-256'),
-              ('SHA-256-sess', 'SHA-256-sess'),
-            ],
-            tooltip: "Algorithm that will be used to produce the digest",
             isOutlined: true,
             onChanged: widget.readOnly
                 ? null
@@ -117,18 +109,16 @@ class _DigestAuthFieldsState extends State<DigestAuthFields> {
           AuthTextField(
             readOnly: widget.readOnly,
             controller: _qopController,
-            hintText: "QOP",
+            hintText: kHintQop,
-            infoText:
+            infoText: kInfoDigestQop,
-                "Quality of Protection. Typically 'auth' for authentication only, or 'auth-int' for authentication with integrity protection.",
             onChanged: (_) => _updateDigestAuth(),
           ),
           const SizedBox(height: 12),
           AuthTextField(
             readOnly: widget.readOnly,
             controller: _opaqueController,
-            hintText: "Opaque",
+            hintText: kHintDataString,
-            infoText:
+            infoText: kInfoDigestDataString,
-                "Server-specified data string that should be returned unchanged in the authorization header. Usually obtained from server's 401 response.",
             onChanged: (_) => _updateDigestAuth(),
           ),
         ],
@@ -137,29 +127,22 @@ class _DigestAuthFieldsState extends State<DigestAuthFields> {
   }
 
   void _updateDigestAuth() {
+    final digest = AuthDigestModel(
+      username: _usernameController.text.trim(),
+      password: _passwordController.text.trim(),
+      realm: _realmController.text.trim(),
+      nonce: _nonceController.text.trim(),
+      algorithm: _algorithmController.trim(),
+      qop: _qopController.text.trim(),
+      opaque: _opaqueController.text.trim(),
+    );
     widget.updateAuth(widget.authData?.copyWith(
           type: APIAuthType.digest,
-          digest: AuthDigestModel(
+          digest: digest,
-            username: _usernameController.text.trim(),
-            password: _passwordController.text.trim(),
-            realm: _realmController.text.trim(),
-            nonce: _nonceController.text.trim(),
-            algorithm: _algorithmController.trim(),
-            qop: _qopController.text.trim(),
-            opaque: _opaqueController.text.trim(),
-          ),
         ) ??
         AuthModel(
           type: APIAuthType.digest,
-          digest: AuthDigestModel(
+          digest: digest,
-            username: _usernameController.text.trim(),
-            password: _passwordController.text.trim(),
-            realm: _realmController.text.trim(),
-            nonce: _nonceController.text.trim(),
-            algorithm: _algorithmController.trim(),
-            qop: _qopController.text.trim(),
-            opaque: _opaqueController.text.trim(),
-          ),
         ));
   }
 }

packages/better_networking/lib/consts.dart

@@ -23,6 +23,9 @@ enum APIAuthType {
   final String displayType;
 }
 
+const kDigestAlgos = ['MD5', 'MD5-sess', 'SHA-256', 'SHA-256-sess'];
+const kQop = ['auth', 'auth-int'];
+
 enum HTTPVerb {
   get("GET"),
   head("HEAD"),

packages/better_networking/lib/utils/auth/digest_auth_utils.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:math' as math;
-
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart' as crypto;
+import '../../consts.dart';
 import '../../models/models.dart';
 
 Map<String, String>? splitAuthenticateHeader(String header) {
@@ -130,7 +130,7 @@ Map<String, String?> computeResponse(
     if (qop == null) {
       final token3 = '$ha1:$nonce:$ha2';
       ret['response'] = md5Hash(token3);
-    } else if (qop == 'auth' || qop == 'auth-int') {
+    } else if (kQop.contains(qop)) {
       final token3 = '$ha1:$nonce:$nonceCount:$cnonce:$qop:$ha2';
       ret['response'] = md5Hash(token3);
     }
@@ -138,7 +138,7 @@ Map<String, String?> computeResponse(
     if (qop == null) {
       final token3 = '$ha1:$nonce:$ha2';
       ret['response'] = sha256Hash(token3);
-    } else if (qop == 'auth' || qop == 'auth-int') {
+    } else if (kQop.contains(qop)) {
       final token3 = '$ha1:$nonce:$nonceCount:$cnonce:$qop:$ha2';
       ret['response'] = sha256Hash(token3);
     }