Skip to content

Commit 67ec2c5

Browse files
LeoHongyiYinYangOfDao
authored andcommitted
Add password to user profile to copy (microsoft#635)
1 parent 41a8b0b commit 67ec2c5

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

src/dashboard/server/api/middlewares/user.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ module.exports = (forceAuthenticated = true) => async (context, next) => {
88
const { email, token } = context.query
99
const user = context.state.user = User.fromToken(context, email, token)
1010
await user.fillIdFromWinbind()
11+
await user.password
1112
await user.addGroupLink
1213
await user.WikiLink
1314
context.log.info(user, 'Authenticated by token')
1415
} else if (context.cookies.get('token')) {
1516
try {
1617
const token = context.cookies.get('token')
1718
const user = context.state.user = User.fromCookie(context, token)
18-
await user.token
19+
await user.password
1920
await user.addGroupLink
2021
await user.WikiLink
2122
context.log.info(user, 'Authenticated by cookie')

src/dashboard/server/api/services/user.js

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class User extends Service {
6161
static fromCookie (context, token) {
6262
const payload = jwt.verify(token, sign)
6363
const user = new User(context, payload['email'])
64+
user.password = this.generateToken(user.email)
6465
user.givenName = payload['givenName']
6566
user.addGroupLink = addGroupLink
6667
user.WikiLink = WikiLink
@@ -128,6 +129,7 @@ class User extends Service {
128129
email: this.email,
129130
uid: this.uid,
130131
gid: this.gid,
132+
_token: this.token,
131133
familyName: this.familyName,
132134
givenName: this.givenName,
133135
addGroupLink: addGroupLink,

src/dashboard/src/App.tsx

+16-14
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface BootstrapProps {
3131
uid?: string;
3232
familyName?: string;
3333
givenName?: string;
34-
_token?: any;
34+
password?: any;
3535
addGroupLink: string;
3636
WikiLink: string;
3737
}
@@ -42,19 +42,21 @@ const Loading = (
4242
</Box>
4343
);
4444

45-
const Contexts: React.FC<BootstrapProps> = ({ email, uid, familyName, givenName,_token ,WikiLink,addGroupLink,children }) => (
46-
<BrowserRouter>
47-
<UserProvider email={email} uid={uid} familyName={familyName} givenName={givenName} token={_token} >
48-
<TeamProvider addGroupLink={addGroupLink} WikiLink={WikiLink}>
49-
<ClustersProvider>
50-
<ThemeProvider theme={theme}>
51-
{children}
52-
</ThemeProvider>
53-
</ClustersProvider>
54-
</TeamProvider>
55-
</UserProvider>
56-
</BrowserRouter>
57-
);
45+
const Contexts: React.FC<BootstrapProps> = ({ email, uid, familyName, givenName,password ,WikiLink,addGroupLink,children }) => {
46+
return (
47+
<BrowserRouter>
48+
<UserProvider email={email} uid={uid} familyName={familyName} givenName={givenName} token={password} >
49+
<TeamProvider addGroupLink={addGroupLink} WikiLink={WikiLink}>
50+
<ClustersProvider>
51+
<ThemeProvider theme={theme}>
52+
{children}
53+
</ThemeProvider>
54+
</ClustersProvider>
55+
</TeamProvider>
56+
</UserProvider>
57+
</BrowserRouter>
58+
);
59+
}
5860

5961
const Layout: React.FC<RouteComponentProps> = ({ location, history }) => {
6062
const { email } = React.useContext(UserContext);

0 commit comments

Comments
 (0)