@naturalcycles/backend-lib 4.2.4 → 4.3.0
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.
|
@@ -42,7 +42,7 @@ export declare class BaseAdminService {
|
|
|
42
42
|
* Override if needed.
|
|
43
43
|
*/
|
|
44
44
|
getAdminToken(req: BackendRequest): Promise<string | undefined>;
|
|
45
|
-
isAdmin(req: BackendRequest): Promise<boolean>;
|
|
45
|
+
isAdmin(req: BackendRequest | undefined): Promise<boolean>;
|
|
46
46
|
getAdminInfo(req: BackendRequest): Promise<AdminInfo | undefined>;
|
|
47
47
|
/**
|
|
48
48
|
* Returns AdminInfo if it has all required permissions.
|
|
@@ -75,6 +75,8 @@ class BaseAdminService {
|
|
|
75
75
|
req.header('x-admin-token'));
|
|
76
76
|
}
|
|
77
77
|
async isAdmin(req) {
|
|
78
|
+
if (!req)
|
|
79
|
+
return false;
|
|
78
80
|
const adminToken = await this.getAdminToken(req);
|
|
79
81
|
const email = await this.getEmailByToken(req, adminToken);
|
|
80
82
|
return !!this.getEmailPermissions(email);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@naturalcycles/backend-lib",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"prepare": "husky install && patch-package",
|
|
6
6
|
"serve": "APP_ENV=dev nodemon",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"@types/on-finished": "^2.3.1",
|
|
27
27
|
"cookie-parser": "^1.4.3",
|
|
28
28
|
"cors": "^2.8.5",
|
|
29
|
-
"dotenv": "^
|
|
29
|
+
"dotenv": "^16.0.0",
|
|
30
30
|
"ejs": "^3.0.1",
|
|
31
31
|
"express": "^4.16.4",
|
|
32
32
|
"express-promise-router": "^4.0.0",
|
|
@@ -119,7 +119,8 @@ export class BaseAdminService {
|
|
|
119
119
|
)
|
|
120
120
|
}
|
|
121
121
|
|
|
122
|
-
async isAdmin(req: BackendRequest): Promise<boolean> {
|
|
122
|
+
async isAdmin(req: BackendRequest | undefined): Promise<boolean> {
|
|
123
|
+
if (!req) return false
|
|
123
124
|
const adminToken = await this.getAdminToken(req)
|
|
124
125
|
const email = await this.getEmailByToken(req, adminToken)
|
|
125
126
|
return !!this.getEmailPermissions(email)
|