skapi-js 1.0.58 → 1.0.60

package/js/main/skapi.js

@@ -24,7 +24,7 @@ export default class Skapi {
     set user(value) {
     }
     constructor(service, owner, options, __etc) {
-        this.version = '1.0.58';
+        this.version = '1.0.60';
         this.session = null;
         this.connection = null;
         this.host = 'skapi';

package/js/methods/subscription.d.ts

@@ -33,7 +33,7 @@ export declare function unsubscribeNewsletter(params: {
 export declare function getNewsletters(params?: {
     searchFor: 'message_id' | 'timestamp' | 'read' | 'complaint' | 'subject';
     value: string | number;
-    range: string | number;
-    condition?: '>' | '>=' | '=' | '<' | '<=' | 'gt' | 'gte' | 'eq' | 'lt' | 'lte';
     group: 'public' | 'authorized' | number;
+    range?: string | number;
+    condition?: '>' | '>=' | '=' | '<' | '<=' | 'gt' | 'gte' | 'eq' | 'lt' | 'lte';
 }, fetchOptions?: FetchOptions): Promise<Newsletters>;

package/js/methods/subscription.js

@@ -131,21 +131,19 @@ export async function getNewsletters(params, fetchOptions) {
         'subject': 'string'
     };
     if (!params) {
-        if (!fetchOptions) {
-            fetchOptions = {};
-        }
-        fetchOptions.ascending = false;
+        fetchOptions = Object.assign({ ascending: false }, (fetchOptions || {}));
     }
-    let _params = params || {
+    params = params || {
         searchFor: 'timestamp',
-        value: 0,
-        condition: '>'
+        value: Date.now(),
+        condition: '<',
+        group: 'public'
     };
-    params = validator.Params(_params, {
+    params = validator.Params(params, {
         searchFor: ['message_id', 'timestamp', 'read', 'complaint', 'group', 'subject'],
         value: (v) => {
-            if (typeof v !== searchType[_params.searchFor]) {
-                throw new SkapiError(`"value" type does not match the type of "${_params.searchFor}" index.`, { code: 'INVALID_PARAMETER' });
+            if (typeof v !== searchType[params.searchFor]) {
+                throw new SkapiError(`"value" type does not match the type of "${params.searchFor}" index.`, { code: 'INVALID_PARAMETER' });
             }
             else if (typeof v === 'string' && !v) {
                 throw new SkapiError('"value" should not be empty string.', { code: 'INVALID_PARAMETER' });
@@ -153,28 +151,29 @@ export async function getNewsletters(params, fetchOptions) {
             return v;
         },
         range: (v) => {
-            if (!_params.hasOwnProperty('value') || typeof v !== typeof _params.value) {
+            if (!params.hasOwnProperty('value') || typeof v !== typeof params.value) {
                 throw new SkapiError('"range" should match type of "value".', { code: 'INVALID_PARAMETER' });
             }
             return v;
         },
         condition: ['>', '>=', '=', '<', '<=', 'gt', 'gte', 'eq', 'lt', 'lte', () => '='],
         group: (x) => {
-            if (!this.session) {
-                throw new SkapiError('User should be logged in.', { code: 'INVALID_REQUEST' });
-            }
             if (x === 'public') {
                 return 0;
             }
-            else if (x === 'authorized') {
+            if (!this.session) {
+                throw new SkapiError('User should be logged in.', { code: 'INVALID_REQUEST' });
+            }
+            if (x === 'authorized') {
                 return 1;
             }
-            else if (typeof x === 'number') {
+            if (typeof x === 'number') {
                 if (!isAdmin && x > parseInt(this.session.idToken.payload.access_group)) {
                     throw new SkapiError('User has no access.', { code: 'INVALID_REQUEST' });
                 }
+                return x;
             }
-            return x;
+            throw new SkapiError('"group" should be type: number | "public" | "authorized".', { code: 'INVALID_PARAMETER' });
         }
     }, ['searchFor', 'value', 'group']);
     let mails = await request.bind(this)(params.group === 0 ? 'get-public-newsletters' : 'get-newsletters', params, Object.assign({ method: 'get', auth: params.group !== 0 }, { fetchOptions }));

package/js/methods/user.d.ts

@@ -81,9 +81,6 @@ export declare function registerTicket(params: {
             data?: Record<string, any>;
             params?: Record<string, any>;
         };
-        update_service?: {
-            [key: string]: any;
-        };
     };
     description: string;
     count?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skapi-js",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "Skapi: Backend API Library for HTML frontend.",
   "main": "./dist/skapi.module.js",
   "types": "./js/Main.d.ts",
@@ -9,8 +9,7 @@
     "dist/"
   ],
   "scripts": {
-    "build": "npx tsc --project tsconfig.json; npx webpack --config webpack.config.js",
-    "dev": "(cd playground; node server.js)"
+    "build": "npx tsc --project tsconfig.json; npx webpack --config webpack.config.js;"
   },
   "repository": {
     "type": "git",