refactor: removes /api, /api/platform and /api/v1 slugs

src/config.js

@@ -1,13 +1,13 @@
 const DEFAULT_ACCOUNT_URL = "https://accounts.platform.sh";
-const DEFAULT_API_URL = "https://api.platform.sh/api";
+const DEFAULT_API_URL = "https://api.platform.sh";
 
 const getConfigDefault = (
   baseUrl = DEFAULT_ACCOUNT_URL,
   api_url = DEFAULT_API_URL
 ) => ({
   provider: "cg",
   client_id: "[email protected]",
-  account_url: `${baseUrl}/api`,
+  account_url: `${baseUrl}`,
   api_url,
   authentication_url: baseUrl,
   scope: [],

src/index.js

@@ -66,11 +66,9 @@ export default class Client {
       }
       const { account_url } = getConfig();
 
-      return request(`${account_url}/platform/projects/${id}`, "GET").then(
-        result => {
-          return result.endpoint || false;
-        }
-      );
+      return request(`${account_url}/projects/${id}`, "GET").then(result => {
+        return result.endpoint || false;
+      });
     });
   }
 
@@ -463,7 +461,7 @@ export default class Client {
     if (country_code) query.country_code = country_code;
     const { api_url } = getConfig();
 
-    return request(`${api_url}/v1/subscriptions/estimate`, "GET", query);
+    return request(`${api_url}/subscriptions/estimate`, "GET", query);
   }
 
   /**
@@ -629,7 +627,7 @@ export default class Client {
    */
   getCardOnFile() {
     const { api_url } = getConfig();
-    const card = request(`${api_url}/platform/cardonfile`, "GET");
+    const card = request(`${api_url}/cardonfile`, "GET");
     return card;
   }
 
