From bd85678303a384335e92de07554591a9d45d1e45 Mon Sep 17 00:00:00 2001
From: Jonathan Cremin <jonathan@crem.in>
Date: Sun, 11 Mar 2018 20:22:17 +0000
Subject: [PATCH] Change Google auth strategy

---
 Makefile                     |  4 ++++
 docker-compose.yml           |  8 ++++----
 lib/services.js              |  4 ++--
 lib/services/google/index.js | 11 ++++++++---
 public/src/app.vue           |  3 ++-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9fa6866..11029a8 100644
--- a/Makefile
+++ b/Makefile
@@ -30,3 +30,7 @@ watch-frontend: ## Build and watch frontend for changes
 .PHONY: docker-compose-up
 docker-compose-up: ## Start (and create) docker containers
 	docker-compose up -d
+
+.PHONY: yarn
+yarn: ## Migrate database schema
+	docker-compose run --rm app yarn
diff --git a/docker-compose.yml b/docker-compose.yml
index e9735f3..f3d0bc3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,8 @@ services:
       VUE_ENV: server
       DATABASE_URL:
       REDIS_URL:
-      GOOGLE_EMAIL:
-      GOOGLE_PASSWORD:
+      GOOGLE_ANDROID_ID:
+      GOOGLE_MASTER_TOKEN:
       XBOX_CLIENT_ID:
       XBOX_CLIENT_SECRET:
       YOUTUBE_KEY:
@@ -27,8 +27,8 @@ services:
       VUE_ENV: server
       DATABASE_URL:
       REDIS_URL:
-      GOOGLE_EMAIL:
-      GOOGLE_PASSWORD:
+      GOOGLE_ANDROID_ID:
+      GOOGLE_MASTER_TOKEN:
       XBOX_CLIENT_ID:
       XBOX_CLIENT_SECRET:
       YOUTUBE_KEY:
diff --git a/lib/services.js b/lib/services.js
index 790c9f3..f48ecb0 100644
--- a/lib/services.js
+++ b/lib/services.js
@@ -3,8 +3,8 @@ import fs from 'fs';
 
 const services = [];
 
-fs.readdirSync(path.join(__dirname, 'services')).forEach(function(file) {
-  var service = require(path.join(__dirname, 'services', file));
+fs.readdirSync(path.join(__dirname, 'services')).forEach((file) => {
+  const service = require(path.join(__dirname, 'services', file));
   if (service.search) {
     services.push(service);
   }
diff --git a/lib/services/google/index.js b/lib/services/google/index.js
index 427184e..64896e7 100644
--- a/lib/services/google/index.js
+++ b/lib/services/google/index.js
@@ -8,11 +8,16 @@ const debug = debuglog('combine.fm:google');
 
 const pm = bluebird.promisifyAll(new PlayMusic());
 
-if (!process.env.GOOGLE_EMAIL || !process.env.GOOGLE_PASSWORD) {
-  debug('GOOGLE_EMAIL or GOOGLE_PASSWORD environment variables not found, deactivating Google Play Music.');
+if (!(process.env.GOOGLE_EMAIL && process.env.GOOGLE_PASSWORD) && !(process.env.GOOGLE_ANDROID_ID && process.env.GOOGLE_MASTER_TOKEN)) {
+  debug('Required GOOGLE_* environment variables not found, deactivating Google Play Music.');
 }
 
-let ready = pm.initAsync({email: process.env.GOOGLE_EMAIL, password: process.env.GOOGLE_PASSWORD}).catch(function(err) {
+const creds = {
+  androidId: process.env.GOOGLE_ANDROID_ID,
+  masterToken: process.env.GOOGLE_MASTER_TOKEN,
+}
+
+let ready = pm.initAsync(creds).catch(function(err) {
   debug(err);
 });
 
diff --git a/public/src/app.vue b/public/src/app.vue
index 7333db0..68f62a6 100644
--- a/public/src/app.vue
+++ b/public/src/app.vue
@@ -4,7 +4,7 @@
       <div class="container">
         <h1 class="title">
           <router-link to="/" exact>
-            <img src="/assets/images/logo-128.png"> <b>combine</b><span class="lighter">.fm</span>
+            <img src="/assets/images/logo-128.png"><b>combine</b><span class="lighter">.fm</span>
           </router-link>
         </h1>
       </div>
@@ -35,6 +35,7 @@ body {
 }
 .header {
   font-family: 'Comfortaa', cursive;
+  letter-spacing: -2px;
   background: #FE4365;
 }
 .header img {