@things-factory/auth-base 6.2.0 → 6.2.9
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/config/config.development.js +1 -0
- package/config/config.production.js +1 -0
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/router/auth-signin-router.js +2 -0
- package/dist-server/router/auth-signin-router.js.map +1 -1
- package/dist-server/router/auth-signup-router.js +47 -44
- package/dist-server/router/auth-signup-router.js.map +1 -1
- package/dist-server/service/index.d.ts +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/server/router/auth-signin-router.ts +3 -0
- package/server/router/auth-signup-router.ts +57 -53
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/auth-base",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.9",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "dist-client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -30,10 +30,10 @@
|
|
|
30
30
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@things-factory/email-base": "^6.2.
|
|
33
|
+
"@things-factory/email-base": "^6.2.6",
|
|
34
34
|
"@things-factory/env": "^6.2.0",
|
|
35
|
-
"@things-factory/i18n-base": "^6.2.
|
|
36
|
-
"@things-factory/shell": "^6.2.
|
|
35
|
+
"@things-factory/i18n-base": "^6.2.6",
|
|
36
|
+
"@things-factory/shell": "^6.2.6",
|
|
37
37
|
"@things-factory/utils": "^6.2.0",
|
|
38
38
|
"jsonwebtoken": "^9.0.0",
|
|
39
39
|
"koa-passport": "^6.0.0",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"passport-jwt": "^4.0.0",
|
|
43
43
|
"passport-local": "^1.0.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "693195e55200a1160edb9837ea5498b746f82577"
|
|
46
46
|
}
|
|
@@ -5,6 +5,8 @@ import { signinMiddleware } from '../middlewares'
|
|
|
5
5
|
import { accepts } from '../utils/accepts'
|
|
6
6
|
import { setAccessTokenCookie } from '../utils/access-token-cookie'
|
|
7
7
|
|
|
8
|
+
const userSignupProcess = config.get('userSignupProcess', true)
|
|
9
|
+
|
|
8
10
|
const SSOConfig = config.get('sso', {} as any)
|
|
9
11
|
const SSOLinks = Object.values(SSOConfig)
|
|
10
12
|
.filter(({ link, title }) => link && title)
|
|
@@ -23,6 +25,7 @@ authSigninRouter.get('/auth/signin', async (context, next) => {
|
|
|
23
25
|
data: {
|
|
24
26
|
email,
|
|
25
27
|
redirectTo: redirect_to,
|
|
28
|
+
userSignupProcess,
|
|
26
29
|
ssoLinks: SSOLinks
|
|
27
30
|
}
|
|
28
31
|
})
|
|
@@ -6,6 +6,8 @@ import { signup } from '../controllers/signup'
|
|
|
6
6
|
import { accepts } from '../utils/accepts'
|
|
7
7
|
import { setAccessTokenCookie } from '../utils/access-token-cookie'
|
|
8
8
|
|
|
9
|
+
const userSignupProcess = config.get('userSignupProcess', true)
|
|
10
|
+
|
|
9
11
|
const passwordRule = config.get('password') || {
|
|
10
12
|
lowerCase: true,
|
|
11
13
|
upperCase: true,
|
|
@@ -20,64 +22,66 @@ const passwordRule = config.get('password') || {
|
|
|
20
22
|
|
|
21
23
|
export const authSignupRouter = new Router()
|
|
22
24
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
if (userSignupProcess) {
|
|
26
|
+
authSignupRouter.get('/auth/signup', async (context, next) => {
|
|
27
|
+
const { email } = context.query
|
|
25
28
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
29
|
+
await context.render('auth-page', {
|
|
30
|
+
pageElement: 'auth-signup',
|
|
31
|
+
elementScript: '/auth/signup.js',
|
|
32
|
+
data: {
|
|
33
|
+
email,
|
|
34
|
+
passwordRule
|
|
35
|
+
}
|
|
36
|
+
})
|
|
33
37
|
})
|
|
34
|
-
})
|
|
35
38
|
|
|
36
|
-
authSignupRouter.post('/auth/signup', async (context, next) => {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
39
|
+
authSignupRouter.post('/auth/signup', async (context, next) => {
|
|
40
|
+
const { header, t } = context
|
|
41
|
+
const { domain } = context.state
|
|
42
|
+
const user = context.request.body
|
|
40
43
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
// try {
|
|
45
|
+
const { token } = await signup(
|
|
46
|
+
{
|
|
47
|
+
...user,
|
|
48
|
+
context,
|
|
49
|
+
domain
|
|
50
|
+
},
|
|
51
|
+
true
|
|
52
|
+
)
|
|
50
53
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
const message = t('text.user registered successfully')
|
|
55
|
+
context.body = {
|
|
56
|
+
message,
|
|
57
|
+
token
|
|
58
|
+
}
|
|
56
59
|
|
|
57
|
-
|
|
60
|
+
setAccessTokenCookie(context, token)
|
|
58
61
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
62
|
+
if (accepts(header.accept, ['text/html', '*/*'])) {
|
|
63
|
+
await context.render('auth-page', {
|
|
64
|
+
pageElement: 'auth-result',
|
|
65
|
+
elementScript: '/auth/result.js',
|
|
66
|
+
data: {
|
|
67
|
+
message
|
|
68
|
+
}
|
|
69
|
+
})
|
|
70
|
+
}
|
|
71
|
+
// } catch (e) {
|
|
72
|
+
// context.status = 401
|
|
73
|
+
// context.body = e.message
|
|
71
74
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
})
|
|
75
|
+
// if (accepts(header.accept, ['text/html', '*/*'])) {
|
|
76
|
+
// await context.render('auth-page', {
|
|
77
|
+
// pageElement: 'auth-signup',
|
|
78
|
+
// elementScript: '/auth/signup.js',
|
|
79
|
+
// data: {
|
|
80
|
+
// message: e instanceof AuthError ? t(`error.${e.message}`) : e.message,
|
|
81
|
+
// passwordRule
|
|
82
|
+
// }
|
|
83
|
+
// })
|
|
84
|
+
// }
|
|
85
|
+
// }
|
|
86
|
+
})
|
|
87
|
+
}
|