refactor whip auth logic

Author: pedroSG94

whip/src/main/java/com/pedro/whip/WhipClient.kt

@@ -230,39 +230,23 @@ class WhipClient(private val connectChecker: ConnectChecker) {
                     Log.i(TAG, "found ${localCandidates.size} candidates")
                     val offerResponse = commandsManager.writeOffer()
                     Log.i(TAG, offerResponse.toString())
-                    when (offerResponse.statusCode) {
-                        403 -> {
-                            onMainThread {
-                                connectChecker.onConnectionFailed("Error configure stream, access denied")
-                            }
-                            Log.e(TAG, "Response 403, access denied")
-                            return@launch
-                        }
-                        401 -> {
-                            if (commandsManager.token == null) {
-                                onMainThread { connectChecker.onAuthError() }
+                    if (offerResponse.statusCode !in 200..299) {
+                        val needAuth = offerResponse.statusCode in 400..499
+                        if (needAuth && commandsManager.token != null) {
+                            val offerResponseAuth = commandsManager.writeOffer(sendAuth = true)
+                            Log.i(TAG, offerResponseAuth.toString())
+                            if (offerResponseAuth.statusCode !in 200..299) {
+                                onMainThread {
+                                    connectChecker.onConnectionFailed("Error configure stream, offer failed: ${offerResponseAuth.statusCode}")
+                                }
                                 return@launch
                             } else {
-                                val offerResponseAuth = commandsManager.writeOffer(sendAuth = true)
-                                Log.i(TAG, offerResponseAuth.toString())
-                                when (offerResponseAuth.statusCode) {
-                                    401 -> {
-                                        onMainThread { connectChecker.onAuthError() }
-                                        return@launch
-                                    }
-                                    in 200..299 -> {
-                                        onMainThread { connectChecker.onAuthSuccess() }
-                                    }
-                                    else -> {
-                                        onMainThread {
-                                            connectChecker.onConnectionFailed("Error configure stream, offer with auth failed: ${offerResponseAuth.statusCode}")
-                                        }
-                                        return@launch
-                                    }
-                                }
+                                onMainThread { connectChecker.onAuthSuccess() }
                             }
-                        }
-                        !in 200..299 -> {
+                        } else if (needAuth) {
+                            onMainThread { connectChecker.onAuthError() }
+                            return@launch
+                        } else {
                             onMainThread {
                                 connectChecker.onConnectionFailed("Error configure stream, offer failed: ${offerResponse.statusCode}")
                             }

whip/src/main/java/com/pedro/whip/utils/Requests.kt

@@ -34,16 +34,18 @@ object Requests {
     try {
       socket.connect()
       if (body != null) socket.outputStream.write(body.toByteArray())
-      Log.i("Requests", "$method, code: ${socket.responseCode}\nheaders: $headers\nbody: $body")
-      val bytes = socket.inputStream.readBytes()
+      val code = socket.responseCode
+      Log.i("Requests", "$method, code: $code\nheaders: $headers\nbody: $body")
+      val stream = if (code in 200..399) socket.inputStream else socket.errorStream
+      val bytes = stream?.readBytes() ?: ByteArray(0)
       val responseHeaders = mutableMapOf<String, String>()
       socket.headerFields.forEach {
         try {
           responseHeaders[it.key] = it.value.joinToString(", ")
         } catch (_: Exception){}
       }
       val bodyResult = String(bytes)
-      return RequestResponse(socket.responseCode, responseHeaders, bodyResult)
+      return RequestResponse(code, responseHeaders, bodyResult)
     } catch (e : Exception) {
       Log.e("Requests", "Error", e)
       return RequestResponse(-1, emptyMap(), "")