Skip to content

frontend / qqxb-self-service

Go to a project
Commit ed52cd5a by cocomilk2012
Options

update

parent b4bbd51c
Inline Side-by-side
Showing with 30 additions and 392 deletions
package-lock.json
......@@ -2009,7 +2009,8 @@
"base64-js": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
"dev": true
},
"batch": {
"version": "0.6.1",
......@@ -3262,11 +3263,6 @@
"randomfill": "^1.0.3"
}
},
"crypto-js": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
"integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
},
"css-color-names": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
......@@ -6852,24 +6848,6 @@
"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
"dev": true
},
"oidc-client": {
"version": "1.10.1",
"resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.10.1.tgz",
"integrity": "sha512-/QB5Nl7c9GmT9ir1E+OVY3+yZZnuk7Qa9ZEAJqSvDq0bAyAU9KAgeKipTEfKjGdGLTeOLy9FRWuNpULMkfZydQ==",
"requires": {
"base64-js": "^1.3.0",
"core-js": "^2.6.4",
"crypto-js": "^3.1.9-1",
"uuid": "^3.3.2"
},
"dependencies": {
"core-js": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
"integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
}
}
},
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
......@@ -10057,7 +10035,8 @@
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"dev": true
},
"validate-npm-package-license": {
"version": "3.0.4",
......
package.json
......@@ -18,7 +18,6 @@
"echarts": "^4.8.0",
"fastclick": "^1.0.6",
"moment": "^2.26.0",
"oidc-client": "^1.10.1",
"qs": "^6.9.4",
"vant": "^2.2.0",
"vconsole": "^3.3.4",
......
src/common/SecurityService.ts deleted 100644 → 0
/* eslint-disable */
import qs from "qs";
import Oidc from "oidc-client";
// import "babel-polyfill";
const oidc_config = JSON.parse(process.env.VUE_APP_OIDC_CONFIG)
var mgr: Oidc.UserManager;
mgr = new Oidc.UserManager({
userStore: new Oidc.WebStorageStateStore({}),
authority: oidc_config.authority,
client_id: oidc_config.client_id,
redirect_uri: oidc_config.redirect_uri,
response_type: oidc_config.response_type,
scope: oidc_config.scope,
post_logout_redirect_uri: oidc_config.post_logout_redirect_uri,
silent_redirect_uri: oidc_config.silent_redirect_uri,
accessTokenExpiringNotificationTime: oidc_config.accessTokenExpiringNotificationTime,
automaticSilentRenew: oidc_config.filterProtocolClaims,
filterProtocolClaims: oidc_config.loadUserInfo,
loadUserInfo: oidc_config.loadUserInfo
});
Oidc.Log.logger = console;
Oidc.Log.level = Oidc.Log.INFO;
mgr!.events.addUserLoaded(function (user: any) {
console.log("初始化");
});
mgr!.events.addAccessTokenExpiring(function () {
console.log("过期前");
console.log("AccessToken Expiring：", arguments);
});
mgr!.events.addAccessTokenExpired(function () {
console.log("AccessToken Expired：", arguments);
mgr
.signoutRedirect()
.then(function (resp: any) {
console.log("signed out", resp);
})
.catch(function (err: any) {
console.log(err);
});
});
mgr!.events.addSilentRenewError(function () {
console.error("Silent Renew Error：", arguments);
});
mgr!.events.addUserSignedOut(function () {
console.log("UserSignedOut：", arguments);
mgr
.signoutRedirect()
.then(function (resp: any) {
window.location.href = "/";
})
.catch(function (err: any) {
console.log(err);
});
});
export default class SecurityService {
signinRedirectCallback() {
mgr
.signinRedirectCallback()
.then(function (user: any) {
// console.log("=============================");
// console.log(user);
})
.catch(function (err: any) {
// console.log(err);
});
}
signinSilentCallback() {
mgr.signinSilentCallback().catch(function (err: any) {
// console.log(err);
});
}
// Renew the token manually
renewToken(): Promise<Oidc.User | null> {
let self = this;
console.log("执行");
return new Promise((resolve, reject) => {
mgr
.signinSilent()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
} else {
return resolve(user);
}
})
.catch(function (err: any) {
alert(err);
console.log(err);
return reject(err);
});
});
}
// Get the user who is logged in
getUser(): Promise<Oidc.User | undefined> {
let self = this;
return new Promise<Oidc.User | undefined>((resolve, reject) => {
mgr
.getUser()
.then(function (user) {
if (user == null) {
// self.signIn();
return resolve(undefined);
} else {
if (!!user.expired) {
return resolve(undefined);
}
return resolve(user);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Check if there is any user logged in
getSignedIn(): Promise<boolean> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: any) {
let authcode = qs.parse(window.location.search).authcode;
if (authcode) {
mgr
.signinRedirect({
extraQueryParams: { authcode }
})
.catch(error => {
console.error(error);
});
return resolve(false);
} else if (user == null) {
self.signIn();
return resolve(false);
} else {
return resolve(true);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Redirect of the current window to the authorization endpoint.
signIn(args = {}) {
mgr.signinRedirect(args).catch(function (err: any) {
console.log(err);
});
}
signInto(args: any = null) {
mgr.signinRedirect(args).catch(function (err: any) {
console.log(err);
});
}
// Redirect of the current window to the end session endpoint
signOut() {
mgr
.signoutRedirect()
.then(function (resp: any) {
console.log("signed out", resp);
})
.catch(function (err: any) {
console.log(err);
});
}
// Get the profile of the user logged in
getProfile(): Promise<Oidc.Profile | null> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
return resolve(null);
} else {
return resolve(user.profile);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Get the token id
getIdToken(): Promise<string | null> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
return resolve(null);
} else {
return resolve(user.id_token);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Get the session state
getSessionState(): Promise<any | null> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
return resolve(null);
} else {
return resolve(user.session_state);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Get the access token of the logged in user
getAcessToken(): Promise<string | null> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
return resolve(null);
} else {
return resolve(user.access_token);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Takes the scopes of the logged in user
getScope(): Promise<string | null> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
return resolve(null);
} else {
return resolve(user.scope);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
// Get the user roles logged in
getRole(): Promise<any | null> {
let self = this;
return new Promise((resolve, reject) => {
mgr
.getUser()
.then(function (user: Oidc.User | null) {
if (user == null) {
self.signIn();
return resolve(null);
} else {
return resolve(user.profile.role);
}
})
.catch(function (err: any) {
console.log(err);
return reject(err);
});
});
}
}
src/common/callback.ts deleted 100644 → 0
//import "babel-polyfill";
import Oidc from "oidc-client";
var mgr = new Oidc.UserManager({
userStore: new Oidc.WebStorageStateStore({}),
loadUserInfo: true,
filterProtocolClaims: true
});
mgr.signinRedirectCallback().then(function (user: any) {
let returnUrl = localStorage.getItem("returnUrl");
if (returnUrl) {
window.location.href = returnUrl;
} else {
window.location.href = "/";
}
}).catch(function (err: any) {
console.log(err);
});
src/common/silent-renew.ts deleted 100644 → 0
// import "babel-polyfill";
import Oidc from 'oidc-client';
var mgr = new Oidc.UserManager({
userStore: new Oidc.WebStorageStateStore({}),
loadUserInfo: true,
filterProtocolClaims: true
});
mgr.signinSilentCallback();
src/store/modules/employee.ts
// import * as types from "../types";
// import { isNullOrEmpty } from "@/utils/public";
import Mgr from '@/common/SecurityService';
// import Mgr from '@/common/SecurityService';
// import request from '@/utils/method';
// import urls from '@/utils/urls';
let mgr = new Mgr();
// let mgr = new Mgr();
const initPageState = () => {
return {
......@@ -20,18 +20,18 @@ const user = {
mutations: {},
actions: {},
getters: {
async getUserInfo(state: Object | any) {
if (Object.keys(state.userInfo).length > 0) {
return state.userInfo;
}
// async getUserInfo(state: Object | any) {
// if (Object.keys(state.userInfo).length > 0) {
// return state.userInfo;
// }
let user = await mgr.getUser();
if (user) {
state.userInfo = user!.profile;
}
// let user = await mgr.getUser();
// if (user) {
// state.userInfo = user!.profile;
// }
return state.userInfo;
},
// return state.userInfo;
// },
async getAccessToken(state: Object | any) {
if (state.accessToken === '') {
//let user = await mgr.getUser();
......
vue.config.js
......@@ -16,20 +16,20 @@ module.exports = {
chunks: ['app', 'chunk-vendors'],
excludeChunks: ['silent-renew-oidc']
},
silentrenewoidc: {
entry: './src/common/silent-renew.ts',
template: 'public/silent-renew.html',
filename: 'silent-renew.html',
favicon: 'public/favicon.ico',
excludeChunks: ['app']
},
callback: {
entry: './src/common/callback.ts',
template: 'public/callback.html',
filename: 'callback.html',
favicon: 'public/favicon.ico',
excludeChunks: ['app']
},
// silentrenewoidc: {
// entry: './src/common/silent-renew.ts',
// template: 'public/silent-renew.html',
// filename: 'silent-renew.html',
// favicon: 'public/favicon.ico',
// excludeChunks: ['app']
// },
// callback: {
// entry: './src/common/callback.ts',
// template: 'public/callback.html',
// filename: 'callback.html',
// favicon: 'public/favicon.ico',
// excludeChunks: ['app']
// },
},
// eslint-loader 是否在保存的时候检查
lintOnSave: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment