Browse Source

fix errors

pull/4/head
Kyle Spearrin 8 years ago
parent
commit
83e91b70ff
  1. 4
      src/commands/create.command.ts
  2. 4
      src/commands/delete.command.ts
  3. 2
      src/commands/login.command.ts
  4. 2
      src/commands/sync.command.ts
  5. 8
      src/models/response.ts
  6. 1
      webpack.config.js

4
src/commands/create.command.ts

@ -36,7 +36,7 @@ export class CreateCommand { @@ -36,7 +36,7 @@ export class CreateCommand {
await this.cipherService.saveWithServer(cipher);
return Response.success();
} catch (e) {
return Response.error(e.toString());
return Response.error(e);
}
}
@ -46,7 +46,7 @@ export class CreateCommand { @@ -46,7 +46,7 @@ export class CreateCommand {
await this.folderService.saveWithServer(folder);
return Response.success();
} catch (e) {
return Response.error(e.toString());
return Response.error(e);
}
}
}

4
src/commands/delete.command.ts

@ -29,7 +29,7 @@ export class DeleteCommand { @@ -29,7 +29,7 @@ export class DeleteCommand {
await this.cipherService.deleteWithServer(id);
return Response.success();
} catch (e) {
return Response.error(e.toString());
return Response.error(e);
}
}
@ -43,7 +43,7 @@ export class DeleteCommand { @@ -43,7 +43,7 @@ export class DeleteCommand {
await this.folderService.deleteWithServer(id);
return Response.success();
} catch (e) {
return Response.error(e.toString());
return Response.error(e);
}
}
}

2
src/commands/login.command.ts

@ -15,7 +15,7 @@ export class LoginCommand { @@ -15,7 +15,7 @@ export class LoginCommand {
// TODO: 2FA
return Response.success();
} catch (e) {
return Response.success(e.toString());
return Response.error(e);
}
}
}

2
src/commands/sync.command.ts

@ -12,7 +12,7 @@ export class SyncCommand { @@ -12,7 +12,7 @@ export class SyncCommand {
const result = await this.syncService.fullSync(cmd.force || false);
return Response.success();
} catch (e) {
return Response.success(e.toString());
return Response.error(e);
}
}
}

8
src/models/response.ts

@ -1,10 +1,14 @@ @@ -1,10 +1,14 @@
import { BaseResponse } from './response/baseResponse';
export class Response {
static error(message: string): Response {
static error(error: any): Response {
const res = new Response();
res.success = false;
res.message = message;
if (typeof (error) === 'string') {
res.message = error;
} else {
res.message = error.message != null ? error.message : error.toString();
}
return res;
}

1
webpack.config.js

@ -43,6 +43,7 @@ const plugins = [ @@ -43,6 +43,7 @@ const plugins = [
banner: '#!/usr/bin/env node',
raw: true
}),
new webpack.IgnorePlugin(/^encoding$/, /node-fetch/),
];
const config = {

Loading…
Cancel
Save