skapi-js 0.2.4 → 1.0.0-alpha.3

package/js/main/skapi.d.ts

@@ -1,6 +1,9 @@
 import { User, Connection } from '../Types';
 export default class Skapi {
     version: string;
+    host: string;
+    hostDomain: string;
+    target_cdn: string;
     private __disabledAccount;
     private __cached_requests;
     private __startKeyHistory;
@@ -13,8 +16,6 @@ export default class Skapi {
     get user(): User | null;
     set user(value: User | null);
     connection: Connection | null;
-    host: string;
-    hostDomain: string;
     admin_endpoint: Promise<Record<string, any>>;
     record_endpoint: Promise<Record<string, any>>;
     validate: {

package/js/main/skapi.js

@@ -22,7 +22,10 @@ export default class Skapi {
     set user(value) {
     }
     constructor(service_id, owner, options) {
-        this.version = '0.2.4';
+        this.version = '1.0.0-alpha.3';
+        this.host = 'skapi';
+        this.hostDomain = 'skapi.app';
+        this.target_cdn = 'd1wrj5ymxrt2ir';
         this.__disabledAccount = null;
         this.__cached_requests = {};
         this.__startKeyHistory = {};
@@ -31,8 +34,6 @@ export default class Skapi {
         this.session = null;
         this.__user = null;
         this.connection = null;
-        this.host = 'skapi';
-        this.hostDomain = 'skapi.com';
         this.validate = {
             userId(val) {
                 try {
@@ -122,8 +123,7 @@ export default class Skapi {
         this.service = service_id;
         this.owner = owner;
         let autoLogin = typeof options?.autoLogin === 'boolean' ? options.autoLogin : true;
-        const target_cdn = 'd1h765tqb4s5ov';
-        const cdn_domain = `https://${target_cdn}.cloudfront.net`;
+        const cdn_domain = `https://${this.target_cdn}.cloudfront.net`;
         let sreg = service_id.substring(0, 4);
         this.admin_endpoint = fetch(`${cdn_domain}/${sreg}/admin.json`)
             .then(response => response.blob())

package/js/methods/user.d.ts

@@ -24,6 +24,7 @@ export declare function logout(e: SubmitEvent): Promise<'SUCCESS: The user has b
 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 login(form: Form<{
+    username: string;
     email: string;
     password: string;
 }>, option?: FormSubmitCallback): Promise<User>;

package/js/methods/user.js

@@ -215,7 +215,19 @@ export function authentication() {
                 cognitoUser.authenticateUser(authenticationDetails, {
                     newPasswordRequired: (userAttributes, requiredAttributes) => {
                         this.__request_signup_confirmation = username;
-                        rej(new SkapiError("User's signup confirmation is required.", { code: 'SIGNUP_CONFIRMATION_NEEDED' }));
+                        if (userAttributes['custom:signup_ticket'] === 'PASS' || userAttributes['custom:signup_ticket'] === 'MEMBER') {
+                            cognitoUser.completeNewPasswordChallenge(password, {}, {
+                                onSuccess: (result) => {
+                                    getSession().then(session => res(this.user));
+                                },
+                                onFailure: (err) => {
+                                    rej(new SkapiError(err.message || 'Failed to authenticate user.', { code: err.code }));
+                                }
+                            });
+                        }
+                        else {
+                            rej(new SkapiError("User's signup confirmation is required.", { code: 'SIGNUP_CONFIRMATION_NEEDED' }));
+                        }
                     },
                     onSuccess: (logged) => getSession().then(session => res(this.user)),
                     onFailure: (err) => {
@@ -243,7 +255,12 @@ export function authentication() {
             });
         });
     };
-    return { getSession, authenticateUser, createCognitoUser, getUser };
+    return {
+        getSession,
+        authenticateUser,
+        createCognitoUser,
+        getUser,
+    };
 }
 export async function getProfile(options) {
     await this.__connection;
@@ -314,14 +331,15 @@ export async function recoverAccount(redirect = false) {
 export async function login(form, option) {
     await logout.bind(this)();
     let params = validator.Params(form, {
+        username: 'string',
         email: (v) => validator.Email(v),
         password: (v) => validator.Password(v)
     }, ['email', 'password']);
-    return authentication.bind(this)().authenticateUser(params.email, params.password);
+    return authentication.bind(this)().authenticateUser(params.username || params.email, params.password);
 }
 export async function signup(form, option) {
-    await this.logout();
     let params = validator.Params(form || {}, {
+        username: 'string',
         email: (v) => validator.Email(v),
         password: (v) => validator.Password(v),
         name: 'string',
@@ -334,8 +352,20 @@ export async function signup(form, option) {
         gender_public: ['boolean', () => false],
         birthdate_public: ['boolean', () => false],
         phone_number_public: ['boolean', () => false],
+        access_group: 'number',
         misc: 'string'
     }, ['email', 'password']);
+    let is_admin = await checkAdmin.bind(this)();
+    let admin_creating_account = is_admin && params.service && this.service !== params.service;
+    if (admin_creating_account) {
+        params.owner = this.__user.user_id;
+    }
+    else {
+        if (params.access_group) {
+            throw new SkapiError('Only admins can set "access_group" parameter.', { code: 'INVALID_PARAMETER' });
+        }
+        await this.logout();
+    }
     option = validator.Params(option || {}, {
         email_subscription: (v) => {
             if (typeof v !== 'boolean') {
@@ -369,20 +399,25 @@ export async function signup(form, option) {
     });
     let logUser = option?.login || false;
     let signup_confirmation = option?.signup_confirmation || false;
+    if (admin_creating_account && signup_confirmation) {
+        throw new SkapiError('Admins cannot create an account with "option.signup_confirmation" option.', { code: 'INVALID_PARAMETER' });
+    }
     if (params.email_public && !signup_confirmation) {
         throw new SkapiError('"option.signup_confirmation" should be true if "email_public" is set to true.', { code: 'INVALID_PARAMETER' });
     }
     params.signup_confirmation = signup_confirmation;
     params.email_subscription = option?.email_subscription || false;
+    delete params.service;
+    delete params.owner;
     await request.bind(this)("signup", params);
     if (signup_confirmation) {
-        let u = await authentication.bind(this)().createCognitoUser(params.email);
+        let u = await authentication.bind(this)().createCognitoUser(params.username || params.email);
         cognitoUser = u.cognitoUser;
         this.__request_signup_confirmation = u.cognitoUsername;
         return "SUCCESS: The account has been created. User's signup confirmation is required.";
     }
     if (logUser) {
-        return login.bind(this)({ email: params.email, password: params.password });
+        return login.bind(this)({ email: params.username || params.email, password: params.password });
     }
     return 'SUCCESS: The account has been created.';
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "skapi-js",
-  "version": "0.2.4",
+  "version": "1.0.0-alpha.3",
   "description": "Javascript library for Skapi: Complete JAM Stack, front-end driven serverless backend API service.",
-  "main": "./dist/skapi.module.js",
+  "main": "./js/Main.js",
   "types": "./js/Main.d.ts",
   "files": [
     "js/",
     "dist/"
   ],
   "scripts": {
-    "build": "npx tsc --project tsconfig.json; npx webpack --config webpack.config.js",
-    "server": "(cd server; node server.js)"
+    "build": "npx tsc --project tsconfig.json; npx webpack --config webpack.config.js; cp -r dist playground;",
+    "dev": "(cd playground; node server.js)"
   },
   "repository": {
     "type": "git",