Fix #213

mattbdean · Mar 11, 2018 · 669b80f · 669b80f
1 parent 659b5e1
commit 669b80f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/src/main/kotlin/net/dean/jraw/oauth/OAuthHelper.kt b/lib/src/main/kotlin/net/dean/jraw/oauth/OAuthHelper.kt
@@ -6,7 +6,6 @@ import net.dean.jraw.http.NetworkAdapter
 import net.dean.jraw.http.NetworkException
 import net.dean.jraw.models.OAuthData
 import net.dean.jraw.models.internal.OAuthDataJson
-import java.util.*
 
 /**
  * This class helps create authenticated RedditClient instances.
@@ -45,11 +44,11 @@ object OAuthHelper {
     @JvmStatic internal fun interactive(http: NetworkAdapter, creds: Credentials,
                                              tokenStore: TokenStore = NoopTokenStore(),
                                              onAuthenticated: (r: RedditClient) -> Unit = {}): StatefulAuthHelper {
-        return when (creds.authMethod) {
-            AuthMethod.APP -> StatefulAuthHelper(http, creds, tokenStore, onAuthenticated)
-            AuthMethod.WEBAPP -> TODO("Web apps aren't supported yet")
-            else -> throw IllegalArgumentException("AuthMethod ${creds.authMethod} should use automatic authentication")
+        if (creds.authMethod != AuthMethod.APP && creds.authMethod != AuthMethod.WEBAPP) {
+            throw IllegalArgumentException("AuthMethod ${creds.authMethod} should use automatic authentication")
         }
+
+        return StatefulAuthHelper(http, creds, tokenStore, onAuthenticated)
     }
 
     @JvmStatic internal fun scriptOAuthData(http: NetworkAdapter, creds: Credentials): OAuthData {

diff --git a/lib/src/test/kotlin/net/dean/jraw/test/integration/OAuthHelperTest.kt b/lib/src/test/kotlin/net/dean/jraw/test/integration/OAuthHelperTest.kt
@@ -2,13 +2,11 @@ package net.dean.jraw.test.integration
 
 import com.winterbe.expekt.should
 import net.dean.jraw.Endpoint
+import net.dean.jraw.oauth.AuthMethod
 import net.dean.jraw.oauth.Credentials
 import net.dean.jraw.oauth.OAuthHelper
 import net.dean.jraw.oauth.StatefulAuthHelper
-import net.dean.jraw.test.CredentialsUtil
-import net.dean.jraw.test.ensureAuthenticated
-import net.dean.jraw.test.expectException
-import net.dean.jraw.test.newOkHttpAdapter
+import net.dean.jraw.test.*
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
 import org.jetbrains.spek.api.dsl.it
@@ -62,6 +60,9 @@ class OAuthHelperTest: Spek({
         it("should return a fresh StatefulAuthHelper") {
             OAuthHelper.interactive(newOkHttpAdapter(), CredentialsUtil.app).authStatus
                 .should.equal(StatefulAuthHelper.Status.INIT)
+
+            OAuthHelper.interactive(newOkHttpAdapter(), createMockCredentials(AuthMethod.WEBAPP)).authStatus
+                .should.equal(StatefulAuthHelper.Status.INIT)
         }
 
         it("should throw an Exception when given a non-installedApp Credentials") {