@vc-shell/framework 1.0.82 → 1.0.84
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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
## [1.0.84](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.83...v1.0.84) (2023-06-23)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
## [1.0.83](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.82...v1.0.83) (2023-06-23)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
1
9
|
## [1.0.82](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.81...v1.0.82) (2023-06-23)
|
|
2
10
|
|
|
3
11
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { computed, Ref, ref, ComputedRef } from "vue";
|
|
1
|
+
import { computed, Ref, ref, ComputedRef, getCurrentInstance, inject } from "vue";
|
|
2
2
|
import ClientOAuth2 from "client-oauth2";
|
|
3
3
|
import {
|
|
4
4
|
UserDetail,
|
|
@@ -48,7 +48,9 @@ interface IUseUser {
|
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
export function useUser(): IUseUser {
|
|
51
|
-
const
|
|
51
|
+
const instance = getCurrentInstance();
|
|
52
|
+
const base = instance && inject("platformUrl");
|
|
53
|
+
const externalSignInStorage = useLocalStorage<{ providerType: string }>("externalSignIn", { providerType: null });
|
|
52
54
|
|
|
53
55
|
const isAuthenticated = async () => {
|
|
54
56
|
return !!((externalSignInStorage.value && externalSignInStorage.value.providerType) ?? (await getAccessToken()));
|
|
@@ -113,7 +115,6 @@ export function useUser(): IUseUser {
|
|
|
113
115
|
|
|
114
116
|
if (externalSignInStorage.value && externalSignInStorage.value.providerType) {
|
|
115
117
|
externalSignOut(externalSignInStorage.value.providerType);
|
|
116
|
-
storeAuthData({});
|
|
117
118
|
externalSignInStorage.value = null;
|
|
118
119
|
} else {
|
|
119
120
|
user.value = undefined;
|
|
@@ -250,7 +251,7 @@ export function useUser(): IUseUser {
|
|
|
250
251
|
|
|
251
252
|
async function externalSignIn(authenticationType: string | undefined, returnUrl: string | undefined) {
|
|
252
253
|
try {
|
|
253
|
-
let url_ = "externalsignin?";
|
|
254
|
+
let url_ = base + "externalsignin?";
|
|
254
255
|
|
|
255
256
|
const signInData = {
|
|
256
257
|
providerType: authenticationType,
|
|
@@ -276,7 +277,7 @@ export function useUser(): IUseUser {
|
|
|
276
277
|
|
|
277
278
|
async function externalSignOut(authenticationType: string | undefined): Promise<void> {
|
|
278
279
|
try {
|
|
279
|
-
const url = "externalsignin/signout?authenticationType=" + authenticationType;
|
|
280
|
+
const url = base + "externalsignin/signout?authenticationType=" + authenticationType;
|
|
280
281
|
window.location.href = url;
|
|
281
282
|
} catch (e) {
|
|
282
283
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAA8B,MAAM,KAAK,CAAC;AAElF,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiB/E,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACnG,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC/E,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,yBAAyB,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACvE,cAAc,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAClG,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACzC;AAED,wBAAgB,OAAO,IAAI,QAAQ,CA+PlC"}
|