3069001707

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/bioinformatics-ua/dicoogle-client-js/commit/<a class=hub.com/bioinformatics-ua/dicoogle-client-js/commit/da8e8ccc1561c0198548fd8fce459d395f718009">da8e8ccc1<a href="https://github.com/bioinformatics-ua/dicoogle-client-js/commit/da8e8ccc1561c0198548fd8fce459d395f718009">">Merge </a><a class="double-link" href="https://github.com/bioinformatics-ua/dicoogle-client-js/commit/<a class="double-link" href="https://github.com/bioinformatics-ua/dicoogle-client-js/commit/2d7d13c3297213a39f71a5b6391c1c8c7be183fe">2d7d13c32</a>">2d7d13c32</a><a href="https://github.com/bioinformatics-ua/dicoogle-client-js/commit/da8e8ccc1561c0198548fd8fce459d395f718009"> into 90aaf237a">90aaf237a</a>

Pull Request Pull Request #52: Fix operations to add and delete users

Run Details

149 of 173 branches covered (86.13%)

5 of 5 new or added lines in 1 file covered. (100.0%)

315 of 328 relevant lines covered (96.04%)

8.04 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

86.67

/src/users.ts

/*
 * Copyright (C) 2017  Universidade de Aveiro, DETI/IEETA, Bioinformatics Group - http://bioinformatics.ua.pt/
 *
 * This file is part of Dicoogle/dicoogle-client-js.
 *
 * Dicoogle/dicoogle-client-js is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * Dicoogle/dicoogle-client-js is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with Dicoogle.  If not, see <http://www.gnu.org/licenses/>.
 */

import Endpoints from './endpoints';
import {Socket} from './socket';
import {andCall} from './util';

export type password = string;

export interface User {
    username: string,
    roles?: string[],
    admin?: boolean,
}

export class UserService {
    private socket: Socket;
  
    constructor(socket) {
      this.socket = socket;
    }

    /** List all registered users.
     */
    list(callback?: (error: Error | null, users?: User[]) => void): Promise<User[]> {
        return andCall(this.socket.get(Endpoints.USER)
            .then((res) => res.body.users), callback)
    }

    /** Create a new user for Dicoogle.
     * 
     * @param username the new identifier of the user
     * @param password the new password
     * @param admin whether the account is an administrator
     */
    add(username: string, password: password, admin: boolean, callback?: (error: Error | null, success?: boolean) => void): Promise<boolean> {
        return andCall(this.socket.post(Endpoints.USER).query({username, password, admin})
            .catch((err) => {
                if (err.status === 405) {
                    // method not allowed means that we're using Dicoogle 2,
                    // so we try again with the PUT method
                    return this.socket.put(Endpoints.USER).query({username, password, admin});
                }
                throw err;
            })
            .then((res) => res.body.success), callback);
    }

    /** Remove an existing user from the platorm.
     * 
     * @param username the identifier of the user to remove
     */
    remove(username: string, callback?: (error: Error | null, removed?: boolean) => void): Promise<boolean> {
        return andCall(this.socket.request('DELETE', [Endpoints.USER, username])
            .then((res) => res.body.success), callback);
    }
}

1	/*
2	* Copyright (C) 2017 Universidade de Aveiro, DETI/IEETA, Bioinformatics Group - http://bioinformatics.ua.pt/
3	*
4	* This file is part of Dicoogle/dicoogle-client-js.
5	*
6	* Dicoogle/dicoogle-client-js is free software: you can redistribute it and/or modify
7	* it under the terms of the GNU General Public License as published by
8	* the Free Software Foundation, either version 3 of the License, or
9	* (at your option) any later version.
10	*
11	* Dicoogle/dicoogle-client-js is distributed in the hope that it will be useful,
12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	* GNU General Public License for more details.
15	*
16	* You should have received a copy of the GNU General Public License
17	* along with Dicoogle. If not, see <http://www.gnu.org/licenses/>.
18	*/
19
20	import Endpoints from './endpoints';	1✔
21	import {Socket} from './socket';
22	import {andCall} from './util';	1✔
23
24	export type password = string;
25
26	export interface User {
27	username: string,
28	roles?: string[],
29	admin?: boolean,
30	}
31
32	export class UserService {	1✔
33	private socket: Socket;
34
35	constructor(socket) {
36	this.socket = socket;	4✔
37	}
38
39	/** List all registered users.
40	*/
41	list(callback?: (error: Error \| null, users?: User[]) => void): Promise<User[]> {
42	return andCall(this.socket.get(Endpoints.USER)	9✔
43	.then((res) => res.body.users), callback)	9✔
44	}
45
46	/** Create a new user for Dicoogle.
47	*
48	* @param username the new identifier of the user
49	* @param password the new password
50	* @param admin whether the account is an administrator
51	*/
52	add(username: string, password: password, admin: boolean, callback?: (error: Error \| null, success?: boolean) => void): Promise<boolean> {
53	return andCall(this.socket.post(Endpoints.USER).query({username, password, admin})	3✔
54	.catch((err) => {
55	if (err.status === 405) {	1!
56	// method not allowed means that we're using Dicoogle 2,
57	// so we try again with the PUT method
58	return this.socket.put(Endpoints.USER).query({username, password, admin});	1✔
59	}
60	throw err;	×
61	})
62	.then((res) => res.body.success), callback);	3✔
63	}
64
65	/** Remove an existing user from the platorm.
66	*
67	* @param username the identifier of the user to remove
68	*/
69	remove(username: string, callback?: (error: Error \| null, removed?: boolean) => void): Promise<boolean> {
70	return andCall(this.socket.request('DELETE', [Endpoints.USER, username])	3✔
71	.then((res) => res.body.success), callback);	3✔
72	}
73	}

bioinformatics-ua / dicoogle-client-js / 3069001707

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous