From 08aaf5e060350e48c2e221ee36d5035acbf56a86 Mon Sep 17 00:00:00 2001
From: Srie Teja <srit1505@gmail.com>
Date: Thu, 14 Sep 2023 14:27:03 +0530
Subject: [PATCH] fix: merge conflicts

---
 .../src/verb/handler/enroll_verb_handler.dart   | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart b/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart
index 4f9a8f965..f7e94b203 100644
--- a/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart
+++ b/packages/at_secondary_server/lib/src/verb/handler/enroll_verb_handler.dart
@@ -114,24 +114,11 @@ class EnrollVerbHandler extends AbstractVerbHandler {
       Map<dynamic, dynamic> responseJson,
       InboundConnection atConnection) async {
     String? otp = enrollParams.otp;
-    await _validateConnectionAuth(otp, atConnection, operation);
+    await _validateConnectionAuthAndOtp(otp, atConnection, operation);
     if (!atConnection.isRequestAllowed()) {
       throw AtThrottleLimitExceeded(
           'Enrollment requests have exceeded the limit within the specified time frame');
     }
-    if (!atConnection.getMetaData().isAuthenticated) {
-      var otp = enrollParams.otp;
-      if (otp == null ||
-          (await OtpVerbHandler.cache.get(otp.toString()) == null)) {
-        throw AtEnrollmentException(
-            'invalid otp. Cannot process enroll request');
-      }
-    }
-    var enrollNamespaces = enrollParams.namespaces ?? {};
-    var newEnrollmentId = Uuid().v4();
-    var key =
-        '$newEnrollmentId.$newEnrollmentKeyPattern.$enrollManageNamespace';
-    logger.finer('key: $key$currentAtSign');
 
     // assigns valid enrollmentId and enrollmentNamespaces to the enrollParams object
     // also constructs and returns an enrollment key
@@ -471,7 +458,7 @@ class EnrollVerbHandler extends AbstractVerbHandler {
     return enrollmentKey;
   }
 
-  Future<void> _validateConnectionAuth(otp, atConnection, operation) async {
+  Future<void> _validateConnectionAuthAndOtp(otp, atConnection, operation) async {
     if (operation == 'update' &&
         atConnection.getMetaData().authType != AuthType.apkam) {
       throw AtEnrollmentException(