Compare commits

..

No commits in common. "stable" and "v1.3.0" have entirely different histories.

5 changed files with 26 additions and 54 deletions

View file

@ -1,44 +1,5 @@
# CHANGELOG # CHANGELOG
# [1.6.0](https://github.com/LukeeeeBennett/ccash-client-js/compare/v1.5.0...v1.6.0) (2021-06-13)
### Bug Fixes
* correct password as body calls ([6fd7a91](https://github.com/LukeeeeBennett/ccash-client-js/commit/6fd7a91422c74f5b0c2bea951db160e3d6bb4dfc))
### Features
* release ([39dad3a](https://github.com/LukeeeeBennett/ccash-client-js/commit/39dad3a037c6151915288401f68ecdad2b2ac0f4))
# [1.5.0](https://github.com/LukeeeeBennett/ccash-client-js/compare/v1.4.0...v1.5.0) (2021-06-13)
### Bug Fixes
* remove log transactionCount ([a26b61a](https://github.com/LukeeeeBennett/ccash-client-js/commit/a26b61aeecda844dc2e9e043aeeacad71d813dd7))
### Features
* add ping ([dbe1008](https://github.com/LukeeeeBennett/ccash-client-js/commit/dbe1008850d68ee871b153fbca1c410d668601e9))
* remove WrongAdminPassword exception ([0a1d358](https://github.com/LukeeeeBennett/ccash-client-js/commit/0a1d35812d31032e114fbfb983e39f4a3cc7775a))
# [1.4.0](https://github.com/LukeeeeBennett/ccash-client-js/compare/v1.3.0...v1.4.0) (2021-06-13)
### Bug Fixes
* add password in body to adminAddUser ([80ca0b6](https://github.com/LukeeeeBennett/ccash-client-js/commit/80ca0b6800725b6e814a3a07974da796caa03c6a))
* types ([5bd0820](https://github.com/LukeeeeBennett/ccash-client-js/commit/5bd08201d75acb83574ac35e9c0317e835713746))
### Features
* release ([2663b24](https://github.com/LukeeeeBennett/ccash-client-js/commit/2663b2422057c0ebe5d054aee0d1793973b6bbb4))
* release ([a443b6b](https://github.com/LukeeeeBennett/ccash-client-js/commit/a443b6bba10c5d512b92d02bdd0dc80a29519e19))
# [1.3.0](https://github.com/LukeeeeBennett/ccash-client-js/compare/v1.2.0...v1.3.0) (2021-06-13) # [1.3.0](https://github.com/LukeeeeBennett/ccash-client-js/compare/v1.2.0...v1.3.0) (2021-06-13)

View file

@ -1,6 +1,6 @@
{ {
"name": "ccash-client-js", "name": "ccash-client-js",
"version": "1.6.0", "version": "1.3.0",
"description": "JS HTTP client for CCash", "description": "JS HTTP client for CCash",
"main": "./dist", "main": "./dist",
"publishConfig": { "publishConfig": {

View file

@ -24,6 +24,12 @@ export class InvalidRequestException extends Exception {
} }
} }
export class WrongAdminPasswordException extends Exception {
constructor() {
super('wrong admin password');
}
}
export class NameTooLongException extends Exception { export class NameTooLongException extends Exception {
constructor() { constructor() {
super('name too long'); super('name too long');
@ -46,6 +52,7 @@ export enum ErrorCodes {
UserNotFound = -1, UserNotFound = -1,
WrongPassword = -2, WrongPassword = -2,
InvalidRequest = -3, InvalidRequest = -3,
WrongAdminPassword = -4,
NameTooLong = -5, NameTooLong = -5,
UserAlreadyExists = -6, UserAlreadyExists = -6,
InsufficientFunds = -7, InsufficientFunds = -7,
@ -55,6 +62,7 @@ export const ExceptionMap = {
[ErrorCodes.UserNotFound]: UserNotFoundException, [ErrorCodes.UserNotFound]: UserNotFoundException,
[ErrorCodes.WrongPassword]: WrongPasswordException, [ErrorCodes.WrongPassword]: WrongPasswordException,
[ErrorCodes.InvalidRequest]: InvalidRequestException, [ErrorCodes.InvalidRequest]: InvalidRequestException,
[ErrorCodes.WrongAdminPassword]: WrongAdminPasswordException,
[ErrorCodes.NameTooLong]: NameTooLongException, [ErrorCodes.NameTooLong]: NameTooLongException,
[ErrorCodes.UserAlreadyExists]: UserAlreadyExistsException, [ErrorCodes.UserAlreadyExists]: UserAlreadyExistsException,
[ErrorCodes.InsufficientFunds]: InsufficientFundsException, [ErrorCodes.InsufficientFunds]: InsufficientFundsException,

View file

@ -7,7 +7,8 @@ import {
ErrorCodes, ErrorCodes,
} from './CCashClient.exceptions'; } from './CCashClient.exceptions';
export class CCashClient implements ICCashClient { export class CCashClient implements Partial<ICCashClient> {
/** TODO: not partial **/
http: AxiosInstance; http: AxiosInstance;
constructor(baseURL: string | undefined = process.env.CCASH_API_BASE_URL) { constructor(baseURL: string | undefined = process.env.CCASH_API_BASE_URL) {
@ -26,10 +27,15 @@ export class CCashClient implements ICCashClient {
.then((response) => this.handleError(response) || response.data.value); .then((response) => this.handleError(response) || response.data.value);
} }
log(user: string, pass: string): Promise<number[]> { log(
user: string,
pass: string,
transactionCount: number = 10
): Promise<number[]> {
return this.http return this.http
.get(`/${user}/bal`, { .get(`/${user}/bal`, {
headers: { Password: pass }, headers: { Password: pass },
params: { n: transactionCount },
}) })
.then((response) => this.handleError(response) || response.data.value); .then((response) => this.handleError(response) || response.data.value);
} }
@ -56,14 +62,18 @@ export class CCashClient implements ICCashClient {
changePassword(user: string, pass: string, newPass: string): Promise<User> { changePassword(user: string, pass: string, newPass: string): Promise<User> {
return this.http return this.http
.patch(`/${user}/pass/change`, newPass, { headers: { Password: pass } }) .patch(
`/${user}/pass/change`,
{ password: newPass },
{ headers: { Password: pass } }
)
.then( .then(
(response) => (response) =>
this.handleError(response) || this.serialize(User, { user }) this.handleError(response) || this.serialize(User, { user })
); );
} }
setBalance(user: string, pass: string, amount: number): Promise<number> { setBal(user: string, pass: string, amount: number): Promise<number> {
return this.http return this.http
.patch(`/admin/${user}/bal`, undefined, { .patch(`/admin/${user}/bal`, undefined, {
headers: { Password: pass }, headers: { Password: pass },
@ -76,10 +86,6 @@ export class CCashClient implements ICCashClient {
return this.http.get('/help').then((response) => response.data); return this.http.get('/help').then((response) => response.data);
} }
ping(): Promise<boolean> {
return this.http.get('/ping').then((response) => response.data || false);
}
close(pass: string): Promise<boolean> { close(pass: string): Promise<boolean> {
return this.http return this.http
.post('/close', undefined, { headers: { Password: pass } }) .post('/close', undefined, { headers: { Password: pass } })
@ -114,11 +120,10 @@ export class CCashClient implements ICCashClient {
adminAddUser( adminAddUser(
user: string, user: string,
pass: string, pass: string,
initialPass: string,
initialBalance: number initialBalance: number
): Promise<User> { ): Promise<User> {
return this.http return this.http
.post(`/user/${user}`, initialPass, { .post(`/user/${user}`, undefined, {
headers: { Password: pass }, headers: { Password: pass },
params: { init_bal: initialBalance }, params: { init_bal: initialBalance },
}) })

View file

@ -5,7 +5,7 @@ export { User };
export interface ICCashClient { export interface ICCashClient {
// Usage // Usage
balance(user: string): Promise<number>; balance(user: string): Promise<number>;
log(user: string, pass: string): Promise<number[]>; log(user: string, pass: string, transactionCount?: number): Promise<number[]>;
sendFunds( sendFunds(
user: string, user: string,
pass: string, pass: string,
@ -16,11 +16,10 @@ export interface ICCashClient {
// Meta usage // Meta usage
changePassword(user: string, pass: string, newPass: string): Promise<User>; changePassword(user: string, pass: string, newPass: string): Promise<User>;
setBalance(user: string, pass: string, amount: number): Promise<number>; setBal(user: string, pass: string, amount: number): Promise<number>;
// System usage // System usage
help(): Promise<string>; help(): Promise<string>;
ping(): Promise<boolean>;
close(pass: string): Promise<boolean>; close(pass: string): Promise<boolean>;
contains(user: string): Promise<boolean>; contains(user: string): Promise<boolean>;
adminVerifyPass(pass: string): Promise<boolean>; adminVerifyPass(pass: string): Promise<boolean>;
@ -30,7 +29,6 @@ export interface ICCashClient {
adminAddUser( adminAddUser(
user: string, user: string,
pass: string, pass: string,
initialPass: string,
initialBalance: number initialBalance: number
): Promise<User>; ): Promise<User>;
deleteUser(user: string, pass: string): Promise<User>; deleteUser(user: string, pass: string): Promise<User>;