Merge pull request #229 from platformsh/fix-add-prettier-config

Add prettier config and format all files

.prettierignore

@@ -0,0 +1,2 @@
+/lib
+/types

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "trailingComma": "none",
+  "arrowParens": "avoid"
+}

README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/platformsh/platformsh-client-js.svg?branch=master)](https://travis-ci.org/platformsh/platformsh-client-js)
+
 # Platform.sh API client
 
 This is a isomorphic Javascript library for accessing the Platform.sh API.
@@ -7,7 +8,7 @@ We recommend you use the [Platform.sh CLI](https://github.com/platformsh/platfor
 
 ## Install
 
-Run ``` npm install platformsh-client ```
+Run `npm install platformsh-client`
 
 ## Usage
 
@@ -29,12 +30,12 @@ client.getProjects().then(projects => {
 
 ## Development mode
 
-Run ``` npm run dev ```
+Run `npm run dev`
 
 ## Build
 
-Run ``` npm run build ```
+Run `npm run build`
 
 ## Test
 
-Run ``` npm test ```
+Run `npm test`

package.json

@@ -27,23 +27,22 @@
     "@types/is-url": "^1.2.30",
     "@types/node": "^17.0.10",
     "@types/object.pick": "^1.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1",
-    "babel-eslint": "10.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
     "babel-loader": "8.1.0",
     "chai": "3.5.0",
-    "eslint": "^4.18.2",
-    "eslint-loader": "1.6.3",
-    "eslint-plugin-no-unused-vars-rest": "^1.0.4",
-    "eslint-plugin-prettier": "^2.7.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-prettier": "^4.2.1",
     "fake-fetch": "^1.0.0",
     "fetch-mock": "^5.9.4",
     "husky": "^0.14.3",
     "jsdom": "^9.6.0",
     "lint-staged": "^7.3.0",
     "mocha": "^6.0.2",
     "mock-local-storage": "^1.1.8",
-    "prettier": "1.13.4",
+    "prettier": "^2.8.6",
     "sinon": "^1.17.6",
     "terser-webpack-plugin": "^2.3.6",
     "ts-node": "^10.4.0",

src/api.ts

@@ -11,7 +11,7 @@ export type RequestOptions = {
 
 export type RequestConfiguration = RequestOptions & RequestInit;
 
-let authenticationPromise : Promise<JWTToken>;
+let authenticationPromise: Promise<JWTToken>;
 
 export const setAuthenticationPromise = (promise: Promise<JWTToken>) => {
   authenticationPromise = promise;
@@ -39,10 +39,7 @@ const decodeHeaderString = (header: string) => {
     .replace("Bearer", "")
     .split(",")
     .reduce<Record<string, string>>((acc, cu) => {
-      const [key, value] = cu
-        .replace(/"/g, "")
-        .trim()
-        .split("=");
+      const [key, value] = cu.replace(/"/g, "").trim().split("=");
       acc[key] = value;
       return acc;
     }, {});
@@ -85,21 +82,23 @@ export const request = (
   };
 
   if (method !== "GET" && method !== "HEAD" && body) {
-    const d: BodyInit = isFormData(data) ? data as FormData : JSON.stringify(body);
+    const d: BodyInit = isFormData(data)
+      ? (data as FormData)
+      : JSON.stringify(body);
     requestConfig.body = d;
   }
 
   return new Promise((resolve, reject) => {
     fetch(apiUrl, requestConfig)
       .then(response => {
         if (response.status === 401) {
-          const config: ClientConfiguration  = getConfig();
+          const config: ClientConfiguration = getConfig();
           const extra_params = getChallengeExtraParams(response.headers);
 
           // Prevent an endless loop which happens in case of re-authentication with the access token.
           // We want to retry only once, trying to renew the token.
           if (typeof config.access_token === "undefined" && retryNumber < 2) {
-            return authenticate({ ...config, extra_params }, true).then((t) => {
+            return authenticate({ ...config, extra_params }, true).then(t => {
               resolve(
                 authenticatedRequest(
                   url,
@@ -159,7 +158,7 @@ export const request = (
 
 export const authenticatedRequest = (
   url: string,
-  method: string  = "GET",
+  method: string = "GET",
   data?: FormData | object | undefined,
   additionalHeaders: Record<string, string> = {},
   retryNumber: number = 0,

src/authentication/connector.ts

@@ -20,10 +20,14 @@ import {
   jso_getCodeVerifier,
   PKCERequest
 } from "../jso";
-import { getConfig, ClientConfiguration, DefaultClientConfiguration } from "../config";
+import {
+  getConfig,
+  ClientConfiguration,
+  DefaultClientConfiguration
+} from "../config";
 
 type IFrameOption = {
-  sandbox?: string
+  sandbox?: string;
 };
 
 let basicAuth: string;
@@ -34,8 +38,13 @@ if (isNode) {
   basicAuth = btoa("platform-cli:");
 }
 
-function createIFrame(src: string, options: IFrameOption = {}): HTMLIFrameElement {
-  let iframe: HTMLIFrameElement = document.getElementById("logiframe-platformsh") as HTMLIFrameElement;
+function createIFrame(
+  src: string,
+  options: IFrameOption = {}
+): HTMLIFrameElement {
+  let iframe: HTMLIFrameElement = document.getElementById(
+    "logiframe-platformsh"
+  ) as HTMLIFrameElement;
 
   if (iframe) {
     return iframe;
@@ -51,8 +60,8 @@ function createIFrame(src: string, options: IFrameOption = {}): HTMLIFrameElemen
   iframe.src = src;
   document.body.appendChild(iframe);
 
-  if(iframe.contentWindow) {
-    iframe.contentWindow.onerror = function(msg, url, line) {
+  if (iframe.contentWindow) {
+    iframe.contentWindow.onerror = function (msg, url, line) {
       if (msg === "[IFRAME ERROR MESSAGE]") {
         return true;
       }
@@ -148,7 +157,12 @@ const getTokenWithAuthorizationCode = async (
   return await resp.json();
 };
 
-async function authorizationCodeCallback(config: DefaultClientConfiguration, codeVerifier: string, code: string, state?: string) {
+async function authorizationCodeCallback(
+  config: DefaultClientConfiguration,
+  codeVerifier: string,
+  code: string,
+  state?: string
+) {
   const atoken = await getTokenWithAuthorizationCode(
     config.authentication_url,
     config.client_id,
@@ -167,14 +181,17 @@ async function authorizationCodeCallback(config: DefaultClientConfiguration, cod
   return atoken;
 }
 
-function logInWithRedirect(reset: boolean = false, extraParams?: Record<string, string>) {
+function logInWithRedirect(
+  reset: boolean = false,
+  extraParams?: Record<string, string>
+) {
   console.log("In redirect...");
   return new Promise(async (resolve, reject) => {
     const config = getConfig();
     const auth = {
       ...config,
       response_mode: config.response_mode,
-      prompt: config.prompt,
+      prompt: config.prompt
     };
     let pkce: PKCERequest;
 
@@ -209,7 +226,7 @@ function logInWithRedirect(reset: boolean = false, extraParams?: Record<string,
 
       if (oauthResp) {
         const codeVerifier = jso_getCodeVerifier(config.provider);
-        if(codeVerifier && oauthResp.code) {
+        if (codeVerifier && oauthResp.code) {
           return resolve(
             await authorizationCodeCallback(
               auth,
@@ -236,14 +253,14 @@ function logInWithRedirect(reset: boolean = false, extraParams?: Record<string,
       } catch {}
     }
 
-    const authUrl = encodeURL(auth.authorization, {...req, ...extraParams});
+    const authUrl = encodeURL(auth.authorization, { ...req, ...extraParams });
 
     const iframe = createIFrame(authUrl, {
       sandbox: "allow-same-origin"
     });
     let attempt = 0;
 
-    const listener = setInterval(async function() {
+    const listener = setInterval(async function () {
       let href;
       let iframeDidReturnError;
 
@@ -477,7 +494,11 @@ export const logInWithPopUp = async (reset: boolean = false) => {
   return jso_getToken(authConfig.provider);
 };
 
-export default (token?: string, reset: boolean = false, config?: Partial<ClientConfiguration>) => {
+export default (
+  token?: string,
+  reset: boolean = false,
+  config?: Partial<ClientConfiguration>
+) => {
   if (isNode && token) {
     return logInWithToken(token).catch(e => new Error(e));
   }
@@ -496,4 +517,3 @@ export default (token?: string, reset: boolean = false, config?: Partial<ClientC
 
   return logInWithRedirect(reset, config?.extra_params);
 };
-

src/authentication/index.ts

@@ -11,11 +11,11 @@ import { ClientConfiguration } from "../config";
 let authenticationInProgress: boolean = false;
 
 export type JWTToken = {
-  access_token: string,
-  expires: number,
-  expires_in: number,
-  token_type: string,
-  scope: string
+  access_token: string;
+  expires: number;
+  expires_in: number;
+  token_type: string;
+  scope: string;
 };
 
 export default (
@@ -26,7 +26,7 @@ export default (
     popupMode,
     response_mode,
     prompt,
-    extra_params,
+    extra_params
   }: ClientConfiguration,
   reset = false
 ): Promise<JWTToken> => {
@@ -46,11 +46,11 @@ export default (
       popupMode,
       response_mode,
       prompt,
-      extra_params,
+      extra_params
     });
   }
-  
-  if(promise) {
+
+  if (promise) {
     setAuthenticationPromise(promise);
 
     promise.then(() => {

src/config.ts

@@ -2,36 +2,36 @@ const DEFAULT_ACCOUNT_URL = "https://accounts.platform.sh";
 const DEFAULT_API_URL = "https://api.platform.sh/api";
 
 export type ClientConfiguration = {
-  provider?: string,
-  client_id?: string,
-  account_url?: string,
-  api_url: string,
-  authentication_url?: string,
-  scope?: Array<string>,
-  authorization: string,
-  logout_url?: string,
-  access_token?: string,
-  api_token?: string,
-  popupMode?: boolean,
-  response_mode?: string,
-  prompt?: string,
-  base_url?: string,
-  redirect_uri?: string,
-  response_type?: string,
-  onBeforeRedirect?: (location: string) => void,
+  provider?: string;
+  client_id?: string;
+  account_url?: string;
+  api_url: string;
+  authentication_url?: string;
+  scope?: Array<string>;
+  authorization: string;
+  logout_url?: string;
+  access_token?: string;
+  api_token?: string;
+  popupMode?: boolean;
+  response_mode?: string;
+  prompt?: string;
+  base_url?: string;
+  redirect_uri?: string;
+  response_type?: string;
+  onBeforeRedirect?: (location: string) => void;
   extra_params?: Record<string, string>;
 };
 
 export type DefaultClientConfiguration = ClientConfiguration & {
-  scope: Array<string>
-  redirect_uri:string
-  provider:string
-  client_id:string
-  account_url:string
-  authentication_url:string
-  prompt:string
-  response_type:string
-}
+  scope: Array<string>;
+  redirect_uri: string;
+  provider: string;
+  client_id: string;
+  account_url: string;
+  authentication_url: string;
+  prompt: string;
+  response_type: string;
+};
 
 const getConfigDefault = (
   baseUrl: string = DEFAULT_ACCOUNT_URL,