Merge pull request particle-iot#62 from AntonPuko/uuid

add uuid package

Author: jlkalberer

package.json

@@ -59,6 +59,7 @@
     "request": "*",
     "spark-protocol": "../spark-protocol",
     "ursa": "*",
+    "uuid": "^3.0.1",
     "when": "*",
     "xtend": "*"
   },

src/controllers/WebhooksController.js

@@ -62,11 +62,8 @@ class WebhooksController extends Controller {
       throw validateError;
     }
 
-    const newWebhook = await this._webhookRepository.create({
-      ...model,
-      created_at: new Date(),
-      id: '',
-    });
+    const newWebhook = await this._webhookRepository.create(model);
+
     return this.ok({
       created_at: newWebhook.created_at,
       event: newWebhook.event,

src/repository/UserFileRepository.js

@@ -2,7 +2,8 @@
 
 import type { TokenObject, User, UserCredentials } from '../types';
 
-import { JSONFileManager, uuid } from 'spark-protocol';
+import uuid from 'uuid';
+import { JSONFileManager } from 'spark-protocol';
 import PasswordHasher from '../lib/PasswordHasher';
 import HttpError from '../lib/HttpError';
 
@@ -20,12 +21,16 @@ class UserFileRepository {
 
     const salt = await PasswordHasher.generateSalt();
     const passwordHash = await PasswordHasher.hash(password, salt);
+    let id = uuid();
+    while (await this.getById(id)) {
+      id = uuid();
+    }
 
     const modelToSave = {
       accessTokens: [],
       created_at: new Date(),
       created_by: null,
-      id: uuid(),
+      id,
       passwordHash,
       salt,
       username,
@@ -43,10 +48,10 @@ class UserFileRepository {
     throw new HttpError('Not implemented');
   };
 
-  getAll = (): Promise<Array<User>> =>
+  getAll = async (): Promise<Array<User>> =>
     this._fileManager.getAllData();
 
-  getById = (id: string): Promise<?User> =>
+  getById = async (id: string): Promise<?User> =>
     this._fileManager.getFile(`${id}.json`);
 
   getByUsername = async (username: string): Promise<?User> =>
@@ -91,7 +96,7 @@ class UserFileRepository {
     this._fileManager.writeFile(`${user.id}.json`, userToSave);
   };
 
-  deleteById = (id: string): Promise<void> =>
+  deleteById = async (id: string): Promise<void> =>
     this._fileManager.deleteFile(`${id}.json`);
 
 

src/repository/WebhookFileRepository.js

@@ -1,8 +1,9 @@
 // @flow
 
-import type { Webhook } from '../types';
+import type { Webhook, WebhookMutator } from '../types';
 
-import { JSONFileManager, uuid } from 'spark-protocol';
+import uuid from 'uuid';
+import { JSONFileManager } from 'spark-protocol';
 import HttpError from '../lib/HttpError';
 
 class WebhookFileRepository {
@@ -12,11 +13,16 @@ class WebhookFileRepository {
     this._fileManager = new JSONFileManager(path);
   }
 
-  create = async (model: Webhook): Promise<Webhook> => {
+  create = async (model: WebhookMutator): Promise<Webhook> => {
+    let id = uuid();
+    while (await this.getById(id)) {
+      id = uuid();
+    }
+
     const modelToSave = {
       ...model,
       created_at: new Date(),
-      id: uuid(),
+      id,
     };
 
     this._fileManager.createFile(`${modelToSave.id}.json`, modelToSave);
@@ -32,7 +38,7 @@ class WebhookFileRepository {
   getById = async (id: string): Promise<?Webhook> =>
     this._fileManager.getFile(`${id}.json`);
 
-  update = (model: Webhook): Promise<Webhook> => {
+  update = async (model: WebhookMutator): Promise<Webhook> => {
     throw new HttpError('Not implemented');
   };
 }

test/DevicesController.test.js

@@ -134,8 +134,8 @@ test.serial('should claim device', async t => {
 // TODO write test for checking the error if device belongs to somebody else
 // TODO write tests for updateDevice & callFunction
 
-test.after.always(() => {
-  settings.usersRepository.deleteById(testUser.id);
-  settings.deviceAttributeRepository.deleteById(DEVICE_ID);
-  settings.deviceKeyFileRepository.delete(DEVICE_ID);
+test.after.always(async (): Promise<void> => {
+  await settings.usersRepository.deleteById(testUser.id);
+  await settings.deviceAttributeRepository.deleteById(DEVICE_ID);
+  await settings.deviceKeyFileRepository.delete(DEVICE_ID);
 });

test/ProvisioningController.test.js

@@ -75,8 +75,8 @@ test('should throw an error if public key is not provided', async t => {
   t.is(response.body.error, 'No key provided');
 });
 
-test.after.always(() => {
-  settings.usersRepository.deleteById(testUser.id);
-  settings.deviceAttributeRepository.deleteById(DEVICE_ID);
-  settings.deviceKeyFileRepository.delete(DEVICE_ID);
+test.after.always(async (): Promise<void> => {
+  await settings.usersRepository.deleteById(testUser.id);
+  await settings.deviceAttributeRepository.deleteById(DEVICE_ID);
+  await settings.deviceKeyFileRepository.delete(DEVICE_ID);
 });

test/UsersController.test.js

@@ -81,6 +81,6 @@ test.serial('should deleteById access token for the user', async t => {
   ));
 });
 
-test.after.always(() => {
-  settings.usersRepository.deleteById(user.id);
+test.after.always(async (): Promise<void> => {
+  await settings.usersRepository.deleteById(user.id);
 });

test/WebhooksController.test.js

@@ -157,7 +157,7 @@ test.serial('should delete webhook', async t => {
   ));
 });
 
-test.after.always(() => {
-  settings.webhookRepository.deleteById(testWebhook.id);
-  settings.usersRepository.deleteById(testUser.id);
+test.after.always(async (): Promise<void> => {
+  await settings.webhookRepository.deleteById(testWebhook.id);
+  await settings.usersRepository.deleteById(testUser.id);
 });