skapi-js 1.0.29 → 1.0.31

package/js/main/skapi.d.ts

@@ -42,6 +42,11 @@ export default class Skapi {
         message: any;
         sender?: string;
     }) => Promise<WebSocket>): any;
+    jwtLogin(params: {
+        jwt: string;
+        key_url: string;
+        client_id: string;
+    }): Promise<string>;
     consumeTicket(params: {
         ticket_id: string;
     }): Promise<string>;

package/js/main/skapi.js

@@ -10,7 +10,7 @@ import { getRecords, postRecord, deleteRecords, getTables, getIndexes, getTags,
 import { connectRealtime, joinRealtime, postRealtime, closeRealtime, getRealtimeUsers, getRealtimeGroups } from '../methods/realtime';
 import { request, secureRequest, mock, getFormResponse, formHandler, getConnection } from '../methods/request';
 import { subscribe, unsubscribe, blockSubscriber, unblockSubscriber, getSubscriptions, subscribeNewsletter, getNewsletters, unsubscribeNewsletter, getNewsletterSubscription } from '../methods/subscription';
-import { checkAdmin, getProfile, logout, recoverAccount, resendSignupConfirmation, authentication, login, signup, disableAccount, resetPassword, verifyEmail, verifyPhoneNumber, forgotPassword, changePassword, updateProfile, getUsers, setUserPool, userPool, lastVerifiedEmail, requestUsernameChange, consumeTicket, releaseTicket, getTicketKey } from '../methods/user';
+import { checkAdmin, getProfile, logout, recoverAccount, resendSignupConfirmation, authentication, login, signup, disableAccount, resetPassword, verifyEmail, verifyPhoneNumber, forgotPassword, changePassword, updateProfile, getUsers, setUserPool, userPool, lastVerifiedEmail, requestUsernameChange, consumeTicket, releaseTicket, getTicketKey, jwtLogin } from '../methods/user';
 export default class Skapi {
     get user() {
         if (this.__user && Object.keys(this.__user).length) {
@@ -23,7 +23,7 @@ export default class Skapi {
     set user(value) {
     }
     constructor(service, owner, options, __etc) {
-        this.version = '1.0.29';
+        this.version = '1.0.31';
         this.session = null;
         this.connection = null;
         this.host = 'skapi';
@@ -199,6 +199,9 @@ export default class Skapi {
     connectRealtime(cb) {
         return connectRealtime.bind(this)(cb);
     }
+    jwtLogin(params) {
+        return jwtLogin.bind(this)(params);
+    }
     consumeTicket(params) {
         return consumeTicket.bind(this)(params);
     }

package/js/methods/request.js

@@ -66,6 +66,7 @@ export async function request(url, data = null, options) {
                 case 'ticket':
                 case 'get-newsletter-subscription':
                 case 'request-username-change':
+                case 'jwt-login':
                     return {
                         public: admin.admin_public,
                         private: admin.admin_private

package/js/methods/user.d.ts

@@ -32,6 +32,11 @@ export declare function checkAdmin(): Promise<boolean>;
 export declare function logout(): Promise<'SUCCESS: The user has been logged out.'>;
 export declare function resendSignupConfirmation(redirect: string): Promise<'SUCCESS: Signup confirmation E-Mail has been sent.'>;
 export declare function recoverAccount(redirect?: boolean | string): Promise<"SUCCESS: Recovery e-mail has been sent.">;
+export declare function jwtLogin(params: {
+    jwt: string;
+    key_url: string;
+    client_id: string;
+}): Promise<any>;
 export declare function login(form: Form<{
     username?: string;
     email: string;

package/js/methods/user.js

@@ -197,7 +197,7 @@ export function authentication() {
     const createCognitoUser = async (email) => {
         if (!email)
             throw new SkapiError('E-Mail is required.', { code: 'INVALID_PARAMETER' });
-        let username = this.service + '-' + MD5.hash(email);
+        let username = email.includes(this.service + '-') ? email : this.service + '-' + MD5.hash(email);
         return {
             cognitoUser: new CognitoUser({
                 Username: username,
@@ -341,6 +341,10 @@ export async function recoverAccount(redirect = false) {
     this.__disabledAccount = null;
     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 });
+}
 export async function login(form) {
     await this.logout();
     let params = validator.Params(form, {

package/package.json

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