|
@@ -79,24 +79,45 @@ export default {
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
frameworkApi.loadUserInfo().then(resp => {
|
|
frameworkApi.loadUserInfo().then(resp => {
|
|
console.log(resp)
|
|
console.log(resp)
|
|
- if (resp.result == 'success') {
|
|
|
|
- state.userInfo = { username: resp.username }
|
|
|
|
- storage.set('user_name', resp.username)
|
|
|
|
|
|
+ // if (resp.result == 'success') {
|
|
|
|
+ // state.userInfo = { username: resp.username }
|
|
|
|
+ // storage.set('user_name', resp.username)
|
|
|
|
+ // state.permissions = {}
|
|
|
|
+ // if (resp.permissions) {
|
|
|
|
+ // resp.permissions.forEach(p => (state.permissions[p] = true))
|
|
|
|
+ // }
|
|
|
|
+ // state.projects = []
|
|
|
|
+ // if (resp.projects) {
|
|
|
|
+ // if(resp.projects[0] && resp.projects[0].projId) {
|
|
|
|
+ // state.projectId = resp.projects[0].projId
|
|
|
|
+ // state.secret = resp.projects[0].secret?resp.projects[0].secret:""
|
|
|
|
+ // }
|
|
|
|
+ // resp.projects.forEach(proj =>
|
|
|
|
+ // state.projects.push({
|
|
|
|
+ // id: proj.projId,
|
|
|
|
+ // name: proj.projLocalName,
|
|
|
|
+ // pwd: proj.secret?proj.secret:""
|
|
|
|
+ // })
|
|
|
|
+ // )
|
|
|
|
+ // }
|
|
|
|
+ // } else {
|
|
|
|
+ if (resp.Result == 'success') {
|
|
|
|
+ state.userInfo = { username: resp.Username }
|
|
state.permissions = {}
|
|
state.permissions = {}
|
|
- if (resp.permissions) {
|
|
|
|
- resp.permissions.forEach(p => (state.permissions[p] = true))
|
|
|
|
|
|
+ if (resp.Permissions) {
|
|
|
|
+ resp.Permissions.forEach(p => (state.permissions[p] = true))
|
|
}
|
|
}
|
|
state.projects = []
|
|
state.projects = []
|
|
- if (resp.projects) {
|
|
|
|
- if(resp.projects[0] && resp.projects[0].projId) {
|
|
|
|
- state.projectId = resp.projects[0].projId
|
|
|
|
- state.secret = resp.projects[0].secret?resp.projects[0].secret:""
|
|
|
|
|
|
+ if (resp.Projects) {
|
|
|
|
+ if(resp.Projects[0] && resp.Projects[0].ProjId) {
|
|
|
|
+ state.projectId = resp.Projects[0].ProjId
|
|
|
|
+ state.secret = resp.Projects[0].Secret?resp.Projects[0].Secret:""
|
|
}
|
|
}
|
|
- resp.projects.forEach(proj =>
|
|
|
|
|
|
+ resp.Projects.forEach(proj =>
|
|
state.projects.push({
|
|
state.projects.push({
|
|
- id: proj.projId,
|
|
|
|
- name: proj.projLocalName,
|
|
|
|
- pwd: proj.secret?proj.secret:""
|
|
|
|
|
|
+ id: proj.ProjId,
|
|
|
|
+ name: proj.ProjLocalName,
|
|
|
|
+ pwd: proj.Secret?proj.Secret:""
|
|
})
|
|
})
|
|
)
|
|
)
|
|
}
|
|
}
|