jonathan/combine.fm
jonathan/combine.fm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Change Google auth strategy

Browse source
This commit is contained in:
Jonathan Cremin 2018-03-11 20:22:17 +00:00
parent 0d4bd47251
commit bd85678303
5 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -30,3 +30,7 @@ watch-frontend: ## Build and watch frontend for changes
.PHONY: docker-compose-up .PHONY: docker-compose-up
docker-compose-up: ## Start (and create) docker containers docker-compose-up: ## Start (and create) docker containers
docker-compose up -d docker-compose up -d
.PHONY: yarn
yarn: ## Migrate database schema
docker-compose run --rm app yarn

8
docker-compose.yml
View file

@ -8,8 +8,8 @@ services:
VUE_ENV: server VUE_ENV: server
DATABASE_URL: DATABASE_URL:
REDIS_URL: REDIS_URL:
GOOGLE_EMAIL: GOOGLE_ANDROID_ID:
GOOGLE_PASSWORD: GOOGLE_MASTER_TOKEN:
XBOX_CLIENT_ID: XBOX_CLIENT_ID:
XBOX_CLIENT_SECRET: XBOX_CLIENT_SECRET:
YOUTUBE_KEY: YOUTUBE_KEY:
@ -27,8 +27,8 @@ services:
VUE_ENV: server VUE_ENV: server
DATABASE_URL: DATABASE_URL:
REDIS_URL: REDIS_URL:
GOOGLE_EMAIL: GOOGLE_ANDROID_ID:
GOOGLE_PASSWORD: GOOGLE_MASTER_TOKEN:
XBOX_CLIENT_ID: XBOX_CLIENT_ID:
XBOX_CLIENT_SECRET: XBOX_CLIENT_SECRET:
YOUTUBE_KEY: YOUTUBE_KEY:

4
lib/services.js
View file

@ -3,8 +3,8 @@ import fs from 'fs';
const services = []; const services = [];
fs.readdirSync(path.join(__dirname, 'services')).forEach(function(file) { fs.readdirSync(path.join(__dirname, 'services')).forEach((file) => {
var service = require(path.join(__dirname, 'services', file)); const service = require(path.join(__dirname, 'services', file));
if (service.search) { if (service.search) {
services.push(service); services.push(service);
} }

11
lib/services/google/index.js
View file

@ -8,11 +8,16 @@ const debug = debuglog('combine.fm:google');
const pm = bluebird.promisifyAll(new PlayMusic()); const pm = bluebird.promisifyAll(new PlayMusic());
if (!process.env.GOOGLE_EMAIL || !process.env.GOOGLE_PASSWORD) { if (!(process.env.GOOGLE_EMAIL && process.env.GOOGLE_PASSWORD) && !(process.env.GOOGLE_ANDROID_ID && process.env.GOOGLE_MASTER_TOKEN)) {
debug('GOOGLE_EMAIL or GOOGLE_PASSWORD environment variables not found, deactivating Google Play Music.'); 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); debug(err);
}); });

3
public/src/app.vue
View file

@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h1 class="title"> <h1 class="title">
<router-link to="/" exact> <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> </router-link>
</h1> </h1>
</div> </div>
@ -35,6 +35,7 @@ body {
} }
.header { .header {
font-family: 'Comfortaa', cursive; font-family: 'Comfortaa', cursive;
letter-spacing: -2px;
background: #FE4365; background: #FE4365;
} }
.header img { .header img {