Add pass auth config to endpoints

README.md

@@ -202,8 +202,8 @@ import { Api } from '@dpgradio/creative'
 const api = new Api('https://api.qmusic.be')
 
 api.setRadioToken(token)
-api.request({ passAuth: true }).post(`/forbidden_words/${id}/detections`) // for authenticated endpoints
-api.request().get(`/forbidden_words/${id}`) // for non-authenticate endpoints
+api.withAuth().request().post('/some-non-predefined-endpoint') // for authenticated endpoints
+api.request().get('/some-non-predefined-endpoint') // for non-authenticate endpoints
 
 ```
 

src/api/api.js

@@ -43,19 +43,11 @@ export class Api {
     return this.baseUrlOverride || config('api_base_url')
   }
 
-  request(config = { passAuth: false }) {
+  request() {
     const modifiers = [...this.requestModifiers]
 
     this.apiKey && modifiers.push((request) => request.withQueryParameters({ api_key: this.apiKey }))
 
-    if (config.passAuth) {
-      if (this.radioToken) {
-        modifiers.push((request) => request.withHeader('Authorization', `Bearer ${this.radioToken}`))
-      } else {
-        throw new Error('No currentUserToken available')
-      }
-    }
-
     return tap(new Request(this.baseUrl, this.version, this.errorHandlers), (request) => {
       modifiers.forEach((modifier) => modifier(request))
     })
@@ -79,6 +71,15 @@ export class Api {
     return tap(this.clone(), (api) => (api.baseUrlOverride = GLOBAL_API_URL))
   }
 
+  withAuth() {
+    return tap(this.clone(), (api) => {
+      if (!this.radioToken) {
+        throw new Error('No currentUserToken available')
+      }
+      api.requestModifiers.push((request) => request.withHeader('Authorization', `Bearer ${this.radioToken}`))
+    })
+  }
+
   addErrorHandler(handler) {
     this.errorHandlers.push(handler)
     return this
@@ -88,7 +89,6 @@ export class Api {
     return tap(new Api(this.baseUrlOverride, this.version), (api) => {
       api.apiKey = this.apiKey
       api.radioToken = this.radioToken
-      api.requestModifiers = this.requestModifiers
       api.errorHandlers = this.errorHandlers
     })
   }

src/api/endpoints/Endpoint.js

@@ -24,8 +24,8 @@ export default class Endpoint {
    * @param {requestCallback} callback
    * @returns {object}
    */
-  async requestData(callback, key = 'data', config = { passAuth: false }) {
-    const response = await callback(this.api.request(config))
+  async requestData(callback, key = 'data') {
+    const response = await callback(this.api.request())
 
     if (response === null) {
       throw new Error(`Endpoint returned invalid JSON.`)
@@ -40,8 +40,8 @@ export default class Endpoint {
    * @param {requestCallback} callback
    * @returns {PaginatedResponse}
    */
-  async requestPaginatedData(callback, key = 'data', config = { passAuth: false }) {
-    const response = await callback(this.api.request(config))
+  async requestPaginatedData(callback, key = 'data', config = { withAuth: false }) {
+    const response = await callback(config.withAuth ? this.api.withAuth().request() : this.api.request())
 
     if (response === null) {
       throw new Error(`Endpoint returned invalid JSON.`)

src/api/endpoints/ForbiddenWord.js

@@ -2,6 +2,6 @@ import Endpoint from './Endpoint.js'
 
 export default class ForbiddenWord extends Endpoint {
   async detection(id) {
-    await this.api.request({ passAuth: true }).post(`/forbidden_words/${id}/detections`)
+    await this.api.withAuth().request().post(`/forbidden_words/${id}/detections`)
   }
 }

src/api/endpoints/Members.js

@@ -2,10 +2,10 @@ import Endpoint from './Endpoint.js'
 
 export default class Members extends Endpoint {
   async me() {
-    return await this.api.request({ passAuth: true }).get('/members/me')
+    return await this.api.withAuth().request().get('/members/me')
   }
 
   async updateProfile(profile) {
-    return await this.api.request({ passAuth: true }).put('/members/me', { profile })
+    return await this.api.withAuth().request().put('/members/me', { profile })
   }
 }

src/api/endpoints/Ratings.js

@@ -2,14 +2,14 @@ import Endpoint from './Endpoint.js'
 
 export default class Ratings extends Endpoint {
   async allForMember() {
-    return await this.requestPaginatedData((r) => r.get('/members/me/ratings'), 'ratings', { passAuth: true })
+    return await this.requestPaginatedData((r) => r.get('/members/me/ratings'), 'ratings', { withAuth: true })
   }
 
   async like(selectorCode) {
-    await this.api.request({ passAuth: true }).post(`/tracks/${selectorCode}/ratings`, { rating: 1 })
+    await this.api.withAuth().request().post(`/tracks/${selectorCode}/ratings`, { rating: 1 })
   }
 
   async unlike(selectorCode) {
-    await this.api.request({ passAuth: true }).delete(`/tracks/${selectorCode}/ratings`)
+    await this.api.withAuth().request().delete(`/tracks/${selectorCode}/ratings`)
   }
 }

src/api/endpoints/Requests.js

@@ -2,7 +2,7 @@ import Endpoint from './Endpoint.js'
 
 export default class Requests extends Endpoint {
   async requestTrack(eventSlug, request) {
-    return await this.api.request({ passAuth: true }).post(`/requests/${eventSlug}`, request)
+    return await this.api.withAuth().request().post(`/requests/${eventSlug}`, request)
   }
 
   async requestsForTrack(eventSlug, selectorCode) {