@dnax/core 0.58.0 → 0.58.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/app/hono.ts +7 -8
- package/driver/mongo/rest.ts +10 -10
- package/lib/asyncLocalStorage.ts +3 -2
- package/package.json +1 -1
package/app/hono.ts
CHANGED
|
@@ -116,8 +116,7 @@ function HonoInstance(): typeof app {
|
|
|
116
116
|
c.req.raw.headers?.get("x-real-ip") ||
|
|
117
117
|
c.req.raw.headers?.get("remoteaddr") ||
|
|
118
118
|
"::1",
|
|
119
|
-
|
|
120
|
-
isAuth: valid ? true : false,
|
|
119
|
+
isAuth: valid && decode?.session ? true : false,
|
|
121
120
|
reqAt: moment().format().toString(),
|
|
122
121
|
setAt: sessionData?._v?.setAt || null,
|
|
123
122
|
};
|
|
@@ -133,7 +132,7 @@ function HonoInstance(): typeof app {
|
|
|
133
132
|
state: sessionData?.state || {},
|
|
134
133
|
role: sessionData?.role || null,
|
|
135
134
|
_v: { ...(_v || {}) },
|
|
136
|
-
isAuth:
|
|
135
|
+
isAuth: true,
|
|
137
136
|
});
|
|
138
137
|
} else {
|
|
139
138
|
// no valid token
|
|
@@ -183,7 +182,7 @@ function HonoInstance(): typeof app {
|
|
|
183
182
|
token: c.var["token"] || null,
|
|
184
183
|
action: action,
|
|
185
184
|
c: c,
|
|
186
|
-
isAuth:
|
|
185
|
+
isAuth: sessionStorage()?.get()?.isAuth ?? false,
|
|
187
186
|
rest: new useRest({ tenant_id: tenant_id, c: c }),
|
|
188
187
|
session: session as any,
|
|
189
188
|
});
|
|
@@ -195,7 +194,7 @@ function HonoInstance(): typeof app {
|
|
|
195
194
|
token: c.var["token"] || null,
|
|
196
195
|
action: action,
|
|
197
196
|
c: c,
|
|
198
|
-
isAuth:
|
|
197
|
+
isAuth: sessionStorage()?.get()?.isAuth ?? false,
|
|
199
198
|
rest: new useRest({ tenant_id: tenant_id }),
|
|
200
199
|
session: session as any,
|
|
201
200
|
});
|
|
@@ -220,7 +219,7 @@ function HonoInstance(): typeof app {
|
|
|
220
219
|
token: c.var["token"] || null,
|
|
221
220
|
action: action,
|
|
222
221
|
c: c,
|
|
223
|
-
isAuth:
|
|
222
|
+
isAuth: sessionStorage()?.get()?.isAuth ?? false,
|
|
224
223
|
rest: new useRest({ tenant_id: tenant_id }),
|
|
225
224
|
session: sessionStorage(),
|
|
226
225
|
});
|
|
@@ -248,7 +247,7 @@ function HonoInstance(): typeof app {
|
|
|
248
247
|
session: sessionStorage(),
|
|
249
248
|
action: action,
|
|
250
249
|
c: c,
|
|
251
|
-
isAuth:
|
|
250
|
+
isAuth: sessionStorage()?.get()?.isAuth ?? false,
|
|
252
251
|
rest: new useRest({ tenant_id: tenant_id }),
|
|
253
252
|
});
|
|
254
253
|
}
|
|
@@ -329,7 +328,7 @@ function HonoInstance(): typeof app {
|
|
|
329
328
|
rest: rest,
|
|
330
329
|
error: fn.error,
|
|
331
330
|
session: sessionStorage(),
|
|
332
|
-
isAuth:
|
|
331
|
+
isAuth: sessionStorage()?.get()?.isAuth ?? false,
|
|
333
332
|
});
|
|
334
333
|
} else {
|
|
335
334
|
c?.status(404);
|
package/driver/mongo/rest.ts
CHANGED
|
@@ -162,7 +162,7 @@ class useRest {
|
|
|
162
162
|
> => {
|
|
163
163
|
return new Promise(async (resolve, reject) => {
|
|
164
164
|
try {
|
|
165
|
-
params
|
|
165
|
+
params.$match = {
|
|
166
166
|
...(params?.$match || {}),
|
|
167
167
|
collection: collection,
|
|
168
168
|
};
|
|
@@ -465,7 +465,7 @@ class useRest {
|
|
|
465
465
|
action: "insertOne",
|
|
466
466
|
internal: sessionStorage()?.get() ? false : true,
|
|
467
467
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
468
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
468
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
469
469
|
role: sessionStorage()?.get()?.role!,
|
|
470
470
|
user: sessionStorage()?.get()?.state?.user,
|
|
471
471
|
state: sessionStorage()?.get()?.state,
|
|
@@ -609,7 +609,7 @@ class useRest {
|
|
|
609
609
|
transaction: this.#session ? true : false,
|
|
610
610
|
internal: sessionStorage()?.get() ? false : true,
|
|
611
611
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
612
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
612
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
613
613
|
role: sessionStorage()?.get()?.role!,
|
|
614
614
|
user: sessionStorage()?.get()?.state?.user,
|
|
615
615
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1231,7 +1231,7 @@ class useRest {
|
|
|
1231
1231
|
action: "updateOne",
|
|
1232
1232
|
internal: sessionStorage()?.get() ? false : true,
|
|
1233
1233
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1234
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1234
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1235
1235
|
role: sessionStorage()?.get()?.role!,
|
|
1236
1236
|
user: sessionStorage()?.get()?.state?.user,
|
|
1237
1237
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1328,7 +1328,7 @@ class useRest {
|
|
|
1328
1328
|
action: "findAndUpdate",
|
|
1329
1329
|
internal: sessionStorage()?.get() ? false : true,
|
|
1330
1330
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1331
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1331
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1332
1332
|
role: sessionStorage()?.get()?.role!,
|
|
1333
1333
|
user: sessionStorage()?.get()?.state?.user,
|
|
1334
1334
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1429,7 +1429,7 @@ class useRest {
|
|
|
1429
1429
|
action: "findOneAndUpdate",
|
|
1430
1430
|
internal: sessionStorage()?.get() ? false : true,
|
|
1431
1431
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1432
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1432
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1433
1433
|
role: sessionStorage()?.get()?.role!,
|
|
1434
1434
|
user: sessionStorage()?.get()?.state?.user,
|
|
1435
1435
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1661,7 +1661,7 @@ class useRest {
|
|
|
1661
1661
|
transaction: this.#session ? true : false,
|
|
1662
1662
|
internal: sessionStorage()?.get() ? false : true,
|
|
1663
1663
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1664
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1664
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1665
1665
|
role: sessionStorage()?.get()?.role!,
|
|
1666
1666
|
user: sessionStorage()?.get()?.state?.user,
|
|
1667
1667
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1800,7 +1800,7 @@ class useRest {
|
|
|
1800
1800
|
action: "deleteOne",
|
|
1801
1801
|
internal: sessionStorage()?.get() ? false : true,
|
|
1802
1802
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1803
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1803
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1804
1804
|
role: sessionStorage()?.get()?.role!,
|
|
1805
1805
|
user: sessionStorage()?.get()?.state?.user,
|
|
1806
1806
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1938,7 +1938,7 @@ class useRest {
|
|
|
1938
1938
|
action: "deleteMany",
|
|
1939
1939
|
internal: sessionStorage()?.get() ? false : true,
|
|
1940
1940
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1941
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1941
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1942
1942
|
role: sessionStorage()?.get()?.role!,
|
|
1943
1943
|
user: sessionStorage()?.get()?.state?.user,
|
|
1944
1944
|
state: sessionStorage()?.get()?.state,
|
|
@@ -1965,7 +1965,7 @@ class useRest {
|
|
|
1965
1965
|
action: "dropCollection",
|
|
1966
1966
|
internal: sessionStorage()?.get() ? false : true,
|
|
1967
1967
|
ip: sessionStorage()?.get()?._v?.ip,
|
|
1968
|
-
auth: sessionStorage()?.get()?.isAuth,
|
|
1968
|
+
auth: sessionStorage()?.get()?._v?.isAuth ?? false,
|
|
1969
1969
|
role: sessionStorage()?.get()?.role!,
|
|
1970
1970
|
user: sessionStorage()?.get()?.state?.user,
|
|
1971
1971
|
state: sessionStorage()?.get()?.state,
|
package/lib/asyncLocalStorage.ts
CHANGED
|
@@ -52,13 +52,14 @@ const sessionStorage = () => ({
|
|
|
52
52
|
},
|
|
53
53
|
set(
|
|
54
54
|
input: {
|
|
55
|
-
id
|
|
56
|
-
state
|
|
55
|
+
id?: string;
|
|
56
|
+
state?: object;
|
|
57
57
|
_v?: object;
|
|
58
58
|
role?: string;
|
|
59
59
|
token?: string;
|
|
60
60
|
expiresIn?: string;
|
|
61
61
|
generateToken?: boolean;
|
|
62
|
+
isAuth?: boolean;
|
|
62
63
|
} = {
|
|
63
64
|
id: "",
|
|
64
65
|
state: {},
|