Correct verf email problem (#609)

dqwiki · web-flow · commit e7772fe3418a · 2023-01-29T13:53:27.000-05:00
* Remove duplicate code and merge for proper DB entry

* Reject additional API errors for invalid name

* Convert async to sync per Phab T325692
diff --git a/app/Http/Controllers/Appeal/PublicAppealController.php b/app/Http/Controllers/Appeal/PublicAppealController.php
@@ -98,7 +98,7 @@ public function store(Request $request)
                 'ua'         => $ua . ' ' . $lang,
             ]);
 
-            GetBlockDetailsJob::dispatch($appeal);
+            GetBlockDetailsJob::dispatchNow($appeal);
 
             return $appeal;
         });
diff --git a/app/Jobs/VerifyBlockJob.php b/app/Jobs/VerifyBlockJob.php
@@ -38,6 +38,7 @@ public function handle()
     {
         // check if the user can be e-mailed according to MediaWiki API
         if (!MediaWikiRepository::getApiForTarget($this->appeal->wiki)->getMediaWikiExtras()->canEmail($this->appeal->getWikiEmailUsername())) {
+            $this->appeal->update(['user_verified'=>-1]);
             return;
         }
 
@@ -62,15 +63,10 @@ public function handle()
 
 
             try {
-                if (!MediaWikiRepository::getApiForTarget($appeal->wiki)->getMediaWikiExtras()->canEmail($appeal->getWikiEmailUsername())) {
-                    //user has not set an email on wiki
-                    $this->appeal->update(['user_verified'=>-1]);
-                    return;
-                }
                 $result = MediaWikiRepository::getApiForTarget($this->appeal->wiki)->getMediaWikiExtras()->sendEmail($this->appeal->getWikiEmailUsername(), $title, $message);
 
                 if (!$result) {
-                    throw new RuntimeException('Failed sending an e-mail');
+                    throw new RuntimeException('Failed sending an e-mail: No result from MW API');
                 }
             } catch (Exception $exception) {
                 // wrap exception to add appeal number to log
diff --git a/app/Services/MediaWiki/Implementation/RealMediaWikiExtras.php b/app/Services/MediaWiki/Implementation/RealMediaWikiExtras.php
@@ -82,6 +82,10 @@ public function getBlockInfo(string $target, int $appealId = -1, string $searchK
                 ]
             ));
         } catch (Exception $e) {
+            if (str_contains($e->getMessage(), "Invalid value")) {
+                //UTRS can't recognize this as an IP and MW is rejecting the username
+                return null;
+            }
             Log::error("MediaWiki API Failure: " . $e->getMessage() . " on appealID #". $appealId);
             throw $e;
         }

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ public function getBlockInfo(string $target, int $appealId = -1, string $searchK`
`82`	`82`	`]`
`83`	`83`	`));`
`84`	`84`	`} catch (Exception $e) {`
	`85`	`+ if (str_contains($e->getMessage(), "Invalid value")) {`
	`86`	`+ //UTRS can't recognize this as an IP and MW is rejecting the username`
	`87`	`+ return null;`
	`88`	`+ }`
`85`	`89`	`Log::error("MediaWiki API Failure: " . $e->getMessage() . " on appealID #". $appealId);`
`86`	`90`	`throw $e;`
`87`	`91`	`}`