Authenticate from configuration file

Author: devgianlu

conf.properties

@@ -1,3 +1,13 @@
-# Configuration!
+## Device name
 deviceName=librespot-java
-deviceType=Computer
+## Device type (Computer, Tablet, Smartphone, Speaker, TV, AVR, STB, AudioDongle, Unknown)
+deviceType=Computer
+# Authentication
+## Strategy (userPass, zeroconf, blob, facebook)
+auth.strategy=zeroconf
+## Spotify username (blob, userPass)
+auth.username=
+## Spotify password (userPass)
+auth.password=
+## Spotify authentication blob (blob)
+auth.blob=

core/src/main/java/xyz/gianlu/librespot/AbsConfiguration.java

@@ -1,14 +1,15 @@
 package xyz.gianlu.librespot;
 
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.core.AuthConfiguration;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.player.CacheManager;
 import xyz.gianlu.librespot.player.Player;
 
 /**
  * @author Gianlu
  */
-public abstract class AbsConfiguration implements Player.PlayerConfiguration, CacheManager.CacheConfiguration {
+public abstract class AbsConfiguration implements Player.PlayerConfiguration, CacheManager.CacheConfiguration, AuthConfiguration {
 
     @Nullable
     public abstract String deviceName();

core/src/main/java/xyz/gianlu/librespot/DefaultConfiguration.java

@@ -1,6 +1,7 @@
 package xyz.gianlu.librespot;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.player.TrackHandler;
 
@@ -61,4 +62,25 @@ public String deviceName() {
     public Session.DeviceType deviceType() {
         return Session.DeviceType.Computer;
     }
+
+    @Override
+    public @Nullable String username() {
+        return null;
+    }
+
+    @Override
+    public @Nullable String password() {
+        return null;
+    }
+
+    @Override
+    public @Nullable String blob() {
+        return null;
+    }
+
+    @NotNull
+    @Override
+    public Strategy strategy() {
+        return Strategy.ZEROCONF;
+    }
 }

core/src/main/java/xyz/gianlu/librespot/FileConfiguration.java

@@ -1,5 +1,6 @@
 package xyz.gianlu.librespot;
 
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.core.Session;
@@ -39,6 +40,18 @@ private float getFloat(@NotNull String key, float fallback) {
         }
     }
 
+    @Contract("_, _, !null -> !null")
+    private <E extends Enum<E>> E getEnum(@NotNull Class<E> clazz, @NotNull String key, @Nullable E fallback) {
+        String val = properties.getProperty(key, null);
+        if (val == null) return fallback;
+
+        try {
+            return Enum.valueOf(clazz, val);
+        } catch (RuntimeException ex) {
+            return fallback;
+        }
+    }
+
     @Override
     public boolean cacheEnabled() {
         return getBoolean("cache.enabled", defaults.cacheEnabled());
@@ -76,8 +89,27 @@ public float normalisationPregain() {
 
     @Override
     public @Nullable Session.DeviceType deviceType() {
-        String val = properties.getProperty("deviceType", null);
-        if (val == null) return null;
-        return Session.DeviceType.valueOf(val);
+        return getEnum(Session.DeviceType.class, "deviceType", null);
+    }
+
+    @Override
+    public @Nullable String username() {
+        return properties.getProperty("auth.username", null);
+    }
+
+    @Override
+    public @Nullable String password() {
+        return properties.getProperty("auth.password", null);
+    }
+
+    @Override
+    public @Nullable String blob() {
+        return properties.getProperty("auth.blob", null);
+    }
+
+    @NotNull
+    @Override
+    public Strategy strategy() {
+        return getEnum(Strategy.class, "auth.strategy", defaults.strategy());
     }
 }

core/src/main/java/xyz/gianlu/librespot/core/AuthConfiguration.java

@@ -0,0 +1,26 @@
+package xyz.gianlu.librespot.core;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Gianlu
+ */
+public interface AuthConfiguration {
+    @Nullable
+    String username();
+
+    @Nullable
+    String password();
+
+    @Nullable
+    String blob();
+
+    @NotNull
+    Strategy strategy();
+
+    enum Strategy {
+        FACEBOOK, BLOB,
+        USER_PASS, ZEROCONF
+    }
+}

core/src/main/java/xyz/gianlu/librespot/core/Session.java

@@ -399,6 +399,7 @@ private Inner(DeviceType deviceType, String deviceName, AbsConfiguration configu
     public static class Builder {
         private final Inner inner;
         private Authentication.LoginCredentials loginCredentials = null;
+        private AuthConfiguration authConf;
 
         public Builder(@NotNull DeviceType deviceType, @NotNull String deviceName, @NotNull AbsConfiguration configuration) {
             this.inner = new Inner(deviceType, deviceName, configuration);
@@ -414,6 +415,7 @@ public Builder(@NotNull AbsConfiguration configuration) {
                 throw new IllegalArgumentException("Device type required!");
 
             this.inner = new Inner(deviceType, deviceName, configuration);
+            this.authConf = configuration;
         }
 
         public Builder facebook() throws IOException {
@@ -450,7 +452,36 @@ public Builder userPass(@NotNull String username, @NotNull String password) {
 
         @NotNull
         public Session create() throws IOException, GeneralSecurityException, SpotifyAuthenticationException, MercuryClient.PubSubException, SpotifyIrc.IrcException {
-            if (loginCredentials == null) throw new IllegalStateException("Missing credentials!");
+            if (loginCredentials == null) {
+                if (authConf != null) {
+                    String blob = authConf.blob();
+                    String username = authConf.username();
+                    String password = authConf.password();
+
+                    switch (authConf.strategy()) {
+                        case FACEBOOK:
+                            facebook();
+                            break;
+                        case BLOB:
+                            if (username == null) throw new IllegalArgumentException("Missing username!");
+                            if (blob == null) throw new IllegalArgumentException("Missing blob!");
+                            blob(username, Base64.getDecoder().decode(blob));
+                            break;
+                        case USER_PASS:
+                            if (username == null) throw new IllegalArgumentException("Missing username!");
+                            if (password == null) throw new IllegalArgumentException("Missing password!");
+                            userPass(username, password);
+                            break;
+                        case ZEROCONF:
+                            zeroconf();
+                            break;
+                        default:
+                            throw new IllegalStateException("Unknown auth strategy: " + authConf.strategy());
+                    }
+                } else {
+                    throw new IllegalStateException("Missing credentials!");
+                }
+            }
 
             Session session = new Session(inner, ApResolver.getSocketFromRandomAccessPoint());
             session.connect();