#223 => Step 12 : Fixes and normalizing packages names

packages/client/__tests__/accounts-client.ts

@@ -7,7 +7,7 @@ const userStorage = {
 }
 
 const defaultResponse = {
-  json: async () => defaultResponse
+  content: true
 }
 
 const transport = {
@@ -106,19 +106,19 @@ describe('AccountsClient', () => {
   describe('handleResponse', () => {
 
     it('should return the body of the response',async () => {
-      const response = { json: () => ({ content: true }) }
+      const response = { content: true }
       client.handleResponse(response)
       expect((await client.handleResponse(response)).content).toBe(true)
     })
 
     it('should return the error if the response contains one',async () => {
-      const response = { json: () => ({ error: 'error' }) }
+      const response = { error: 'error' }
       client.handleResponse(response)
       expect((await client.handleResponse(response))).toBe('error')
     })
 
     it('should set the user if the response contains one',async () => {
-      const response = { json: () => ({ user: 'user' }) }
+      const response = { user: 'user' }
       await client.handleResponse(response)
       expect(userStorage.setUser).toBeCalledWith('user')
     })

packages/client/src/accounts-client.ts

@@ -55,15 +55,14 @@ export default class AccountsClient {
 	}
 
 	public async handleResponse(response: any): Promise<any> {
-		const res = await response.json();
-		const { error, user } = res
+		const { error, user } = response
 		if(error) {
       return error;
     }
 		if(user) {
       this.userStorage.setUser(user)
     }
-		return res
+		return response
   }
 
 }

packages/client-token-storage-local-storage/package.json → packages/cts-localstorage/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@accounts/cts-local-storage",
+  "name": "@accounts/cts-localstorage",
   "version": "0.1.0-beta.10",
   "description": "Accounts-JS Client Token Storage Local Storage",
   "main": "lib/index.js",
@@ -29,7 +29,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/accounts-js/accounts/tree/master/packages/cts-local-storage"
+    "url": "https://github.com/accounts-js/accounts/tree/master/packages/cts-localstorage"
   },
   "keywords": [
     "accounts",

packages/client-token-storage-local-storage/src/cts-local-storage.ts → packages/cts-localstorage/src/cts-localstorage.ts

@@ -1,6 +1,6 @@
 import { Tokens } from "@accounts/types";
 
-export default class CTSLocalStorage {
+export default class ClientTokenStorageLocalStorage {
 
 	public setAccessToken(accessToken?: string): void {
 		if(this.checkToken(accessToken)){

packages/cts-localstorage/src/index.ts

@@ -0,0 +1 @@
+export { default } from './cts-localstorage';

packages/client-rest-tt-body/__tests__/client-rest-tt-body.ts → packages/ctt-rest-body/__tests__/ctt-rest-body.ts

@@ -1,8 +1,8 @@
-import ClientRestTTBody from '../src';
+import CTTRestBody from '../src';
 
-const defaultClientRestTTBody = new ClientRestTTBody();
+const defaultCTTRestBody = new CTTRestBody();
 
-const denyClientRestTTBody = new ClientRestTTBody({
+const denyCTTRestBody = new CTTRestBody({
   access: {
     canStore: false
   },
@@ -24,84 +24,84 @@ const responseNoTokens = {
   json: () => ({})
 };
 
-describe('ClientRestTTBody', () => {
+describe('CTTRestBody', () => {
 
   describe('constructor', () => {
 
     it('should provide default configuration', () => {
-      expect(defaultClientRestTTBody.accessConfig).toBeDefined()
+      expect(defaultCTTRestBody.accessConfig).toBeDefined()
     })
 
   })
 
   describe('setAccessToken', () => {
 
     it('should set accessToken', () => {
-      expect(defaultClientRestTTBody.setAccessToken({}, {}, accessToken)).toEqual([ {}, { accessToken } ])
+      expect(defaultCTTRestBody.setAccessToken({}, {}, accessToken)).toEqual([ {}, { accessToken } ])
     })
 
     it('should not set accessToken if canStore is false', () => {
-      expect(denyClientRestTTBody.setAccessToken({}, {}, accessToken)).toEqual([ {}, {} ])
+      expect(denyCTTRestBody.setAccessToken({}, {}, accessToken)).toEqual([ {}, {} ])
     })
 
   })
 
   describe('setRefreshToken', () => {
 
     it('should set refreshToken', () => {
-      expect(defaultClientRestTTBody.setRefreshToken({}, {}, refreshToken)).toEqual([ {}, { refreshToken } ])
+      expect(defaultCTTRestBody.setRefreshToken({}, {}, refreshToken)).toEqual([ {}, { refreshToken } ])
     })
 
     it('should not set refreshToken if canStore is false', () => {
-      expect(denyClientRestTTBody.setRefreshToken({}, {}, refreshToken)).toEqual([ {}, {} ])
+      expect(denyCTTRestBody.setRefreshToken({}, {}, refreshToken)).toEqual([ {}, {} ])
     })
 
   })
 
   describe('setTokens', () => {
 
     it('should set both Tokens', () => {
-      expect(defaultClientRestTTBody.setTokens({},{},tokens)).toEqual([ {}, tokens ])
+      expect(defaultCTTRestBody.setTokens({},{},tokens)).toEqual([ {}, tokens ])
     })
 
   })
 
   describe('getAccessToken', () => {
 
     it('should get accessToken', () => {
-      expect(defaultClientRestTTBody.getAccessToken(response)).resolves.toBe(accessToken)
+      expect(defaultCTTRestBody.getAccessToken(response)).resolves.toBe(accessToken)
     })
 
     it('should return undefined if no accessToken in body', () => {
-      expect(defaultClientRestTTBody.getAccessToken(response, {})).resolves.toBe(undefined)
+      expect(defaultCTTRestBody.getAccessToken(response, {})).resolves.toBe(undefined)
     })
 
     it('should return undefined if no accessToken in response body', () => {
-      expect(defaultClientRestTTBody.getAccessToken(responseNoTokens)).resolves.toBe(undefined)
+      expect(defaultCTTRestBody.getAccessToken(responseNoTokens)).resolves.toBe(undefined)
     })
 
   })
 
   describe('getRefreshToken', () => {
 
     it('should get refreshToken from response body', () => {
-      expect(defaultClientRestTTBody.getRefreshToken(response)).resolves.toBe(refreshToken)
+      expect(defaultCTTRestBody.getRefreshToken(response)).resolves.toBe(refreshToken)
     })
 
     it('should return undefined if no refreshToken in body', () => {
-      expect(defaultClientRestTTBody.getRefreshToken(response, {})).resolves.toBe(undefined)
+      expect(defaultCTTRestBody.getRefreshToken(response, {})).resolves.toBe(undefined)
     })
 
     it('should return undefined if no refreshToken in response body', () => {
-      expect(defaultClientRestTTBody.getRefreshToken(responseNoTokens)).resolves.toBe(undefined)
+      expect(defaultCTTRestBody.getRefreshToken(responseNoTokens)).resolves.toBe(undefined)
     })
 
   })
 
   describe('getTokens', () => {
 
     it('should get both Tokens', () => {
-      expect(defaultClientRestTTBody.getTokens(response)).resolves.toEqual(tokens)
+      expect(defaultCTTRestBody.getTokens(response)).resolves.toEqual(tokens)
     })
 
   })

packages/ctt-rest-body/__tests__/index.ts

@@ -0,0 +1,7 @@
+import CTTRestBody from '../src';
+
+describe('CTTRestBody entry', () => {
+  it('should have default export CTTRestBody', () => {
+    expect(typeof CTTRestBody).toBe('function');
+  });
+});

packages/client-rest-tt-body/package.json → packages/ctt-rest-body/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@accounts/client-rest-tt-body",
+  "name": "@accounts/ctt-rest-body",
   "version": "0.1.0-beta.10",
-  "description": "Accounts-JS Client Rest Transport Token Body",
+  "description": "Accounts-JS Client Transport Token Rest Body",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "publishConfig": {
@@ -29,7 +29,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/accounts-js/accounts/tree/master/packages/client-rest-tt-body"
+    "url": "https://github.com/accounts-js/accounts/tree/master/packages/ctt-rest-body"
   },
   "keywords": [
     "accounts",

packages/client-rest-tt-body/src/client-rest-tt-body.ts → packages/ctt-rest-body/src/ctt-rest-body.ts

@@ -13,7 +13,7 @@ const defaultConfig: Configuration<TokenConfiguration> = {
   }
 }
 
-export default class ClientRestTTBody {
+export default class ClientTokenTransportRestBody {
 
 	private accessConfig: TokenConfiguration;
 	private refreshConfig: TokenConfiguration;

packages/ctt-rest-body/src/index.ts

@@ -0,0 +1 @@
+export { default } from './ctt-rest-body';

packages/client-rest-tt-cookies/__tests__/client-rest-tt-cookies.ts → packages/ctt-rest-cookies/__tests__/ctt-rest-cookies.ts

@@ -1,8 +1,8 @@
-import ClientRestTTCookies from '../src';
+import CTTRestCookies from '../src';
 
-const defaultClientRestTTCookies = new ClientRestTTCookies();
+const defaultCTTRestCookies = new CTTRestCookies();
 
-const denyClientRestTTCookies = new ClientRestTTCookies({
+const denyCTTRestCookies = new CTTRestCookies({
   access: {
     canStore: false
   },
@@ -52,12 +52,12 @@ describe('ClientRestTTBody', () => {
   describe('setAccessToken', () => {
 
     it('should set accessToken', () => {
-      defaultClientRestTTCookies.setAccessToken({}, {}, accessToken);
+      defaultCTTRestCookies.setAccessToken({}, {}, accessToken);
       expect(mockcookie.str).toMatchSnapshot()
     })
 
     it('should not set accessToken if canStore is false', () => {
-      denyClientRestTTCookies.setAccessToken({}, {}, accessToken)
+      denyCTTRestCookies.setAccessToken({}, {}, accessToken)
       expect(mockcookie.str).toBe('')
     })
 
@@ -66,12 +66,12 @@ describe('ClientRestTTBody', () => {
   describe('setRefreshToken', () => {
 
     it('should set refreshToken', () => {
-      defaultClientRestTTCookies.setRefreshToken({}, {}, refreshToken)
+      defaultCTTRestCookies.setRefreshToken({}, {}, refreshToken)
       expect(mockcookie.str).toMatchSnapshot()
     })
 
     it('should not set refreshToken if canStore is false', () => {
-      denyClientRestTTCookies.setRefreshToken({}, {}, refreshToken)
+      denyCTTRestCookies.setRefreshToken({}, {}, refreshToken)
       expect(mockcookie.str).toBe('')
     })
 
@@ -80,7 +80,7 @@ describe('ClientRestTTBody', () => {
   describe('setTokens', () => {
 
     it('should set both Tokens', () => {
-      defaultClientRestTTCookies.setTokens({},{},tokens)
+      defaultCTTRestCookies.setTokens({},{},tokens)
       expect(mockcookie.str).toMatchSnapshot()
     })
 
@@ -90,11 +90,11 @@ describe('ClientRestTTBody', () => {
 
     it('should get accessToken', () => {
       mockcookie.cookie = 'accessToken=' + accessToken;
-      expect(defaultClientRestTTCookies.getAccessToken()).toBe(accessToken);
+      expect(defaultCTTRestCookies.getAccessToken()).toBe(accessToken);
     })
 
     it('should return undefined if no accessToken', () => {
-      expect(defaultClientRestTTCookies.getAccessToken()).toBe(undefined)
+      expect(defaultCTTRestCookies.getAccessToken()).toBe(undefined)
     })
 
   })
@@ -103,11 +103,11 @@ describe('ClientRestTTBody', () => {
 
     it('should get refreshToken', () => {
       mockcookie.cookie = 'refreshToken=' + refreshToken;
-      expect(defaultClientRestTTCookies.getRefreshToken()).toBe(refreshToken)
+      expect(defaultCTTRestCookies.getRefreshToken()).toBe(refreshToken)
     })
 
     it('should return undefined if no refreshToken', () => {
-      expect(defaultClientRestTTCookies.getRefreshToken()).toBe(undefined)
+      expect(defaultCTTRestCookies.getRefreshToken()).toBe(undefined)
     })
 
   })
@@ -117,7 +117,7 @@ describe('ClientRestTTBody', () => {
     it('should get both Tokens', () => {
       document.cookie = 'accessToken=' + accessToken
       document.cookie = 'refreshToken=' + refreshToken
-      expect(defaultClientRestTTCookies.getTokens()).toEqual(tokens)
+      expect(defaultCTTRestCookies.getTokens()).toEqual(tokens)
     })
 
   })

packages/ctt-rest-cookies/__tests__/index.ts

@@ -0,0 +1,7 @@
+import CTTRestCookies from '../src';
+
+describe('CTTRestCookies entry', () => {
+  it('should have default export CTTRestCookies', () => {
+    expect(typeof CTTRestCookies).toBe('function');
+  });
+});

packages/client-rest-tt-cookies/package.json → packages/ctt-rest-cookies/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@accounts/client-rest-tt-cookies",
+  "name": "@accounts/ctt-rest-cookies",
   "version": "0.1.0-beta.10",
-  "description": "Accounts-JS Client Rest Transport Token Cookies",
+  "description": "Accounts-JS Client Token Transport Rest Cookies",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "publishConfig": {
@@ -29,7 +29,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/accounts-js/accounts/tree/master/packages/client-rest-tt-cookies"
+    "url": "https://github.com/accounts-js/accounts/tree/master/packages/ctt-rest-cookies"
   },
   "keywords": [
     "accounts",

packages/client-rest-tt-cookies/src/client-rest-tt-cookies.ts → packages/ctt-rest-cookies/src/ctt-rest-cookies.ts

@@ -19,7 +19,7 @@ const defaultConfig: Configuration<TokenConfiguration> = {
   }
 }
 
-export default class ClientRestTTCookies {
+export default class ClientTokenTransportRestCookies {
 
 	private accessConfig: TokenConfiguration;
 	private refreshConfig: TokenConfiguration;

packages/ctt-rest-cookies/src/index.ts

@@ -0,0 +1 @@
+export { default } from './ctt-rest-cookies';