skapi-js 1.0.31 → 1.0.33

package/js/main/skapi.js

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

package/js/methods/user.js

@@ -342,16 +342,35 @@ export async function recoverAccount(redirect = false) {
     return 'SUCCESS: Recovery e-mail has been sent.';
 }
 export async function jwtLogin(params) {
-    let { hashedPassword } = request.bind(this)("jwt-login", params);
-    return login.bind(this)({ email: params.client_id, password: hashedPassword });
+    let { hashedPassword, username } = request.bind(this)("jwt-login", params);
+    try {
+        return login.bind(this)({ username: username, password: hashedPassword });
+    }
+    catch (err) {
+        if (err.code === 'INCORRECT_USERNAME_OR_PASSWORD') {
+            throw new SkapiError('User has migrated the account. Login with the service username and password.', { code: 'INVALID_REQUEST' });
+        }
+    }
 }
 export async function login(form) {
     await this.logout();
     let params = validator.Params(form, {
         username: 'string',
-        email: (v) => validator.Email(v),
+        email: 'string',
         password: (v) => validator.Password(v)
-    }, ['email', 'password']);
+    }, ['password']);
+    if (params.email) {
+        try {
+            validator.Email(params.email);
+        }
+        catch (err) {
+            params.username = params.email;
+            delete params.email;
+        }
+    }
+    if (!params.username && !params.email) {
+        throw new SkapiError('Least one of "username" or "email" is required.', { code: 'INVALID_PARAMETER' });
+    }
     return authentication.bind(this)().authenticateUser(params.username || params.email, params.password);
 }
 export async function signup(form, option) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skapi-js",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "Skapi: Backend API Library for HTML frontend.",
   "main": "./dist/skapi.module.js",
   "types": "./js/Main.d.ts",