|
|
@ -1,10 +1,9 @@ |
|
|
import { VuexModule, Module, Action, Mutation, getModule } from 'vuex-module-decorators' |
|
|
import { VuexModule, Module, Action, Mutation, getModule } from 'vuex-module-decorators' |
|
|
import UserApiService, { UserLoginData, UserLoginPhoneData } from '@/api/users' |
|
|
import UserApiService, { UserLoginData, UserLoginPhoneData } from '@/api/users' |
|
|
import TenantService from '@/api/tenant-management' |
|
|
import { CurrentUser } from '@/api/abpconfiguration' |
|
|
import { getItem, setItem, removeItem } from '@/utils/localStorage' |
|
|
import { getItem, setItem, removeItem } from '@/utils/localStorage' |
|
|
import { resetRouter } from '@/router' |
|
|
import { resetRouter } from '@/router' |
|
|
import { TagsViewModule } from './tags-view' |
|
|
import { TagsViewModule } from './tags-view' |
|
|
import { removeTenant, setTenant } from '@/utils/sessions' |
|
|
|
|
|
import { PermissionModule } from '@/store/modules/permission' |
|
|
import { PermissionModule } from '@/store/modules/permission' |
|
|
import { AbpModule } from '@/store/modules/abp' |
|
|
import { AbpModule } from '@/store/modules/abp' |
|
|
import store from '@/store' |
|
|
import store from '@/store' |
|
|
@ -12,10 +11,13 @@ import store from '@/store' |
|
|
export interface IUserState { |
|
|
export interface IUserState { |
|
|
token: string |
|
|
token: string |
|
|
refreshToken: string |
|
|
refreshToken: string |
|
|
id: string |
|
|
id: string | undefined |
|
|
name: string |
|
|
name: string | undefined |
|
|
|
|
|
surName: string | undefined |
|
|
|
|
|
userName: string | undefined |
|
|
|
|
|
phoneNumber: string | undefined |
|
|
roles: string[] |
|
|
roles: string[] |
|
|
email: string |
|
|
email: string | undefined |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const tokenKey = 'vue_typescript_admin_token' |
|
|
const tokenKey = 'vue_typescript_admin_token' |
|
|
@ -25,10 +27,13 @@ const refreshTokenKey = 'vue_typescript_admin_refresh_token' |
|
|
class User extends VuexModule implements IUserState { |
|
|
class User extends VuexModule implements IUserState { |
|
|
public token = getItem(tokenKey) |
|
|
public token = getItem(tokenKey) |
|
|
public refreshToken = getItem(refreshTokenKey) |
|
|
public refreshToken = getItem(refreshTokenKey) |
|
|
public id = '' |
|
|
public id: string | undefined = '' |
|
|
public name = '' |
|
|
public name: string | undefined = '' |
|
|
public roles: string[] = [] |
|
|
public surName: string | undefined = '' |
|
|
public email = '' |
|
|
public userName: string | undefined = '' |
|
|
|
|
|
public phoneNumber: string | undefined = '' |
|
|
|
|
|
public email: string | undefined = '' |
|
|
|
|
|
public roles = new Array<string>() |
|
|
|
|
|
|
|
|
@Mutation |
|
|
@Mutation |
|
|
private SET_TOKEN(token: string) { |
|
|
private SET_TOKEN(token: string) { |
|
|
@ -43,30 +48,23 @@ class User extends VuexModule implements IUserState { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Mutation |
|
|
@Mutation |
|
|
private SET_ID(id: string) { |
|
|
private SET_CURRENTUSERINFO(currentUser: CurrentUser) { |
|
|
this.id = id |
|
|
this.id = currentUser.id |
|
|
|
|
|
this.name = currentUser.name |
|
|
|
|
|
this.email = currentUser.email |
|
|
|
|
|
this.surName = currentUser.surName |
|
|
|
|
|
this.userName = currentUser.userName |
|
|
|
|
|
this.phoneNumber = currentUser.phoneNumber |
|
|
|
|
|
this.roles = currentUser.roles |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Mutation |
|
|
@Action({ rawError: true }) |
|
|
private SET_NAME(name: string) { |
|
|
public RefreshCurrentUser() { |
|
|
this.name = name |
|
|
this.SET_CURRENTUSERINFO(AbpModule.configuration.currentUser) |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Mutation |
|
|
|
|
|
private SET_ROLES(roles: string[]) { |
|
|
|
|
|
this.roles = roles |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Mutation |
|
|
|
|
|
private SET_EMAIL(email: string) { |
|
|
|
|
|
this.email = email |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Action({ rawError: true }) |
|
|
@Action({ rawError: true }) |
|
|
public async Login(userInfo: { tenantName: string | undefined, username: string, password: string}) { |
|
|
public async Login(userInfo: { username: string, password: string}) { |
|
|
if (userInfo.tenantName) { |
|
|
|
|
|
await this.PreLogin(userInfo.tenantName) |
|
|
|
|
|
} |
|
|
|
|
|
const userLoginData = new UserLoginData() |
|
|
const userLoginData = new UserLoginData() |
|
|
userLoginData.userName = userInfo.username |
|
|
userLoginData.userName = userInfo.username |
|
|
userLoginData.password = userInfo.password |
|
|
userLoginData.password = userInfo.password |
|
|
@ -75,13 +73,11 @@ class User extends VuexModule implements IUserState { |
|
|
this.SET_TOKEN(token) |
|
|
this.SET_TOKEN(token) |
|
|
this.SET_REFRESHTOKEN(loginResult.refresh_token) |
|
|
this.SET_REFRESHTOKEN(loginResult.refresh_token) |
|
|
await this.PostLogin() |
|
|
await this.PostLogin() |
|
|
|
|
|
console.log(this.token) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Action({ rawError: true }) |
|
|
@Action({ rawError: true }) |
|
|
public async PhoneLogin(userInfo: { tenantName: string | undefined, phoneNumber: string, verifyCode: string}) { |
|
|
public async PhoneLogin(userInfo: { phoneNumber: string, verifyCode: string}) { |
|
|
if (userInfo.tenantName) { |
|
|
|
|
|
await this.PreLogin(userInfo.tenantName) |
|
|
|
|
|
} |
|
|
|
|
|
const userLoginData = new UserLoginPhoneData() |
|
|
const userLoginData = new UserLoginPhoneData() |
|
|
userLoginData.phoneNumber = userInfo.phoneNumber |
|
|
userLoginData.phoneNumber = userInfo.phoneNumber |
|
|
userLoginData.verifyCode = userInfo.verifyCode |
|
|
userLoginData.verifyCode = userInfo.verifyCode |
|
|
@ -95,21 +91,7 @@ class User extends VuexModule implements IUserState { |
|
|
@Action |
|
|
@Action |
|
|
public ResetToken() { |
|
|
public ResetToken() { |
|
|
removeItem(tokenKey) |
|
|
removeItem(tokenKey) |
|
|
removeTenant() |
|
|
|
|
|
this.SET_TOKEN('') |
|
|
this.SET_TOKEN('') |
|
|
this.SET_ROLES([]) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Action |
|
|
|
|
|
public async GetUserInfo() { |
|
|
|
|
|
if (this.token === '') { |
|
|
|
|
|
throw Error('GetUserInfo: token is undefined!') |
|
|
|
|
|
} |
|
|
|
|
|
const userInfo = await UserApiService.getUserInfo() |
|
|
|
|
|
this.SET_ID(userInfo.sub) |
|
|
|
|
|
this.SET_NAME(userInfo.name) |
|
|
|
|
|
this.SET_EMAIL(userInfo.email) |
|
|
|
|
|
return userInfo |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Action |
|
|
@Action |
|
|
@ -123,10 +105,9 @@ class User extends VuexModule implements IUserState { |
|
|
} |
|
|
} |
|
|
this.SET_TOKEN('') |
|
|
this.SET_TOKEN('') |
|
|
this.SET_REFRESHTOKEN('') |
|
|
this.SET_REFRESHTOKEN('') |
|
|
this.SET_ROLES([]) |
|
|
this.SET_CURRENTUSERINFO(new CurrentUser()) |
|
|
removeItem(tokenKey) |
|
|
removeItem(tokenKey) |
|
|
removeItem(refreshTokenKey) |
|
|
removeItem(refreshTokenKey) |
|
|
removeTenant() |
|
|
|
|
|
resetRouter() |
|
|
resetRouter() |
|
|
// Reset visited views and cached views
|
|
|
// Reset visited views and cached views
|
|
|
TagsViewModule.delAllViews() |
|
|
TagsViewModule.delAllViews() |
|
|
@ -154,15 +135,10 @@ class User extends VuexModule implements IUserState { |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Action |
|
|
|
|
|
private async PreLogin(tenantName: string) { |
|
|
|
|
|
const tenantResult = await TenantService.findTenantByName(tenantName) |
|
|
|
|
|
setTenant(tenantResult.tenantId) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Action |
|
|
@Action |
|
|
private async PostLogin() { |
|
|
private async PostLogin() { |
|
|
await AbpModule.LoadAbpConfiguration() |
|
|
const abpConfig = await AbpModule.LoadAbpConfiguration() |
|
|
|
|
|
this.SET_CURRENTUSERINFO(abpConfig.currentUser) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
cKey
5 years ago
GitHub