@abtnode/auth 1.16.29-next-680cf137 → 1.16.29

package/lib/auth.js

@@ -21,6 +21,7 @@ const {
   WELLKNOWN_BLOCKLET_ADMIN_PATH,
 } = require('@abtnode/constant');
 const axios = require('@abtnode/util/lib/axios');
+const getRequestIP = require('@abtnode/util/lib/get-request-ip');
 const { extractUserAvatar, getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl } = require('@abtnode/util/lib/user');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
@@ -518,7 +519,7 @@ const handleInvitationReceive = async ({
         pk: user.pk,
         locale,
         passport,
-        lastLoginIp: get(req, 'headers[x-real-ip]') || '',
+        lastLoginIp: getRequestIP(req),
         remark,
         connectedAccount: {
           provider,
@@ -546,7 +547,7 @@ const handleInvitationReceive = async ({
         pk: userPk,
         locale,
         passport,
-        lastLoginIp: get(req, 'headers[x-real-ip]') || '',
+        lastLoginIp: getRequestIP(req),
         remark,
         connectedAccount: {
           provider,

package/lib/lost-passport.js

@@ -11,6 +11,7 @@ const { VC_TYPE_NODE_PASSPORT, PASSPORT_STATUS, NODE_DATA_DIR_NAME } = require('
 const get = require('lodash/get');
 const isFunction = require('lodash/isFunction');
 const { getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl, extractUserAvatar } = require('@abtnode/util/lib/user');
+const getRequestIP = require('@abtnode/util/lib/get-request-ip');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 const { getSourceAppPid, getLoginProvider } = require('@blocklet/sdk/lib/util/login');
 const {
@@ -326,7 +327,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
 
     if (isFunction(createToken)) {
       if (type === TEAM_TYPES.BLOCKLET) {
-        const lastLoginIp = request.get('x-real-ip');
+        const lastLoginIp = getRequestIP(request);
         const walletDeviceMessageToken = request.get('wallet-device-message-token');
         const walletDeviceId = request.get('wallet-device-id');
         const ua = request.get('user-agent');

package/lib/server.js

@@ -17,6 +17,7 @@ const { getBlockletChainInfo, isInProgress, isRunning } = require('@blocklet/met
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const formatContext = require('@abtnode/util/lib/format-context');
 const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
+const getRequestIP = require('@abtnode/util/lib/get-request-ip');
 const {
   ROLES,
   VC_TYPE_GENERAL_PASSPORT,
@@ -747,7 +748,7 @@ const createLaunchBlockletHandler =
         userDid,
         ownerDid: claim.userDid,
         ownerPk: claim.userPk,
-        lastLoginIp: get(req, 'headers[x-real-ip]') || '',
+        lastLoginIp: getRequestIP(req),
         context: formatContext(req),
         locale,
         launcherSessionId,
@@ -799,7 +800,7 @@ const createLaunchBlockletHandler =
       context: {
         visitorId: extraParams.visitorId,
         ua: req.get('user-agent'),
-        lastLoginIp: req.get('x-real-ip'),
+        lastLoginIp: getRequestIP(req),
         walletOS: didwallet?.os,
         walletDeviceMessageToken: req.get('wallet-device-message-token'),
         walletDeviceId: req.get('wallet-device-id'),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-next-680cf137",
+  "version": "1.16.29",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,21 +20,21 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.29-next-680cf137",
-    "@abtnode/logger": "1.16.29-next-680cf137",
-    "@abtnode/util": "1.16.29-next-680cf137",
-    "@arcblock/did": "1.18.126",
-    "@arcblock/jwt": "^1.18.126",
-    "@arcblock/nft-display": "^2.10.7",
-    "@arcblock/validator": "^1.18.126",
-    "@arcblock/vc": "1.18.126",
-    "@blocklet/constant": "1.16.29-next-680cf137",
-    "@blocklet/meta": "1.16.29-next-680cf137",
-    "@blocklet/sdk": "1.16.29-next-680cf137",
-    "@ocap/client": "^1.18.126",
-    "@ocap/mcrypto": "1.18.126",
-    "@ocap/util": "1.18.126",
-    "@ocap/wallet": "1.18.126",
+    "@abtnode/constant": "1.16.29",
+    "@abtnode/logger": "1.16.29",
+    "@abtnode/util": "1.16.29",
+    "@arcblock/did": "1.18.128",
+    "@arcblock/jwt": "^1.18.128",
+    "@arcblock/nft-display": "^2.10.12",
+    "@arcblock/validator": "^1.18.128",
+    "@arcblock/vc": "1.18.128",
+    "@blocklet/constant": "1.16.29",
+    "@blocklet/meta": "1.16.29",
+    "@blocklet/sdk": "1.16.29",
+    "@ocap/client": "^1.18.128",
+    "@ocap/mcrypto": "1.18.128",
+    "@ocap/util": "1.18.128",
+    "@ocap/wallet": "1.18.128",
     "axios": "^1.7.2",
     "flat": "^5.0.2",
     "fs-extra": "^11.2.0",
@@ -50,5 +50,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "17b7e7c5e43c497980d4fe6b5bb20609328041bd"
+  "gitHead": "6c49cffcab4fd0dffc6bed261a5eddf733280ae7"
 }