javascript-ampache 1.1.9 → 1.1.10

package/dist/utils.d.ts

@@ -1,2 +1,4 @@
+import { Base } from "./base";
 export declare function applyMixins(derivedCtor: any, baseCtors: any[]): void;
 export declare function encryptPassword(password: string, time: number): string;
+export declare function outputDebugURL(url: string, config: Base): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-ampache",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "A JS library for the Ampache API",
   "main": "dist/index.js",
   "module": "dist/index.m.js",

package/src/auth/index.ts

@@ -3,6 +3,7 @@ import qs from "querystringify";
 import fetch from "isomorphic-unfetch";
 import { Base, Success } from "../base";
 import { AuthResponse } from "./types";
+import { outputDebugURL } from "../utils";
 
 export class Auth extends Base {
   /**
@@ -20,6 +21,8 @@ export class Auth extends Base {
     timestamp?: number;
     version?: string;
   }) {
+    let token = params.auth;
+
     // generate a timestamp if one wasn't provided
     if (!params.timestamp) {
       params.timestamp = Math.floor(new Date().getTime() / 1000);
@@ -35,10 +38,22 @@ export class Auth extends Base {
       delete params.timestamp;
     }
 
+    // not needed if using Bearer token
+    if (this.useBearerToken) {
+      delete params.auth;
+    }
+
     let query = this.url + "/server/json.server.php?action=handshake";
     query += qs.stringify(params, "&");
 
-    return fetch(query)
+    if (this.debug) {
+      outputDebugURL(query, this);
+    }
+
+    return fetch(query, {
+      method: "GET",
+      headers: this.useBearerToken ? { Authorization: "Bearer " + token } : {},
+    })
       .then((response) => response.json())
       .then((data) => {
         if (data.auth) {

package/src/base.ts

@@ -1,10 +1,11 @@
 import fetch from "isomorphic-unfetch";
 import qs from "querystringify";
+import { outputDebugURL } from "./utils";
 
 type Config = {
   url: string;
   sessionKey?: string;
-  useBearerToken: false;
+  useBearerToken?: boolean;
   debug?: boolean;
 };
 
@@ -51,7 +52,6 @@ export abstract class Base {
   }
 
   protected request<T>(endpoint: string): Promise<T> {
-    let authString = "&auth=" + this.sessionKey;
     let url =
       this.url +
       "/server/json.server.php?action=" +
@@ -60,21 +60,16 @@ export abstract class Base {
       this.version;
 
     if (!this.useBearerToken) {
-      url += authString;
+      url += "&auth=" + this.sessionKey;
     }
 
     if (this.debug) {
-      console.debug(
-        "javascript-ampache query URL %c" + url,
-        "color: black; font-style: italic; background-color: orange;padding: 2px",
-      );
+      outputDebugURL(url, this);
     }
 
     return fetch(url, {
       method: "GET",
-      headers: {
-        Authorization: this.useBearerToken ? "Bearer " + this.sessionKey : undefined,
-      },
+      headers: this.useBearerToken ? { Authorization: "Bearer " + this.sessionKey } : {},
     }).then((r) => {
       if (r.ok) {
         return r.json();
@@ -84,28 +79,22 @@ export abstract class Base {
   }
 
   protected binary<T>(endpoint: string): Promise<Blob> {
-    let authString = "&auth=" + this.sessionKey;
     let url =
       this.url +
       "/server/json.server.php?action=" + endpoint +
       "&version=" + this.version;
 
     if (!this.useBearerToken) {
-      url += authString;
+      url += "&auth=" + this.sessionKey;
     }
 
     if (this.debug) {
-      console.debug(
-        "javascript-ampache query URL %c" + url,
-        "color: black; font-style: italic; background-color: orange;padding: 2px",
-      );
+      outputDebugURL(url, this);
     }
 
     return fetch(url, {
       method: "GET",
-      headers: {
-        Authorization: this.useBearerToken ? "Bearer " + this.sessionKey : undefined,
-      },
+      headers: this.useBearerToken ? { Authorization: "Bearer " + this.sessionKey } : {},
     })
       .then((response) => response.blob())
       .then((r) => {
@@ -123,7 +112,6 @@ export abstract class Base {
    * @param [params]
    */
   public rawURL(endpoint: string, params?: {}) {
-    let authString = "&auth=" + this.sessionKey;
     let query = endpoint;
     query += qs.stringify(params, "&");
 
@@ -133,14 +121,11 @@ export abstract class Base {
       "&version=" + this.version;
 
     if (!this.useBearerToken) {
-      url += authString;
+      url += "&auth=" + this.sessionKey;
     }
 
     if (this.debug) {
-      console.debug(
-        "javascript-ampache query URL %c" + url,
-        "color: black; font-style: italic; background-color: orange;padding: 2px",
-      );
+      outputDebugURL(url, this);
     }
 
     return url;

package/src/utils.ts

@@ -1,25 +1,40 @@
-import JsSHA from "jssha/dist/sha256";
-
-export function applyMixins(derivedCtor: any, baseCtors: any[]) {
-  baseCtors.forEach((baseCtor) => {
-    Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
-      Object.defineProperty(
-        derivedCtor.prototype,
-        name,
-        Object.getOwnPropertyDescriptor(baseCtor.prototype, name),
-      );
-    });
-  });
-}
-
-export function encryptPassword(password: string, time: number) {
-  let key = getSHA256(password);
-  return getSHA256(time + key);
-
-  function getSHA256(text) {
-    let shaObj = new JsSHA("SHA-256", "TEXT", { encoding: "UTF8" });
-    shaObj.update(text);
-
-    return shaObj.getHash("HEX");
-  }
-}
+import JsSHA from "jssha/dist/sha256";
+import { Base } from "./base";
+
+export function applyMixins(derivedCtor: any, baseCtors: any[]) {
+  baseCtors.forEach((baseCtor) => {
+    Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
+      Object.defineProperty(
+        derivedCtor.prototype,
+        name,
+        Object.getOwnPropertyDescriptor(baseCtor.prototype, name),
+      );
+    });
+  });
+}
+
+export function encryptPassword(password: string, time: number) {
+  let key = getSHA256(password);
+  return getSHA256(time + key);
+
+  function getSHA256(text) {
+    let shaObj = new JsSHA("SHA-256", "TEXT", { encoding: "UTF8" });
+    shaObj.update(text);
+
+    return shaObj.getHash("HEX");
+  }
+}
+
+export function outputDebugURL(url: string, config: Base) {
+  let label = "javascript-ampache query URL";
+
+  if (config.useBearerToken) {
+    label = "(Using Bearer token, auth added for debugging) - " + label;
+    url += "&auth=" + config.sessionKey;
+  }
+
+  console.debug(
+      label + " %c" + url,
+      "color: black; font-style: italic; background-color: orange;padding: 2px",
+  );
+}