@blocklet/sdk 1.16.32-beta-4d47ae7f → 1.16.32-beta-17be26d7

package/lib/component/index.d.ts

@@ -21,6 +21,7 @@ type CallComponent = {
 declare const call: CallComponent;
 declare const getComponentMountPoint: (keyword: string) => string;
 declare const getUrl: (...parts: string[]) => string;
+declare const getRelativeUrl: (...parts: string[]) => string;
 declare const getResourceExportDir: ({ projectId, releaseId }?: {
     projectId: string;
     releaseId?: string;
@@ -47,6 +48,7 @@ declare const getPackResources: ({ types, }?: {
 declare const waitForComponentRunning: (name: string, timeout?: number, interval?: number) => Promise<boolean>;
 export { call };
 export { getUrl };
+export { getRelativeUrl };
 export { getComponentMountPoint };
 export { getComponentWebEndpoint };
 export { waitForComponentRunning };
@@ -57,6 +59,7 @@ export { getPackResources };
 declare const _default: {
     call: CallComponent;
     getUrl: (...parts: string[]) => string;
+    getRelativeUrl: (...parts: string[]) => string;
     getComponentMountPoint: (keyword: string) => string;
     getComponentWebEndpoint: (keyword: string) => string;
     waitForComponentRunning: (name: string, timeout?: number, interval?: number) => Promise<boolean>;

package/lib/component/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackResources = exports.getResources = exports.getReleaseExportDir = exports.getResourceExportDir = exports.waitForComponentRunning = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getUrl = exports.call = void 0;
+exports.getPackResources = exports.getResources = exports.getReleaseExportDir = exports.getResourceExportDir = exports.waitForComponentRunning = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getRelativeUrl = exports.getUrl = exports.call = void 0;
 const path_1 = require("path");
 const axios_1 = __importDefault(require("axios"));
 const get_1 = __importDefault(require("lodash/get"));
@@ -106,6 +106,12 @@ const getUrl = (...parts) => {
     return (0, ufo_1.joinURL)(BLOCKLET_APP_URL, mountPoint === '/' ? '' : mountPoint, ...parts);
 };
 exports.getUrl = getUrl;
+const getRelativeUrl = (...parts) => {
+    const { BLOCKLET_COMPONENT_DID } = process.env;
+    const mountPoint = getComponentMountPoint(BLOCKLET_COMPONENT_DID);
+    return (0, ufo_1.joinURL)(mountPoint === '/' ? '' : mountPoint, ...parts);
+};
+exports.getRelativeUrl = getRelativeUrl;
 const getResourceExportDir = ({ projectId, releaseId } = { projectId: '' }) => {
     if (!projectId) {
         throw new Error('projectId is required');
@@ -161,6 +167,7 @@ exports.waitForComponentRunning = waitForComponentRunning;
 exports.default = {
     call,
     getUrl,
+    getRelativeUrl,
     getComponentMountPoint,
     getComponentWebEndpoint,
     waitForComponentRunning,

package/lib/middlewares/auth.d.ts

@@ -2,7 +2,8 @@ import { NextFunction, Request, Response } from 'express';
 type MiddlewareParams = {
     roles?: string[];
     permissions?: string[];
+    kyc?: string[];
     getClient?: Function;
 };
-declare const AuthMiddleware: ({ roles, permissions, getClient }?: MiddlewareParams) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
+declare const AuthMiddleware: ({ roles, permissions, kyc, getClient }?: MiddlewareParams) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export = AuthMiddleware;

package/lib/middlewares/auth.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const lru_cache_1 = __importDefault(require("lru-cache"));
 const auth_1 = __importDefault(require("../service/auth"));
+const login_1 = require("../util/login");
 const cache = new lru_cache_1.default({ max: 10, maxAge: 60 * 1000 });
 const clients = {};
 const getServiceClient = () => {
@@ -25,13 +26,16 @@ const getPermissionsByRole = async (getClient, role) => {
     cache.set(role, res);
     return res;
 };
-const AuthMiddleware = ({ roles, permissions, getClient = getServiceClient } = {}) => {
+const AuthMiddleware = ({ roles, permissions, kyc, getClient = getServiceClient } = {}) => {
     if (roles && !Array.isArray(roles)) {
         throw new Error('roles must be array');
     }
     if (permissions && !Array.isArray(permissions)) {
         throw new Error('permissions must be array');
     }
+    if (kyc && !Array.isArray(kyc)) {
+        throw new Error('kyc must be array');
+    }
     return async (req, res, next) => {
         if (!req.headers['x-user-did']) {
             res.status(401).json({ code: 'forbidden', error: 'not authorized' });
@@ -48,6 +52,13 @@ const AuthMiddleware = ({ roles, permissions, getClient = getServiceClient } = {
                 return;
             }
         }
+        if (kyc) {
+            const kycStatus = (0, login_1.decodeKycStatus)(Number(req.headers['x-user-kyc']) || 0);
+            if (kyc.some((x) => !kycStatus[`${x}Verified`])) {
+                res.status(403).json({ code: 'forbidden', error: 'kyc required' });
+                return;
+            }
+        }
         next();
     };
 };

package/lib/middlewares/index.d.ts

@@ -16,11 +16,14 @@ declare const _default: {
             provider: string;
             fullName: string;
             walletOS: string;
+            emailVerified: boolean;
+            phoneVerified: boolean;
         };
     }, res: import("express").Response, next: import("express").NextFunction) => void;
-    auth: ({ roles, permissions, getClient }?: {
+    auth: ({ roles, permissions, kyc, getClient }?: {
         roles?: string[];
         permissions?: string[];
+        kyc?: string[];
         getClient?: Function;
     }) => (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;
     component: {

package/lib/middlewares/user.d.ts

@@ -5,6 +5,8 @@ type User = {
     provider: string;
     fullName: string;
     walletOS: string;
+    emailVerified: boolean;
+    phoneVerified: boolean;
 };
 declare const userMiddleware: () => (req: Request & {
     user?: User;

package/lib/middlewares/user.js

@@ -1,4 +1,5 @@
 "use strict";
+const login_1 = require("../util/login");
 const userMiddleware = () => (req, res, next) => {
     if (req.headers['x-user-did']) {
         req.user = {
@@ -7,6 +8,7 @@ const userMiddleware = () => (req, res, next) => {
             provider: req.headers['x-user-provider'],
             fullName: decodeURIComponent(req.headers['x-user-fullname']),
             walletOS: req.headers['x-user-wallet-os'],
+            ...(0, login_1.decodeKycStatus)(Number(req.headers['x-user-kyc']) || 0),
         };
     }
     next();

package/lib/service/auth.js

@@ -19,7 +19,7 @@ const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env
 const version_1 = require("../version");
 const wallet_2 = __importDefault(require("../wallet"));
 const service_api_1 = __importDefault(require("../util/service-api"));
-const { NODE_SERVICES, WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
+const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
 // BLOCKLET_WALLET_TYPE is for backward compatibility
@@ -52,8 +52,6 @@ class AuthClient extends client_1.default {
         const headers = super._getAuthHeaders();
         // BLOCKLET_DID is always same as BLOCKLET_APP_PID in structV2 application
         headers['x-access-blocklet'] = process.env.BLOCKLET_DID;
-        // x-access-service is not used since 1.8.35
-        headers['x-access-service'] = NODE_SERVICES.AUTH_SERVICE;
         return headers;
     }
 }

package/lib/util/login.d.ts

@@ -1,2 +1,7 @@
 export declare function getLoginProvider(request: any): any;
 export declare function getSourceAppPid(request: any): any;
+export declare const encodeKycStatus: (emailVerified: boolean, phoneVerified: boolean) => number;
+export declare const decodeKycStatus: (status: number) => {
+    emailVerified: boolean;
+    phoneVerified: boolean;
+};

package/lib/util/login.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeKycStatus = exports.encodeKycStatus = void 0;
 exports.getLoginProvider = getLoginProvider;
 exports.getSourceAppPid = getSourceAppPid;
 /* eslint-disable import/prefer-default-export */
@@ -12,3 +13,21 @@ function getSourceAppPid(request) {
     const extraParams = request?.context?.store?.extraParams || request.query || {};
     return extraParams?.sourceAppPid || null;
 }
+const encodeKycStatus = (emailVerified, phoneVerified) => {
+    const emailVerifiedBit = emailVerified ? 1 : 0;
+    const phoneVerifiedBit = phoneVerified ? 1 : 0;
+    // eslint-disable-next-line no-bitwise
+    return emailVerifiedBit | (phoneVerifiedBit << 1);
+};
+exports.encodeKycStatus = encodeKycStatus;
+const decodeKycStatus = (status) => {
+    // eslint-disable-next-line no-bitwise
+    const emailVerifiedBit = status & 1;
+    // eslint-disable-next-line no-bitwise
+    const phoneVerifiedBit = (status >> 1) & 1;
+    return {
+        emailVerified: emailVerifiedBit === 1,
+        phoneVerified: phoneVerifiedBit === 1,
+    };
+};
+exports.decodeKycStatus = decodeKycStatus;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.32-beta-4d47ae7f",
+  "version": "1.16.32-beta-17be26d7",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,15 +27,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.32-beta-4d47ae7f",
-    "@abtnode/constant": "1.16.32-beta-4d47ae7f",
+    "@abtnode/client": "1.16.32-beta-17be26d7",
+    "@abtnode/constant": "1.16.32-beta-17be26d7",
     "@arcblock/did": "1.18.135",
     "@arcblock/did-auth": "1.18.135",
     "@arcblock/jwt": "1.18.135",
     "@arcblock/ws": "1.18.135",
-    "@blocklet/constant": "1.16.32-beta-4d47ae7f",
-    "@blocklet/env": "1.16.32-beta-4d47ae7f",
-    "@blocklet/meta": "1.16.32-beta-4d47ae7f",
+    "@blocklet/constant": "1.16.32-beta-17be26d7",
+    "@blocklet/env": "1.16.32-beta-17be26d7",
+    "@blocklet/meta": "1.16.32-beta-17be26d7",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
@@ -75,5 +75,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "740b8032aa02e19b888bf6a257840089696613ef"
+  "gitHead": "9fa42d5a545aea6d57d2e1c51849fe227c8acb5e"
 }