Merge branch 'master' into 7-dev

Author: Aschen

.eslintignore

@@ -12,6 +12,7 @@ src/controllers/Realtime.js
 src/controllers/Index.js
 src/controllers/Collection.js
 src/controllers/Base.js
+src/controllers/Security.js
 src/core/security/User.js
 src/core/security/Profile.js
 src/core/security/Role.js

.gitignore

@@ -41,6 +41,7 @@ src/controllers/Index.js
 src/controllers/Collection.js
 src/controllers/Base.js
 src/controllers/Realtime.js
+src/controllers/Security.js
 src/core/security/User.js
 src/core/security/Profile.js
 src/core/security/Role.js

doc/7/protocols/http/constructor/index.md

@@ -30,7 +30,7 @@ Http protocol connection options.
 | Property        | Type<br/>(default)               | Description                                                                            |
 |-----------------|----------------------------------|----------------------------------------------------------------------------------------|
 | `customRoutes`  | <pre>object</pre><br/>(`{}`)     | Add custom routes <SinceBadge version="6.2.0"/>                                        |
-| `headers`       | <pre>object</pre><br/>(`{}`)     | Default headers sent with each HTTP request <SinceBadge version="auto-version"/>       |
+| `headers`       | <pre>object</pre><br/>(`{}`)     | Default headers sent with each HTTP request <SinceBadge version="7.7.5"/>       |
 | `port`          | <pre>number</pre><br/>(`7512`)   | Kuzzle server port                                                                     |
 | `sslConnection` | <pre>boolean</pre><br/>(`false`) | Use SSL to connect to Kuzzle server <DeprecatedBadge version="7.4.0"/>               |
 | `ssl`           | <pre>boolean</pre><br/>(`false`) | Use SSL to connect to Kuzzle server. Defaults to `true` for ports 443 and 7443.        |

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "7.7.4",
+  "version": "7.7.5",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {

package.json

@@ -83,7 +83,7 @@ export class Kuzzle extends KuzzleEventEmitter {
   index: IndexController;
   ms: any;
   realtime: RealtimeController;
-  security: any;
+  security: SecurityController;
   server: any;
 
   private _protectedEvents: any;

src/Kuzzle.ts

@@ -1,12 +1,12 @@
-const { BaseController } = require('./Base');
-const { Role } = require('../core/security/Role');
-const { RoleSearchResult } = require('../core/searchResult/Role');
-const { Profile } = require('../core/security/Profile');
-const { ProfileSearchResult } = require('../core/searchResult/Profile');
-const { User } = require('../core/security/User');
-const { UserSearchResult } = require('../core/searchResult/User');
-
-class SecurityController extends BaseController {
+import { BaseController } from './Base';
+import { Role } from '../core/security/Role';
+import { RoleSearchResult } from '../core/searchResult/Role';
+import { Profile } from '../core/security/Profile';
+import { ProfileSearchResult } from '../core/searchResult/Profile';
+import { User } from '../core/security/User';
+import { UserSearchResult } from '../core/searchResult/User';
+
+export class SecurityController extends BaseController {
   /**
    * @param {Kuzzle} kuzzle
    */
@@ -23,7 +23,14 @@ class SecurityController extends BaseController {
    *
    * @returns {Promise.<Object>} ApiKey { _id, _source }
    */
-  createApiKey(userId, description, options = {}) {
+  createApiKey(
+    userId,
+    description,
+    options: {
+      expiresIn?: string | number,
+      _id?: string,
+      refresh?: 'wait_for',
+    } = {}) {
     const request = {
       userId,
       action: 'createApiKey',
@@ -65,16 +72,20 @@ class SecurityController extends BaseController {
    *
    * @returns {Promise}
    */
-  deleteApiKey(userId, id, options = {}) {
+  deleteApiKey(
+    userId,
+    id,
+    options: {
+      refresh?: 'wait_for',
+    } = {}) {
     const request = {
       userId,
       action: 'deleteApiKey',
       _id: id,
       refresh: options.refresh
     };
 
-    return this.query(request)
-      .then(() => {});
+    return this.query(request);
   }
 
   /**
@@ -86,7 +97,15 @@ class SecurityController extends BaseController {
    *
    * @returns {Promise.<object[]>} - { hits, total }
    */
-  searchApiKeys(userId, query = {}, options = {}) {
+  searchApiKeys(
+    userId,
+    query = {},
+    options: {
+      from?: number,
+      size?: number,
+      lang?: string,
+    } = {}
+  ) {
     const request = {
       userId,
       action: 'searchApiKeys',
@@ -110,7 +129,13 @@ class SecurityController extends BaseController {
       .then(response => response.result);
   }
 
-  createFirstAdmin (_id, body, options = {}) {
+  createFirstAdmin (
+    _id,
+    body,
+    options: {
+      reset?: boolean,
+    } = {}
+  ) {
     const request = {
       _id,
       body,
@@ -136,7 +161,13 @@ class SecurityController extends BaseController {
         response.result._source));
   }
 
-  createOrReplaceRole (_id, body, options = {}) {
+  createOrReplaceRole (
+    _id,
+    body,
+    options: {
+      force?: boolean,
+    } = {}
+  ) {
     const request = {
       _id,
       body,
@@ -176,7 +207,7 @@ class SecurityController extends BaseController {
       .then(response => new User(this.kuzzle, response.result._id, response.result._source));
   }
 
-  createRole (_id, body, options = {}) {
+  createRole (_id, body, options: { force?: boolean, } = {}) {
     const request = {
       _id,
       body,
@@ -489,7 +520,7 @@ class SecurityController extends BaseController {
       .then(response => response.result);
   }
 
-  updateRole (_id, body, options = {}) {
+  updateRole (_id, body, options: { force?: boolean, } = {}) {
     const request = {
       _id,
       body,
@@ -537,5 +568,3 @@ class SecurityController extends BaseController {
       .then(response => response.result);
   }
 }
-
-module.exports = { SecurityController };