fix(deezer): Fix deezer passport generation

FoxxMD · Sep 14, 2023 · d5dfc33 · d5dfc33
1 parent 6dc40e5
commit d5dfc33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/backend/server/deezerRoutes.ts b/src/backend/server/deezerRoutes.ts
@@ -11,10 +11,10 @@ import passport from "passport";
 export const setupDeezerRoutes = (app: ExpressWithAsync, logger: Logger, scrobbleSources: ScrobbleSources) => {
 
     // initialize deezer strategies
-    const deezerSources = scrobbleSources.getByType('deezer') as DeezerSource[];
-    for(const d of deezerSources) {
-        passport.use(`deezer-${d.name}`, d.generatePassportStrategy());
-    }
+    // const deezerSources = scrobbleSources.getByType('deezer') as DeezerSource[];
+    // for(const d of deezerSources) {
+    //     passport.use(`deezer-${d.name}`, d.generatePassportStrategy());
+    // }
 
     // something about the deezer passport strategy makes express continue with the response even though it should wait for accesstoken callback and userprofile fetching
     // so to get around this add an additional middleware that loops/sleeps until we should have fetched everything ¯\_(ツ)_/¯
@@ -34,6 +34,7 @@ export const setupDeezerRoutes = (app: ExpressWithAsync, logger: Logger, scrobbl
                 return res.send('Error with deezer credentials storage');
             } else if(entity.config.data.accessToken !== undefined) {
                 // start polling
+                await entity.testAuth();
                 entity.poll()
                 return res.redirect('/');
             } else {

diff --git a/src/backend/sources/DeezerSource.ts b/src/backend/sources/DeezerSource.ts
@@ -1,4 +1,5 @@
 import request from 'superagent';
+import passport from "passport";
 import {
     parseRetryAfterSecsFromObj,
     readJson,
@@ -99,6 +100,7 @@ export default class DeezerSource extends AbstractSource {
             this.logger.info(`Redirect URL that will be used on auth callback: '${this.redirectUri}'`);
         }
         this.initialized = true;
+        passport.use(`deezer-${this.name}`, this.generatePassportStrategy());
         return this.initialized;
     }
 

diff --git a/src/backend/sources/ScrobbleSources.ts b/src/backend/sources/ScrobbleSources.ts
@@ -230,8 +230,8 @@ export default class ScrobbleSources {
                     break;
                 case 'deezer':
                     const d = {
-                        clientId: process.env.DEEZER_APP_ID,
-                        clientSecret: process.env.DEEZER_SECRET_KEY,
+                        clientId: process.env.DEEZER_CLIENT_ID,
+                        clientSecret: process.env.DEEZER_CLIENT_SECRET,
                         redirectUri: process.env.DEEZER_REDIRECT_URI,
                         accessToken: process.env.DEEZER_ACCESS_TOKEN,
                     };