@things-factory/auth-base 8.0.38 → 8.0.54
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/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/router/auth-checkin-router.js +8 -11
- package/dist-server/router/auth-checkin-router.js.map +1 -1
- package/dist-server/router/auth-private-process-router.js +0 -2
- package/dist-server/router/auth-private-process-router.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/dist-server/utils/get-user-domains.d.ts +1 -1
- package/dist-server/utils/get-user-domains.js +4 -2
- package/dist-server/utils/get-user-domains.js.map +1 -1
- package/package.json +4 -4
- package/server/router/auth-checkin-router.ts +8 -11
- package/server/router/auth-private-process-router.ts +0 -2
- package/server/utils/get-user-domains.ts +5 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Domain } from '@things-factory/shell';
|
|
2
2
|
import { User } from '../service/user/user';
|
|
3
|
-
export declare function getUserDomains(user: User
|
|
3
|
+
export declare function getUserDomains(user: User): Promise<Partial<Domain>[]>;
|
|
4
4
|
export declare function getDomainsWithPrivilege(user: User, privilege: string, category: string): Promise<Partial<Domain>[]>;
|
|
5
5
|
export declare function getDomainsAsOwner(user: User): Promise<Partial<Domain>[]>;
|
|
@@ -4,8 +4,10 @@ exports.getUserDomains = getUserDomains;
|
|
|
4
4
|
exports.getDomainsWithPrivilege = getDomainsWithPrivilege;
|
|
5
5
|
exports.getDomainsAsOwner = getDomainsAsOwner;
|
|
6
6
|
const shell_1 = require("@things-factory/shell");
|
|
7
|
+
const env_1 = require("@things-factory/env");
|
|
7
8
|
const user_1 = require("../service/user/user");
|
|
8
|
-
|
|
9
|
+
const domainTypes = env_1.config.get('domainTypes', []);
|
|
10
|
+
async function getUserDomains(user) {
|
|
9
11
|
return (await (0, shell_1.getRepository)(shell_1.Domain)
|
|
10
12
|
.createQueryBuilder('DOMAIN')
|
|
11
13
|
.where(qb => {
|
|
@@ -31,7 +33,7 @@ async function getUserDomains(user, extType) {
|
|
|
31
33
|
})
|
|
32
34
|
.orderBy('DOMAIN.name', 'ASC')
|
|
33
35
|
.getMany())
|
|
34
|
-
.filter(
|
|
36
|
+
.filter(d => !d.extType || domainTypes.includes(d.extType))
|
|
35
37
|
.map(domain => {
|
|
36
38
|
const { id, name, description, subdomain, extType, brandName, brandImage } = domain;
|
|
37
39
|
/* do not remove id column for result */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-user-domains.js","sourceRoot":"","sources":["../../server/utils/get-user-domains.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get-user-domains.js","sourceRoot":"","sources":["../../server/utils/get-user-domains.ts"],"names":[],"mappings":"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","sourcesContent":["import { Domain, getRepository } from '@things-factory/shell'\nimport { config } from '@things-factory/env'\n\nimport { User } from '../service/user/user'\n\nconst domainTypes = config.get('domainTypes', [])\n\nexport async function getUserDomains(user: User): Promise<Partial<Domain>[]> {\n return (\n await getRepository(Domain)\n .createQueryBuilder('DOMAIN')\n .where(qb => {\n const subQuery = qb\n .subQuery()\n .distinct(true)\n .select('DOMAIN.id')\n .from(User, 'USER')\n .leftJoin('USER.roles', 'ROLE')\n .leftJoin('ROLE.domain', 'DOMAIN')\n .where('USER.id = :userId', { userId: user.id })\n .getQuery()\n return 'DOMAIN.id IN ' + subQuery\n })\n .orWhere(qb => {\n const subQuery = qb\n .subQuery()\n .select('DOMAIN.id')\n .from(Domain, 'DOMAIN')\n .where('DOMAIN.owner = :owner', { owner: user.id })\n .getQuery()\n return 'DOMAIN.id IN ' + subQuery\n })\n .orderBy('DOMAIN.name', 'ASC')\n .getMany()\n )\n .filter(d => !d.extType || domainTypes.includes(d.extType))\n .map(domain => {\n const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n /* do not remove id column for result */\n return { id, name, description, subdomain, extType, brandName, brandImage }\n })\n}\n\n// export async function getRoleBasedDomains(user: User): Promise<Partial<Domain>[]> {\n// return (\n// await getRepository(Domain)\n// .createQueryBuilder('DOMAIN')\n// .where(qb => {\n// const subQuery = qb\n// .subQuery()\n// .distinct(true)\n// .select('DOMAIN.id')\n// .from(User, 'USER')\n// .leftJoin('USER.roles', 'ROLE')\n// .leftJoin('ROLE.domain', 'DOMAIN')\n// .where('USER.id = :userId', { userId: user.id })\n// .getQuery()\n// return 'DOMAIN.id IN ' + subQuery\n// })\n// .getMany()\n// ).map(domain => {\n// const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n// return { id, name, description, subdomain, extType, brandName, brandImage }\n// })\n// }\n\nexport async function getDomainsWithPrivilege(\n user: User,\n privilege: string,\n category: string\n): Promise<Partial<Domain>[]> {\n return (\n await getRepository(Domain)\n .createQueryBuilder('DOMAIN')\n .where(qb => {\n const subQuery = qb\n .subQuery()\n .distinct(true)\n .select('DOMAIN.id')\n .from(User, 'USER')\n .leftJoin('USER.roles', 'ROLE')\n .leftJoin('ROLE.domain', 'DOMAIN')\n .leftJoin('ROLE.privileges', 'PRIVILEGE')\n .where('USER.id = :userId', { userId: user.id })\n .andWhere('PRIVILEGE.name = :privilege', { privilege })\n .andWhere('PRIVILEGE.category = :category', { category })\n .getQuery()\n return 'DOMAIN.id IN ' + subQuery\n })\n .orWhere(qb => {\n const subQuery = qb\n .subQuery()\n .select('DOMAIN.id')\n .from(Domain, 'DOMAIN')\n .where('DOMAIN.owner = :owner', { owner: user.id })\n .getQuery()\n return 'DOMAIN.id IN ' + subQuery\n })\n .orderBy('DOMAIN.name', 'ASC')\n .getMany()\n ).map(domain => {\n const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n return { id, name, description, subdomain, extType, brandName, brandImage }\n })\n}\n\nexport async function getDomainsAsOwner(user: User): Promise<Partial<Domain>[]> {\n return (\n await getRepository(Domain).find({\n where: { owner: user.id }\n })\n ).map(domain => {\n const { id, name, description, subdomain, extType, brandName, brandImage } = domain\n return { id, name, description, subdomain, extType, brandName, brandImage }\n })\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/auth-base",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.54",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "dist-client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@simplewebauthn/browser": "^13.0.0",
|
|
34
34
|
"@simplewebauthn/server": "^13.0.0",
|
|
35
|
-
"@things-factory/email-base": "^8.0.
|
|
35
|
+
"@things-factory/email-base": "^8.0.54",
|
|
36
36
|
"@things-factory/env": "^8.0.37",
|
|
37
|
-
"@things-factory/shell": "^8.0.
|
|
37
|
+
"@things-factory/shell": "^8.0.54",
|
|
38
38
|
"@things-factory/utils": "^8.0.37",
|
|
39
39
|
"@types/webappsec-credential-management": "^0.6.9",
|
|
40
40
|
"jsonwebtoken": "^9.0.0",
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"passport-jwt": "^4.0.0",
|
|
47
47
|
"passport-local": "^1.0.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "b222492ba1cb28c9095a66ce2207c8954bcb4b37"
|
|
50
50
|
}
|
|
@@ -20,9 +20,6 @@ authCheckinRouter.get('/auth/checkin/:subdomain?', async (context, next) => {
|
|
|
20
20
|
let { subdomain } = context.params
|
|
21
21
|
|
|
22
22
|
let domains: Partial<Domain>[] = await getUserDomains(user)
|
|
23
|
-
if (domainTypes) {
|
|
24
|
-
domains = domains.filter(d => !d.extType || domainTypes.includes(d.extType))
|
|
25
|
-
}
|
|
26
23
|
|
|
27
24
|
if (!accepts(header.accept, ['text/html', '*/*'])) {
|
|
28
25
|
// When request expects non html response
|
|
@@ -87,15 +84,15 @@ authCheckinRouter.get('/auth/checkin/:subdomain?', async (context, next) => {
|
|
|
87
84
|
}
|
|
88
85
|
})
|
|
89
86
|
|
|
90
|
-
authCheckinRouter.get('/auth/domains', async context => {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
// authCheckinRouter.get('/auth/domains', async context => {
|
|
88
|
+
// const { user } = context.state
|
|
89
|
+
// var domains = await getUserDomains(user)
|
|
90
|
+
// if (domainTypes) {
|
|
91
|
+
// domains = domains.filter(d => d.extType == domainTypes)
|
|
92
|
+
// }
|
|
96
93
|
|
|
97
|
-
|
|
98
|
-
})
|
|
94
|
+
// context.body = domains
|
|
95
|
+
// })
|
|
99
96
|
|
|
100
97
|
async function checkIn(
|
|
101
98
|
checkInDomain: Partial<Domain>,
|
|
@@ -11,7 +11,6 @@ import { User } from '../service/user/user'
|
|
|
11
11
|
import { clearAccessTokenCookie, setAccessTokenCookie } from '../utils/access-token-cookie'
|
|
12
12
|
import { getUserDomains } from '../utils/get-user-domains'
|
|
13
13
|
|
|
14
|
-
const domainTypes = config.get('domainTypes')
|
|
15
14
|
const languages = config.get('i18n/languages') || []
|
|
16
15
|
|
|
17
16
|
export const authPrivateProcessRouter = new Router({
|
|
@@ -88,7 +87,6 @@ authPrivateProcessRouter
|
|
|
88
87
|
}
|
|
89
88
|
|
|
90
89
|
let domains: Partial<Domain>[] = await getUserDomains(user)
|
|
91
|
-
domains = domains.filter((d: Domain) => !d.extType || domainTypes.includes(d.extType))
|
|
92
90
|
|
|
93
91
|
var privileges = await User.getPrivilegesByDomain(user, domain)
|
|
94
92
|
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { In } from 'typeorm'
|
|
2
|
-
|
|
3
1
|
import { Domain, getRepository } from '@things-factory/shell'
|
|
2
|
+
import { config } from '@things-factory/env'
|
|
4
3
|
|
|
5
4
|
import { User } from '../service/user/user'
|
|
6
5
|
|
|
7
|
-
|
|
6
|
+
const domainTypes = config.get('domainTypes', [])
|
|
7
|
+
|
|
8
|
+
export async function getUserDomains(user: User): Promise<Partial<Domain>[]> {
|
|
8
9
|
return (
|
|
9
10
|
await getRepository(Domain)
|
|
10
11
|
.createQueryBuilder('DOMAIN')
|
|
@@ -32,7 +33,7 @@ export async function getUserDomains(user: User, extType?: string): Promise<Part
|
|
|
32
33
|
.orderBy('DOMAIN.name', 'ASC')
|
|
33
34
|
.getMany()
|
|
34
35
|
)
|
|
35
|
-
.filter(
|
|
36
|
+
.filter(d => !d.extType || domainTypes.includes(d.extType))
|
|
36
37
|
.map(domain => {
|
|
37
38
|
const { id, name, description, subdomain, extType, brandName, brandImage } = domain
|
|
38
39
|
/* do not remove id column for result */
|