@blocklet/sdk 1.16.8-beta-ca58a421 → 1.16.8-beta-81db8efa

package/lib/service/auth.d.ts

@@ -7,7 +7,10 @@ declare class AuthService {
     constructor(httpEndpoint?: string);
 }
 interface AuthService {
-    login: (params: object) => Promise<string>;
+    login: (params: object) => Promise<{
+        user: Object;
+        token: string;
+    }>;
     getUser(did: string, options?: {
         enableConnectedAccount?: boolean;
         enableNormalize?: boolean;

package/lib/service/auth.js

@@ -7,8 +7,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const url_join_1 = __importDefault(require("url-join"));
 const client_1 = __importDefault(require("@abtnode/client"));
+const semver_1 = __importDefault(require("semver"));
 const mcrypto_1 = require("@ocap/mcrypto");
 const wallet_1 = require("@ocap/wallet");
+const env_1 = require("@blocklet/env");
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
 const version_1 = require("../version");
@@ -29,15 +31,18 @@ const fixAvatar = (user) => {
     }
     return user;
 };
+const toBuffer = (str) => (str.startsWith('0x') ? Buffer.from(str.slice(2), 'hex') : str);
 class AuthClient extends client_1.default {
     constructor(httpEndpoint) {
         (0, check_blocklet_env_1.default)();
         super(httpEndpoint || `http://127.0.0.1:${process.env.ABT_NODE_PORT}/api/gql`.trim(), `BlockletSDK/${VERSION}`);
         const wallet = (0, wallet_2.default)();
+        const useNewSigner = !env_1.serverVersion || semver_1.default.gte(env_1.serverVersion, '1.16.7');
         this.setAuthAccessKey({
             accessKeyId: wallet.address,
-            accessKeySecret: wallet.secretKey,
-            type,
+            // for backward compatibility
+            accessKeySecret: useNewSigner ? toBuffer(wallet.secretKey) : wallet.secretKey,
+            type: useNewSigner ? 'sha256' : type,
         });
     }
     _getAuthHeaders() {
@@ -131,6 +136,9 @@ class AuthService {
         this.login = async (data) => {
             try {
                 const { data: resData } = await service_api_1.default.post('/user/login', data);
+                if (resData?.user) {
+                    fixAvatar(resData.user);
+                }
                 return resData;
             }
             catch (err) {

package/lib/types/email.d.ts

@@ -0,0 +1,7 @@
+export interface TEmailConfigSchema {
+    from: string;
+    host: string;
+    password: string;
+    port: number;
+    user: string;
+}

package/lib/types/email.js

@@ -0,0 +1,3 @@
+"use strict";
+/* eslint-disable @typescript-eslint/indent */
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/validators/email.d.ts

@@ -0,0 +1,3 @@
+import Joi from 'joi';
+declare const emailConfigSchema: Joi.ObjectSchema<any>;
+export { emailConfigSchema };

package/lib/validators/email.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.emailConfigSchema = void 0;
+const joi_1 = __importDefault(require("joi"));
+const emailConfigSchema = joi_1.default.object({
+    from: joi_1.default.string().email().required(),
+    host: joi_1.default.string().hostname().required(),
+    port: joi_1.default.number().port().required(),
+    user: joi_1.default.string().required(),
+    password: joi_1.default.string().required(),
+})
+    .empty(null)
+    .meta({ className: 'TEmailConfigSchema' });
+exports.emailConfigSchema = emailConfigSchema;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-beta-ca58a421",
+  "version": "1.16.8-beta-81db8efa",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.8-beta-ca58a421",
-    "@abtnode/constant": "1.16.8-beta-ca58a421",
+    "@abtnode/client": "1.16.8-beta-81db8efa",
+    "@abtnode/constant": "1.16.8-beta-81db8efa",
     "@arcblock/did": "1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/jwt": "1.18.78",
     "@arcblock/ws": "1.18.78",
-    "@blocklet/constant": "1.16.8-beta-ca58a421",
-    "@blocklet/env": "1.16.8-beta-ca58a421",
-    "@blocklet/meta": "1.16.8-beta-ca58a421",
+    "@blocklet/constant": "1.16.8-beta-81db8efa",
+    "@blocklet/env": "1.16.8-beta-81db8efa",
+    "@blocklet/meta": "1.16.8-beta-81db8efa",
     "@did-connect/authenticator": "^2.1.54",
     "@did-connect/handler": "^2.1.54",
     "@nedb/core": "^2.1.5",
@@ -47,6 +47,7 @@
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
+    "semver": "^7.3.8",
     "ufo": "^1.1.1",
     "url-join": "^4.0.1"
   },
@@ -72,5 +73,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "d0f724c8082572a01b6e9287df6c3d0663ec9c57"
+  "gitHead": "8c4e3190de79a1fb2aaa14646255d938324cc5c2"
 }