From 0d119c54b38cc61a3ca6a3a0fb49b49bb0d1dd1a Mon Sep 17 00:00:00 2001
From: JellyBrick <shlee1503@naver.com>
Date: Thu, 28 Apr 2022 20:20:18 +0900
Subject: [PATCH] fix(Auth): NPE

---
 .../be/zvz/kotlininside/security/Auth.kt      | 25 ++++++++-----------
 .../be/zvz/kotlininside/KotlinInsideTest.kt   |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/kotlin/be/zvz/kotlininside/security/Auth.kt b/src/main/kotlin/be/zvz/kotlininside/security/Auth.kt
index 1d7f9015..af23f107 100644
--- a/src/main/kotlin/be/zvz/kotlininside/security/Auth.kt
+++ b/src/main/kotlin/be/zvz/kotlininside/security/Auth.kt
@@ -210,24 +210,21 @@ class Auth {
      * @param hashedAppKey SHA256 단방향 암호화된 value_token 값입니다.
      * @return [java.lang.String] app_id를 반환합니다.
      */
+    @Throws(HttpException::class)
     fun fetchAppId(hashedAppKey: String): String {
         fcmToken = fetchFcmToken()
 
-        val appId = try {
-            val option = Request.getDefaultOption()
-                .addMultipartParameter("value_token", hashedAppKey)
-                .addMultipartParameter("signature", Const.DC_APP_SIGNATURE)
-                .addMultipartParameter("pkg", Const.DC_APP_PACKAGE)
-                .addMultipartParameter("vCode", Const.DC_APP_VERSION_CODE)
-                .addMultipartParameter("vName", Const.DC_APP_VERSION_NAME)
-                .addMultipartParameter("client_token", fcmToken)
+        val option = Request.getDefaultOption()
+            .addMultipartParameter("value_token", hashedAppKey)
+            .addMultipartParameter("signature", Const.DC_APP_SIGNATURE)
+            .addMultipartParameter("pkg", Const.DC_APP_PACKAGE)
+            .addMultipartParameter("vCode", Const.DC_APP_VERSION_CODE)
+            .addMultipartParameter("vName", Const.DC_APP_VERSION_NAME)
+            .addMultipartParameter("client_token", fcmToken)
 
-            JsonBrowser.parse(KotlinInside.getInstance().httpInterface.upload(ApiUrl.Auth.APP_ID, option))
-        } catch (e: HttpException) {
-            return ""
-        }
+        val appId = JsonBrowser.parse(KotlinInside.getInstance().httpInterface.upload(ApiUrl.Auth.APP_ID, option))
 
-        return appId.index(0).get("app_id").text()!!
+        return appId.get("app_id").text() ?: throw HttpException(RuntimeException("Can't get app_id: ${appId.text()}"))
     }
 
     /**
@@ -251,7 +248,7 @@ class Auth {
                     ApiUrl.Auth.LOGIN,
                     option
                 )
-            ).index(0)
+            )
 
             val detail = SessionDetail(
                 result = json.get("result").asBoolean(),
diff --git a/src/test/kotlin/be/zvz/kotlininside/KotlinInsideTest.kt b/src/test/kotlin/be/zvz/kotlininside/KotlinInsideTest.kt
index c0104921..e8371e4f 100644
--- a/src/test/kotlin/be/zvz/kotlininside/KotlinInsideTest.kt
+++ b/src/test/kotlin/be/zvz/kotlininside/KotlinInsideTest.kt
@@ -31,7 +31,7 @@ class KotlinInsideTest {
     fun initKotlinInside() {
         KotlinInside.createInstance(
             Anonymous("ㅇㅇ", "1234"),
-            DefaultHttpClient(true, true)
+            DefaultHttpClient()
         )
     }