@@ -731,7 +729,7 @@ export default class Client {
   async updateUserProfile(id, data) {
     const { api_url } = getConfig();
     const updatedProfile = await request(
-      `${api_url}/platform/profiles/${id}`,
+      `${api_url}/profiles/${id}`,
       "PATCH",
       data
     );
@@ -746,7 +744,7 @@ export default class Client {
    */
   getSetupRegistry() {
     const { api_url } = getConfig();
-    return request(`${api_url}/platform/setup/registry`, "POST").then(data => {
+    return request(`${api_url}/setup/registry`, "POST").then(data => {
       return typeof data === "undefined"
         ? undefined
         : Object.entries(data).reduce((items, [key, value]) => {
@@ -783,7 +781,7 @@ export default class Client {
    */
   getSetupRegistry() {
     const { api_url } = getConfig();
-    return request(`${api_url}/platform/setup/registry`, "POST").then(data => {
+    return request(`${api_url}/setup/registry`, "POST").then(data => {
       return typeof data === "undefined"
         ? undefined
         : Object.entries(data).reduce((items, [key, value]) => {
@@ -834,7 +832,7 @@ export default class Client {
     const { api_url } = getConfig();
 
     const user = await request(
-      `${api_url}/v1/profiles?filter[username]=${username}`
+      `${api_url}/profiles?filter[username]=${username}`
     );
 
     return new entities.AccountsProfile(user.profiles[0]);

src/model/Account.js

@@ -1,7 +1,7 @@
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const url = "/platform/users/:id";
+const url = "/users/:id";
 const paramDefaults = {};
 
 export default class Account extends Ressource {

src/model/AccountsProfile.js

@@ -3,7 +3,7 @@ import { getConfig } from "../config";
 import request from "../api";
 import _urlParser from "../urlParser";
 
-const url = "/platform/profiles/:id";
+const url = "/profiles/:id";
 const paramDefaults = {};
 const createableField = [
   "id",
@@ -90,19 +90,19 @@ export default class AccountsProfile extends Ressource {
     const { api_url } = getConfig();
 
     const user = await request(
-      `${api_url}/v1/profiles?filter[username]=${username}`
+      `${api_url}/profiles?filter[username]=${username}`
     );
 
     return new AccountsProfile(user.profiles[0]);
   }
 
   static updateProfilePicture(userId, picture) {
     const { api_url } = getConfig();
-    return request(`${api_url}/v1/profile/${userId}/picture`, "POST", picture);
+    return request(`${api_url}/profile/${userId}/picture`, "POST", picture);
   }
 
   static async deleteProfilePicture(userId) {
     const { api_url } = getConfig();
-    return request(`${api_url}/v1/profile/${userId}/picture`, "DELETE");
+    return request(`${api_url}/profile/${userId}/picture`, "DELETE");
   }
 }

src/model/Address.js

@@ -2,7 +2,7 @@ import Ressource from "./Ressource";
 import { getConfig } from "../config";
 import _urlParser from "../urlParser";
 
-const url = "/v1/profiles/:id/address";
+const url = "/profiles/:id/address";
 const paramDefaults = {};
 
 export default class Address extends Ressource {

src/model/Comment.js

@@ -2,7 +2,7 @@ import Ressource from "./Ressource";
 import { getConfig } from "../config";
 import request from "../api";
 
-const url = "/v1/comments";
+const url = "/comments";
 const paramDefaults = {};
 
 export default class Comment extends Ressource {

src/model/Me.js

@@ -2,7 +2,7 @@ import User from "./User";
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const url = "/platform/me";
+const url = "/me";
 const paramDefaults = {};
 const modifiableField = [
   "picture",
@@ -46,7 +46,7 @@ export default class Me extends User {
   async update(data) {
     const { api_url } = getConfig();
 
-    const result = await super.update(data, `${api_url}/platform/profiles/:id`);
+    const result = await super.update(data, `${api_url}/profiles/:id`);
 
     return new Me(result.data); // Account API does not return a Result
   }

src/model/Order.js

@@ -1,7 +1,7 @@
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const url = "/v1/orders/:id";
+const url = "/orders/:id";
 const paramDefaults = {};
 
 export default class Order extends Ressource {

src/model/PaymentSource.js

@@ -4,7 +4,7 @@ import Result from "./Result";
 import _urlParser from "../urlParser";
 import request from "../api";
 
-const url = "/platform/payment_source";
+const url = "/payment_source";
 const paramDefaults = {};
 const creatableField = ["type", "token", "email"];
 

src/model/Region.js

@@ -1,7 +1,7 @@
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const url = "/platform/regions";
+const url = "/regions";
 const paramDefaults = {};
 
 export default class Region extends Ressource {

src/model/SetupConfig.js

@@ -3,7 +3,7 @@ import { getConfig } from "../config";
 import _urlParser from "../urlParser";
 import request from "../api";
 
-const _url = "/platform/setup/config";
+const _url = "/setup/config";
 const paramDefaults = {};
 
 export default class SetupConfig extends Ressource {

src/model/SetupRegistry.js

@@ -3,9 +3,9 @@ import { getConfig } from "../config";
 import _urlParser from "../urlParser";
 import request from "../api";
 
-const _url = "/platform/setup/registry";
+const _url = "/setup/registry";
 const paramDefaults = {};
-// /api/platform/setup/registry\?service\=redis-persistent
+// /setup/registry\?service\=redis-persistent
 
 export default class SetupRegistry extends Ressource {
   constructor(registry, url = `${_url}?service=:name`, modifiableField = []) {

src/model/SshKey.js

@@ -5,7 +5,7 @@ import _urlParser from "../urlParser";
 import { getConfig } from "../config";
 
 const paramDefaults = {};
-const url = "/v1/ssh_keys/:id";
+const url = "/ssh_keys/:id";
 
 export default class SshKey extends Ressource {
   constructor(sshKey) {

src/model/Subscription.js

@@ -20,7 +20,7 @@ const creatableField = [
 
 const modifiableField = ["plan", "environments", "storage", "big_dev"];
 
-const url = "/v1/subscriptions/:id";
+const url = "/subscriptions/:id";
 const STATUS_ACTIVE = "active";
 const STATUS_REQUESTED = "requested";
 const STATUS_PROVISIONING = "provisioning";
@@ -177,7 +177,7 @@ export default class Subscription extends Ressource {
    */
   getOwner() {
     const id = this.owner;
-    const url = this.makeAbsoluteUrl("/api/users", this.getLink("project"));
+    const url = this.makeAbsoluteUrl("/users", this.getLink("project"));
 
     return Account.get({ id }, url);
   }

src/model/Team.js

@@ -4,7 +4,7 @@ import { getConfig } from "../config";
 import TeamMember from "./TeamMember";
 
 const paramDefaults = {};
-const _url = "/platform/teams";
+const _url = "/teams";
 
 const creatableField = ["name", "parent", "id"];
 const modifiableField = ["name"];

src/model/TeamMember.js

@@ -2,7 +2,7 @@ import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
 const paramDefaults = {};
-const _url = "/platform/teams/:teamId/members";
+const _url = "/teams/:teamId/members";
 
 const creatableField = ["role"];
 

src/model/Ticket.js

@@ -2,7 +2,7 @@ import Ressource from "./Ressource";
 import { getConfig } from "../config";
 import request from "../api";
 
-const url = "/v1/tickets";
+const url = "/tickets";
 const paramDefaults = {};
 
 export default class Ticket extends Ressource {
@@ -23,14 +23,14 @@ export default class Ticket extends Ressource {
 
   static getAttachments(ticketId) {
     const { api_url } = getConfig();
-    const url = `/v1/comments/${ticketId}/description`;
+    const url = `/comments/${ticketId}/description`;
 
     return super.get(`${api_url}${url}`, {}, paramDefaults, {});
   }
 
   static getAllAttachments(ticketId) {
     const { api_url } = getConfig();
-    const url = `/v1/comments/${ticketId}/attachments`;
+    const url = `/comments/${ticketId}/attachments`;
 
     return request(`${api_url}${url}`, "GET");
   }

src/model/TicketPriority.js

@@ -1,7 +1,7 @@
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const url = "/v1/tickets/priority";
+const url = "/tickets/priority";
 const paramDefaults = {};
 
 export default class TicketPriority extends Ressource {

src/model/User.js

@@ -1,7 +1,7 @@
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const _url = "/api/users";
+const _url = "/users";
 const paramDefaults = {};
 
 export default class User extends Ressource {

src/model/Voucher.js

@@ -1,7 +1,7 @@
 import Ressource from "./Ressource";
 import { getConfig } from "../config";
 
-const url = "/v1/vouchers";
+const url = "/vouchers";
 const paramDefaults = {};
 
 export default class Voucher extends Ressource {

test/Account.spec.js

@@ -19,7 +19,7 @@ describe("Account", () => {
   });
 
   it("Get account", done => {
-    fetchMock.mock(`${account_url}/platform/users/1`, {
+    fetchMock.mock(`${account_url}/users/1`, {
       id: 1,
       email: "[email protected]"
     });
@@ -40,10 +40,7 @@ describe("Account", () => {
       { id: 4, email: "test4" }
     ];
 
-    fetchMock.mock(
-      `${account_url}/platform/users?id=1&id=2&id=3&id=4`,
-      accounts
-    );
+    fetchMock.mock(`${account_url}/users?id=1&id=2&id=3&id=4`, accounts);
 
     Account.query({ id: [1, 2, 3, 4] }).then(accounts => {
       assert.equal(accounts.length, 4);

test/AccountsProfile.spec.js

@@ -19,7 +19,7 @@ describe("AccountsProfile", () => {
   });
 
   it("Get AccountsProfile", done => {
-    fetchMock.mock(`${api_url}/platform/profiles/1`, {
+    fetchMock.mock(`${api_url}/profiles/1`, {
       id: 1,
       display_name: "test",
       email: "[email protected]",
@@ -38,7 +38,7 @@ describe("AccountsProfile", () => {
   });
 
   it("GetUserIdFromUsername AccountsProfile", done => {
-    fetchMock.mock(`${api_url}/v1/profiles?filter[username]=alice`, {
+    fetchMock.mock(`${api_url}/profiles?filter[username]=alice`, {
       profiles: [
         {
           id: 1,
@@ -62,7 +62,7 @@ describe("AccountsProfile", () => {
 
   it("Update AccountsProfile", done => {
     fetchMock.mock(
-      `${api_url}/platform/profiles/1`,
+      `${api_url}/profiles/1`,
       {
         display_name: "test",
         username: "alice"