NVSHAS-10062: [Manager] manager not showing ERROR when failing to create admin password during 1st login

Author: xingzhang-suse

admin/src/main/scala/com/neu/service/BaseService.scala

@@ -13,6 +13,7 @@ import org.apache.pekko.http.scaladsl.server.Directives
 import org.apache.pekko.http.scaladsl.server.StandardRoute
 import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller
 import spray.json.*
+import com.neu.core.HttpResponseException
 
 import java.io.PrintWriter
 import java.io.StringWriter
@@ -57,14 +58,14 @@ open class BaseService extends Directives with LazyLogging {
     }
   }
 
-  protected def onUnauthorized(e: Throwable): StandardRoute =
-    if (e.getMessage.contains("\"code\":14")) {
-      complete((StatusCodes.BadRequest, e.getMessage))
-    } else if (e.getMessage.contains("\"code\":47")) {
+  protected def onUnauthorized(e: HttpResponseException, res: String): StandardRoute =
+    if (res.contains("\"code\":14")) {
+      complete((StatusCodes.BadRequest, res))
+    } else if (res.contains("\"code\":47")) {
       complete((StatusCodes.Unauthorized, blocked))
-    } else if (e.getMessage.contains("\"code\":48")) {
+    } else if (res.contains("\"code\":48")) {
       complete((StatusCodes.Unauthorized, passwordExpired))
-    } else if (e.getMessage.contains("\"code\":50")) {
+    } else if (res.contains("\"code\":50")) {
       complete(StatusCodes.Unauthorized, authSSODisabledError)
     } else {
       complete((StatusCodes.Unauthorized, authError))

admin/src/main/scala/com/neu/service/authentication/SuseAuthService.scala

@@ -81,15 +81,17 @@ class SuseAuthService()(implicit
       logger.info("post path auth")
       processSuseLoginRequest(ip, userPwd, suseCookieValue)
     } catch {
-      case NonFatal(e)         =>
-        logger.warn(e.getMessage)
-
+      case NonFatal(e: HttpResponseException) =>
+        val response = Await.result(
+          e.response.entity.toStrict(5.seconds).map(_.data.utf8String),
+          RestClient.waitingLimit.seconds
+        )
         if (
           e.getMessage
             .contains("Status: 400") || e.getMessage.contains("Status: 401") || e.getMessage
             .contains("Status: 403")
         ) {
-          onUnauthorized(e)
+          onUnauthorized(e, response)
         } else if (e.getMessage.contains("Status: 410")) {
           complete((StatusCodes.Gone, "Please logout and then login from Rancher again!"))
         } else {
@@ -107,7 +109,7 @@ class SuseAuthService()(implicit
                     "Status: 403"
                   )
               ) {
-                onUnauthorized(e)
+                onUnauthorized(e, response)
               } else if (e.getMessage.contains("Status: 410")) {
                 complete(
                   (StatusCodes.Gone, "Please logout and then login from Rancher again!")
@@ -120,7 +122,7 @@ class SuseAuthService()(implicit
               complete((StatusCodes.NetworkConnectTimeout, "Network connect timeout error"))
           }
         }
-      case e: TimeoutException =>
+      case e: TimeoutException                =>
         logger.warn(e.getMessage)
 
         complete((StatusCodes.NetworkConnectTimeout, "Network connect timeout error"))

admin/webapp/websrc/app/routes/pages/login/login.component.ts

@@ -676,12 +676,9 @@ export class LoginComponent implements OnInit, OnDestroy {
             dialogRef.componentInstance.onClose();
           },
           ({ error }) => {
-            let resetError: ResetError = JSON.parse(
-              error.split('Body:')[1].trim()
-            );
             dialogRef.componentInstance.pwdProfile =
-              resetError.password_profile_basic;
-            dialogRef.componentInstance.resetError = resetError.message;
+              error.password_profile_basic;
+            dialogRef.componentInstance.resetError = error.message;
           }
         );
     });