@selfcommunity/react-core 0.4.0-alpha.69 → 0.4.0-alpha.70
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/lib/cjs/components/provider/SCUserProvider/index.d.ts.map +1 -1
- package/lib/cjs/components/provider/SCUserProvider/index.js +3 -0
- package/lib/cjs/components/provider/SCUserProvider/index.js.map +1 -1
- package/lib/cjs/hooks/useSCAuth.d.ts.map +1 -1
- package/lib/cjs/hooks/useSCAuth.js +13 -9
- package/lib/cjs/hooks/useSCAuth.js.map +1 -1
- package/lib/cjs/hooks/useSCBlockedUsersManager.d.ts +1 -1
- package/lib/cjs/hooks/useSCBlockedUsersManager.d.ts.map +1 -1
- package/lib/cjs/hooks/useSCBlockedUsersManager.js +6 -3
- package/lib/cjs/hooks/useSCBlockedUsersManager.js.map +1 -1
- package/lib/cjs/hooks/useSCFetchUserBlockedBy.d.ts.map +1 -1
- package/lib/cjs/hooks/useSCFetchUserBlockedBy.js +17 -7
- package/lib/cjs/hooks/useSCFetchUserBlockedBy.js.map +1 -1
- package/lib/esm/components/provider/SCUserProvider/index.d.ts.map +1 -1
- package/lib/esm/components/provider/SCUserProvider/index.js +3 -0
- package/lib/esm/components/provider/SCUserProvider/index.js.map +1 -1
- package/lib/esm/hooks/useSCAuth.d.ts.map +1 -1
- package/lib/esm/hooks/useSCAuth.js +13 -9
- package/lib/esm/hooks/useSCAuth.js.map +1 -1
- package/lib/esm/hooks/useSCBlockedUsersManager.d.ts +1 -1
- package/lib/esm/hooks/useSCBlockedUsersManager.d.ts.map +1 -1
- package/lib/esm/hooks/useSCBlockedUsersManager.js +6 -3
- package/lib/esm/hooks/useSCBlockedUsersManager.js.map +1 -1
- package/lib/esm/hooks/useSCFetchUserBlockedBy.d.ts.map +1 -1
- package/lib/esm/hooks/useSCFetchUserBlockedBy.js +17 -7
- package/lib/esm/hooks/useSCFetchUserBlockedBy.js.map +1 -1
- package/lib/umd/react-core.js +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAC;AAiBnF,OAAO,EACL,iBAAiB,EAUlB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa,kCAA4D,CAAC;AAEvF;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAC,QAAQ,EAAC,EAAE;IAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAC,GAAG,GAAG,CAAC,OAAO,CAyN3F;AAED;;;GAGG;AACH,wBAAgB,SAAS,IAAI,iBAAiB,CAE7C"}
|
|
@@ -117,6 +117,9 @@ function SCUserProvider({ children }) {
|
|
|
117
117
|
dispatch({ type: useSCAuth_1.userActionTypes.LOGIN_FAILURE, payload: { error } });
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
|
+
else {
|
|
121
|
+
dispatch({ type: useSCAuth_1.userActionTypes.LOGIN_FAILURE });
|
|
122
|
+
}
|
|
120
123
|
}, [state.session]);
|
|
121
124
|
/**
|
|
122
125
|
* Controls caching of follow categories, users, etc...
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,8DAAwD;AACxD,4DAA+C;AAC/C,sEAAoE;AACpE,gDAAmE;AACnE,0DAA+B;AAC/B,sDAAwD;AACxD,qEAAoE;AACpE,mHAA2F;AAC3F,+FAAuE;AACvE,+FAAuE;AACvE,iGAAyE;AACzE,qGAA6E;AAC7E,gDAAmH;AACnH,uHAA+F;AAC/F,uGAA+E;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;
|
|
1
|
+
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;AA2FF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,cAAc,EAAE,aAAa;;;;;;;EA4J5D"}
|
|
@@ -73,7 +73,12 @@ function userReducer(state, action) {
|
|
|
73
73
|
case exports.userActionTypes.LOGIN_SUCCESS:
|
|
74
74
|
return { user: action.payload.user, error: null, session: Object.assign({}, state.session), loading: false };
|
|
75
75
|
case exports.userActionTypes.LOGIN_FAILURE:
|
|
76
|
-
return {
|
|
76
|
+
return {
|
|
77
|
+
user: null,
|
|
78
|
+
session: Object.assign({}, state.session),
|
|
79
|
+
error: action.payload && action.payload.error ? action.payload.error : null,
|
|
80
|
+
loading: false,
|
|
81
|
+
};
|
|
77
82
|
case exports.userActionTypes.REFRESH_TOKEN_SUCCESS:
|
|
78
83
|
const newAuthToken = Object.assign({}, state.session.authToken, Object.assign(Object.assign(Object.assign(Object.assign({}, state.session.authToken), { accessToken: action.payload.token.accessToken }), (action.payload.token.refreshToken ? { refreshToken: action.payload.token.refreshToken } : {})), (action.payload.token.expiresIn ? { expiresIn: action.payload.token.expiresIn } : {})));
|
|
79
84
|
const newSession = Object.assign({}, state.session, {
|
|
@@ -85,7 +90,7 @@ function userReducer(state, action) {
|
|
|
85
90
|
case exports.userActionTypes.REFRESH_TOKEN_FAILURE:
|
|
86
91
|
return { user: null, session: Object.assign({}, state.session), loading: null, error: action.payload.error };
|
|
87
92
|
case exports.userActionTypes.LOGOUT:
|
|
88
|
-
return { user:
|
|
93
|
+
return { user: undefined, session: {}, error: null, loading: null };
|
|
89
94
|
case exports.userActionTypes.UPDATE_USER:
|
|
90
95
|
return Object.assign(Object.assign({}, state), { user: Object.assign(Object.assign({}, state.user), action.payload) });
|
|
91
96
|
case exports.userActionTypes.REFRESH_SESSION:
|
|
@@ -111,7 +116,6 @@ function stateInitializer(session) {
|
|
|
111
116
|
}
|
|
112
117
|
else {
|
|
113
118
|
api_services_1.http.setAuthorizeToken();
|
|
114
|
-
_isLoading = false;
|
|
115
119
|
}
|
|
116
120
|
}
|
|
117
121
|
else if (_session.type === Session.COOKIE_SESSION) {
|
|
@@ -167,6 +171,12 @@ function useAuth(initialSession) {
|
|
|
167
171
|
// CONST
|
|
168
172
|
const userId = state.user ? state.user.id : null;
|
|
169
173
|
const accessToken = state.session.authToken && state.session.authToken.accessToken ? state.session.authToken.accessToken : null;
|
|
174
|
+
/**
|
|
175
|
+
* Reset session if initial conf changed
|
|
176
|
+
*/
|
|
177
|
+
(0, use_deep_compare_effect_1.default)(() => {
|
|
178
|
+
dispatch({ type: exports.userActionTypes.REFRESH_SESSION, payload: { conf: stateInitializer(initialSession) } });
|
|
179
|
+
}, [initialSession]);
|
|
170
180
|
/**
|
|
171
181
|
* Refresh session
|
|
172
182
|
*/
|
|
@@ -287,12 +297,6 @@ function useAuth(initialSession) {
|
|
|
287
297
|
}
|
|
288
298
|
};
|
|
289
299
|
}, [userId, accessToken]);
|
|
290
|
-
/**
|
|
291
|
-
* Reset session if initial conf changed
|
|
292
|
-
*/
|
|
293
|
-
(0, use_deep_compare_effect_1.default)(() => {
|
|
294
|
-
dispatch({ type: exports.userActionTypes.REFRESH_SESSION, payload: { conf: stateInitializer(initialSession) } });
|
|
295
|
-
}, [initialSession]);
|
|
296
300
|
return { state, dispatch, helpers: { refreshSession, logoutSession } };
|
|
297
301
|
}
|
|
298
302
|
exports.default = useAuth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiD;AACjD,iCAA6D;AAG7D,8DAAgD;AAChD,sFAA2D;AAC3D,gDAA4C;AAC5C,gDAAkD;AAElD;;;;;;GAMG;AACU,QAAA,eAAe,GAAG;IAC7B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,gBAAgB;IAC/B,MAAM,EAAE,SAAS;IACjB,qBAAqB,EAAE,wBAAwB;IAC/C,qBAAqB,EAAE,wBAAwB;IAC/C,eAAe,EAAE,gBAAgB;IACjC,WAAW,EAAE,cAAc;CAC5B,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,KAAK,EAAE,MAAM;IAChC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,uBAAe,CAAC,aAAa;YAChC,OAAO,EAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;QAEjF,KAAK,uBAAe,CAAC,aAAa;YAChC,OAAO,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC;QAE7G,KAAK,uBAAe,CAAC,aAAa;YAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,6 @@ export default function useSCBlockedUsersManager(user?: SCUserType): {
|
|
|
26
26
|
isLoading: () => boolean;
|
|
27
27
|
block: (user: SCUserType) => Promise<any>;
|
|
28
28
|
isBlocked: (user: SCUserType) => boolean;
|
|
29
|
-
refresh: () => Promise<number[]>;
|
|
29
|
+
refresh: (setLoadingStatus?: boolean) => Promise<number[]>;
|
|
30
30
|
};
|
|
31
31
|
//# sourceMappingURL=useSCBlockedUsersManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCBlockedUsersManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAI,CAAC,EAAE,UAAU;;;qBAWpD,OAAO;;;;;;;qBAAP,OAAO;
|
|
1
|
+
{"version":3,"file":"useSCBlockedUsersManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAI,CAAC,EAAE,UAAU;;;qBAWpD,OAAO;;;;;;;qBAAP,OAAO;kBA0CR,UAAU,KAAG,QAAQ,GAAG,CAAC;sBA4BzB,UAAU,KAAG,OAAO;6CAxDC,QAAQ,MAAM,EAAE,CAAC;EAiFlD"}
|
|
@@ -36,17 +36,20 @@ function useSCBlockedUsersManager(user) {
|
|
|
36
36
|
* all blocked users by the authenticated user in a single solution
|
|
37
37
|
* It might be useful for multi-tab sync
|
|
38
38
|
*/
|
|
39
|
-
const refresh = (0, react_1.useMemo)(() => () => {
|
|
39
|
+
const refresh = (0, react_1.useMemo)(() => (setLoadingStatus = false) => {
|
|
40
40
|
if (user) {
|
|
41
|
+
setLoadingStatus && setLoading(true);
|
|
41
42
|
// Only if user is authenticated
|
|
42
43
|
return api_services_2.UserService.getHiddenUsersId()
|
|
43
44
|
.then((res) => {
|
|
44
45
|
setData(res);
|
|
46
|
+
setLoadingStatus && setLoading(false);
|
|
45
47
|
return Promise.resolve(res);
|
|
46
48
|
})
|
|
47
49
|
.catch((e) => {
|
|
48
50
|
utils_1.Logger.error(Errors_1.SCOPE_SC_CORE, 'Unable to load blocked users.');
|
|
49
51
|
utils_1.Logger.error(Errors_1.SCOPE_SC_CORE, e);
|
|
52
|
+
setLoadingStatus && setLoading(false);
|
|
50
53
|
return Promise.reject(e);
|
|
51
54
|
});
|
|
52
55
|
}
|
|
@@ -73,7 +76,7 @@ function useSCBlockedUsersManager(user) {
|
|
|
73
76
|
setLoading(false);
|
|
74
77
|
return Promise.resolve(!isBlocked);
|
|
75
78
|
});
|
|
76
|
-
}, [loading,
|
|
79
|
+
}, [loading, data.length, setLoading]);
|
|
77
80
|
/**
|
|
78
81
|
* Memoized isBlocked
|
|
79
82
|
* If user is already in cache -> check if the user is blocked,
|
|
@@ -91,7 +94,7 @@ function useSCBlockedUsersManager(user) {
|
|
|
91
94
|
*/
|
|
92
95
|
(0, react_1.useEffect)(() => {
|
|
93
96
|
if (authUserId) {
|
|
94
|
-
refresh();
|
|
97
|
+
refresh(true);
|
|
95
98
|
}
|
|
96
99
|
else {
|
|
97
100
|
setData([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCBlockedUsersManager.js","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":";;AAAA,iCAAmD;AACnD,8DAA0E;AAE1E,gDAA4C;AAC5C,gDAAkD;AAClD,8DAAwD;AAExD;;;;;;;;;;;;;GAaG;AACH,SAAwB,wBAAwB,CAAC,IAAiB;IAChE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAW,EAAE,CAAC,CAAC;IAE/C,QAAQ;IACR,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzC;;OAEG;IACH,MAAM,SAAS,GAAG,IAAA,eAAO,EACvB,GAAG,EAAE,CAAC,GAAY,EAAE;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF;;;;;OAKG;IACH,MAAM,OAAO,GAAG,IAAA,eAAO,EACrB,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"useSCBlockedUsersManager.js","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchUserBlockedBy.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAM1E;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,IAAW,EACX,aAAoB,EACpB,IAAW,GACZ,EAAE;IACD,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;;;;
|
|
1
|
+
{"version":3,"file":"useSCFetchUserBlockedBy.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAM1E;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,IAAW,EACX,aAAoB,EACpB,IAAW,GACZ,EAAE;IACD,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;;;;EA2EA"}
|
|
@@ -13,8 +13,8 @@ const SCUserProvider_1 = require("../components/provider/SCUserProvider");
|
|
|
13
13
|
* @param blockedByUser
|
|
14
14
|
*/
|
|
15
15
|
function useSCFetchUserBlockedBy({ user = null, blockedByUser = null, sync = true, }) {
|
|
16
|
-
const [blockedBy, setBlockedBy] = (0, react_1.useState)(
|
|
17
|
-
const [loading, setLoading] = (0, react_1.useState)(
|
|
16
|
+
const [blockedBy, setBlockedBy] = (0, react_1.useState)(null);
|
|
17
|
+
const [loading, setLoading] = (0, react_1.useState)(true);
|
|
18
18
|
const [error, setError] = (0, react_1.useState)(null);
|
|
19
19
|
// CONTEXT
|
|
20
20
|
const scUserContext = (0, SCUserProvider_1.useSCUser)();
|
|
@@ -40,20 +40,30 @@ function useSCFetchUserBlockedBy({ user = null, blockedByUser = null, sync = tru
|
|
|
40
40
|
* If user attempt to get blocked by
|
|
41
41
|
*/
|
|
42
42
|
(0, react_1.useEffect)(() => {
|
|
43
|
-
if (
|
|
44
|
-
if
|
|
43
|
+
if (user && blockedBy === null) {
|
|
44
|
+
// if user && blockedBy === null initialize the component
|
|
45
|
+
if (scUserContext.user) {
|
|
46
|
+
// authenticated user
|
|
45
47
|
if (scUserContext.user.id !== user.id) {
|
|
46
48
|
fetchUserBlockedBy(user);
|
|
47
49
|
}
|
|
48
50
|
else {
|
|
51
|
+
setBlockedBy(false);
|
|
49
52
|
setLoading(false);
|
|
50
53
|
}
|
|
51
54
|
}
|
|
55
|
+
else if (scUserContext.user === null) {
|
|
56
|
+
// anonymous user
|
|
57
|
+
setBlockedBy(blockedByUser);
|
|
58
|
+
setLoading(false);
|
|
59
|
+
}
|
|
52
60
|
}
|
|
53
|
-
|
|
54
|
-
|
|
61
|
+
}, [scUserContext.user, user, fetchUserBlockedBy, blockedBy, loading]);
|
|
62
|
+
(0, react_1.useEffect)(() => {
|
|
63
|
+
if (!scUserContext.user && blockedBy !== null) {
|
|
64
|
+
setBlockedBy(blockedByUser);
|
|
55
65
|
}
|
|
56
|
-
}, [scUserContext.user,
|
|
66
|
+
}, [scUserContext.user, blockedBy, blockedByUser]);
|
|
57
67
|
/**
|
|
58
68
|
* If sync enabled pull the remote status every 5sec
|
|
59
69
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchUserBlockedBy.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":";;AAAA,iCAAmD;AACnD,gDAAkD;AAElD,8DAAwD;AACxD,gDAA4C;AAE5C,0EAAgE;AAEhE;;;;;;GAMG;AACH,SAAwB,uBAAuB,CAAC,EAC9C,IAAI,GAAG,IAAI,EACX,aAAa,GAAG,IAAI,EACpB,IAAI,GAAG,IAAI,GAKZ;IACC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAU,
|
|
1
|
+
{"version":3,"file":"useSCFetchUserBlockedBy.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAC;AAiBnF,OAAO,EACL,iBAAiB,EAUlB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa,kCAA4D,CAAC;AAEvF;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAC,QAAQ,EAAC,EAAE;IAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAC,GAAG,GAAG,CAAC,OAAO,CAyN3F;AAED;;;GAGG;AACH,wBAAgB,SAAS,IAAI,iBAAiB,CAE7C"}
|
|
@@ -88,6 +88,9 @@ export default function SCUserProvider({ children }) {
|
|
|
88
88
|
dispatch({ type: userActionTypes.LOGIN_FAILURE, payload: { error } });
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
|
+
else {
|
|
92
|
+
dispatch({ type: userActionTypes.LOGIN_FAILURE });
|
|
93
|
+
}
|
|
91
94
|
}, [state.session]);
|
|
92
95
|
/**
|
|
93
96
|
* Controls caching of follow categories, users, etc...
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AACnF,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,SAAS,EAAE,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAC,qBAAqB,EAAE,MAAM,EAAC,MAAM,sBAAsB,CAAC;AACnE,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,2BAA2B,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,8BAA8B,MAAM,+CAA+C,CAAC;AAC3F,OAAO,oBAAoB,MAAM,qCAAqC,CAAC;AACvE,OAAO,oBAAoB,MAAM,qCAAqC,CAAC;AACvE,OAAO,qBAAqB,MAAM,sCAAsC,CAAC;AACzE,OAAO,uBAAuB,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAa,uBAAuB,EAAE,0BAA0B,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACnH,OAAO,gCAAgC,MAAM,iDAAiD,CAAC;AAC/F,OAAO,wBAAwB,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/provider/SCUserProvider/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;
|
|
1
|
+
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;AA2FF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,cAAc,EAAE,aAAa;;;;;;;EA4J5D"}
|
|
@@ -44,7 +44,12 @@ function userReducer(state, action) {
|
|
|
44
44
|
case userActionTypes.LOGIN_SUCCESS:
|
|
45
45
|
return { user: action.payload.user, error: null, session: Object.assign({}, state.session), loading: false };
|
|
46
46
|
case userActionTypes.LOGIN_FAILURE:
|
|
47
|
-
return {
|
|
47
|
+
return {
|
|
48
|
+
user: null,
|
|
49
|
+
session: Object.assign({}, state.session),
|
|
50
|
+
error: action.payload && action.payload.error ? action.payload.error : null,
|
|
51
|
+
loading: false,
|
|
52
|
+
};
|
|
48
53
|
case userActionTypes.REFRESH_TOKEN_SUCCESS:
|
|
49
54
|
const newAuthToken = Object.assign({}, state.session.authToken, Object.assign(Object.assign(Object.assign(Object.assign({}, state.session.authToken), { accessToken: action.payload.token.accessToken }), (action.payload.token.refreshToken ? { refreshToken: action.payload.token.refreshToken } : {})), (action.payload.token.expiresIn ? { expiresIn: action.payload.token.expiresIn } : {})));
|
|
50
55
|
const newSession = Object.assign({}, state.session, {
|
|
@@ -56,7 +61,7 @@ function userReducer(state, action) {
|
|
|
56
61
|
case userActionTypes.REFRESH_TOKEN_FAILURE:
|
|
57
62
|
return { user: null, session: Object.assign({}, state.session), loading: null, error: action.payload.error };
|
|
58
63
|
case userActionTypes.LOGOUT:
|
|
59
|
-
return { user:
|
|
64
|
+
return { user: undefined, session: {}, error: null, loading: null };
|
|
60
65
|
case userActionTypes.UPDATE_USER:
|
|
61
66
|
return Object.assign(Object.assign({}, state), { user: Object.assign(Object.assign({}, state.user), action.payload) });
|
|
62
67
|
case userActionTypes.REFRESH_SESSION:
|
|
@@ -82,7 +87,6 @@ function stateInitializer(session) {
|
|
|
82
87
|
}
|
|
83
88
|
else {
|
|
84
89
|
http.setAuthorizeToken();
|
|
85
|
-
_isLoading = false;
|
|
86
90
|
}
|
|
87
91
|
}
|
|
88
92
|
else if (_session.type === Session.COOKIE_SESSION) {
|
|
@@ -138,6 +142,12 @@ export default function useAuth(initialSession) {
|
|
|
138
142
|
// CONST
|
|
139
143
|
const userId = state.user ? state.user.id : null;
|
|
140
144
|
const accessToken = state.session.authToken && state.session.authToken.accessToken ? state.session.authToken.accessToken : null;
|
|
145
|
+
/**
|
|
146
|
+
* Reset session if initial conf changed
|
|
147
|
+
*/
|
|
148
|
+
useDeepCompareEffect(() => {
|
|
149
|
+
dispatch({ type: userActionTypes.REFRESH_SESSION, payload: { conf: stateInitializer(initialSession) } });
|
|
150
|
+
}, [initialSession]);
|
|
141
151
|
/**
|
|
142
152
|
* Refresh session
|
|
143
153
|
*/
|
|
@@ -258,12 +268,6 @@ export default function useAuth(initialSession) {
|
|
|
258
268
|
}
|
|
259
269
|
};
|
|
260
270
|
}, [userId, accessToken]);
|
|
261
|
-
/**
|
|
262
|
-
* Reset session if initial conf changed
|
|
263
|
-
*/
|
|
264
|
-
useDeepCompareEffect(() => {
|
|
265
|
-
dispatch({ type: userActionTypes.REFRESH_SESSION, payload: { conf: stateInitializer(initialSession) } });
|
|
266
|
-
}, [initialSession]);
|
|
267
271
|
return { state, dispatch, helpers: { refreshSession, logoutSession } };
|
|
268
272
|
}
|
|
269
273
|
//# sourceMappingURL=useSCAuth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAG7D,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,gBAAgB;IAC/B,MAAM,EAAE,SAAS;IACjB,qBAAqB,EAAE,wBAAwB;IAC/C,qBAAqB,EAAE,wBAAwB;IAC/C,eAAe,EAAE,gBAAgB;IACjC,WAAW,EAAE,cAAc;CAC5B,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,KAAK,EAAE,MAAM;IAChC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,eAAe,CAAC,aAAa;YAChC,OAAO,EAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;QAEjF,KAAK,eAAe,CAAC,aAAa;YAChC,OAAO,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC;QAE7G,KAAK,eAAe,CAAC,aAAa;YAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,6 @@ export default function useSCBlockedUsersManager(user?: SCUserType): {
|
|
|
26
26
|
isLoading: () => boolean;
|
|
27
27
|
block: (user: SCUserType) => Promise<any>;
|
|
28
28
|
isBlocked: (user: SCUserType) => boolean;
|
|
29
|
-
refresh: () => Promise<number[]>;
|
|
29
|
+
refresh: (setLoadingStatus?: boolean) => Promise<number[]>;
|
|
30
30
|
};
|
|
31
31
|
//# sourceMappingURL=useSCBlockedUsersManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCBlockedUsersManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAI,CAAC,EAAE,UAAU;;;qBAWpD,OAAO;;;;;;;qBAAP,OAAO;
|
|
1
|
+
{"version":3,"file":"useSCBlockedUsersManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAI,CAAC,EAAE,UAAU;;;qBAWpD,OAAO;;;;;;;qBAAP,OAAO;kBA0CR,UAAU,KAAG,QAAQ,GAAG,CAAC;sBA4BzB,UAAU,KAAG,OAAO;6CAxDC,QAAQ,MAAM,EAAE,CAAC;EAiFlD"}
|
|
@@ -34,17 +34,20 @@ export default function useSCBlockedUsersManager(user) {
|
|
|
34
34
|
* all blocked users by the authenticated user in a single solution
|
|
35
35
|
* It might be useful for multi-tab sync
|
|
36
36
|
*/
|
|
37
|
-
const refresh = useMemo(() => () => {
|
|
37
|
+
const refresh = useMemo(() => (setLoadingStatus = false) => {
|
|
38
38
|
if (user) {
|
|
39
|
+
setLoadingStatus && setLoading(true);
|
|
39
40
|
// Only if user is authenticated
|
|
40
41
|
return UserService.getHiddenUsersId()
|
|
41
42
|
.then((res) => {
|
|
42
43
|
setData(res);
|
|
44
|
+
setLoadingStatus && setLoading(false);
|
|
43
45
|
return Promise.resolve(res);
|
|
44
46
|
})
|
|
45
47
|
.catch((e) => {
|
|
46
48
|
Logger.error(SCOPE_SC_CORE, 'Unable to load blocked users.');
|
|
47
49
|
Logger.error(SCOPE_SC_CORE, e);
|
|
50
|
+
setLoadingStatus && setLoading(false);
|
|
48
51
|
return Promise.reject(e);
|
|
49
52
|
});
|
|
50
53
|
}
|
|
@@ -71,7 +74,7 @@ export default function useSCBlockedUsersManager(user) {
|
|
|
71
74
|
setLoading(false);
|
|
72
75
|
return Promise.resolve(!isBlocked);
|
|
73
76
|
});
|
|
74
|
-
}, [loading,
|
|
77
|
+
}, [loading, data.length, setLoading]);
|
|
75
78
|
/**
|
|
76
79
|
* Memoized isBlocked
|
|
77
80
|
* If user is already in cache -> check if the user is blocked,
|
|
@@ -89,7 +92,7 @@ export default function useSCBlockedUsersManager(user) {
|
|
|
89
92
|
*/
|
|
90
93
|
useEffect(() => {
|
|
91
94
|
if (authUserId) {
|
|
92
|
-
refresh();
|
|
95
|
+
refresh(true);
|
|
93
96
|
}
|
|
94
97
|
else {
|
|
95
98
|
setData([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCBlockedUsersManager.js","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EAAC,IAAI,EAAE,SAAS,EAAe,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAExD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAiB;IAChE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAC;IAE/C,QAAQ;IACR,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzC;;OAEG;IACH,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CAAC,GAAY,EAAE;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF;;;;;OAKG;IACH,MAAM,OAAO,GAAG,OAAO,CACrB,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"useSCBlockedUsersManager.js","sourceRoot":"","sources":["../../../src/hooks/useSCBlockedUsersManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchUserBlockedBy.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAM1E;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,IAAW,EACX,aAAoB,EACpB,IAAW,GACZ,EAAE;IACD,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;;;;
|
|
1
|
+
{"version":3,"file":"useSCFetchUserBlockedBy.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAM1E;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,IAAW,EACX,aAAoB,EACpB,IAAW,GACZ,EAAE;IACD,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;;;;EA2EA"}
|
|
@@ -11,8 +11,8 @@ import { useSCUser } from '../components/provider/SCUserProvider';
|
|
|
11
11
|
* @param blockedByUser
|
|
12
12
|
*/
|
|
13
13
|
export default function useSCFetchUserBlockedBy({ user = null, blockedByUser = null, sync = true, }) {
|
|
14
|
-
const [blockedBy, setBlockedBy] = useState(
|
|
15
|
-
const [loading, setLoading] = useState(
|
|
14
|
+
const [blockedBy, setBlockedBy] = useState(null);
|
|
15
|
+
const [loading, setLoading] = useState(true);
|
|
16
16
|
const [error, setError] = useState(null);
|
|
17
17
|
// CONTEXT
|
|
18
18
|
const scUserContext = useSCUser();
|
|
@@ -38,20 +38,30 @@ export default function useSCFetchUserBlockedBy({ user = null, blockedByUser = n
|
|
|
38
38
|
* If user attempt to get blocked by
|
|
39
39
|
*/
|
|
40
40
|
useEffect(() => {
|
|
41
|
-
if (
|
|
42
|
-
if
|
|
41
|
+
if (user && blockedBy === null) {
|
|
42
|
+
// if user && blockedBy === null initialize the component
|
|
43
|
+
if (scUserContext.user) {
|
|
44
|
+
// authenticated user
|
|
43
45
|
if (scUserContext.user.id !== user.id) {
|
|
44
46
|
fetchUserBlockedBy(user);
|
|
45
47
|
}
|
|
46
48
|
else {
|
|
49
|
+
setBlockedBy(false);
|
|
47
50
|
setLoading(false);
|
|
48
51
|
}
|
|
49
52
|
}
|
|
53
|
+
else if (scUserContext.user === null) {
|
|
54
|
+
// anonymous user
|
|
55
|
+
setBlockedBy(blockedByUser);
|
|
56
|
+
setLoading(false);
|
|
57
|
+
}
|
|
50
58
|
}
|
|
51
|
-
|
|
52
|
-
|
|
59
|
+
}, [scUserContext.user, user, fetchUserBlockedBy, blockedBy, loading]);
|
|
60
|
+
useEffect(() => {
|
|
61
|
+
if (!scUserContext.user && blockedBy !== null) {
|
|
62
|
+
setBlockedBy(blockedByUser);
|
|
53
63
|
}
|
|
54
|
-
}, [scUserContext.user,
|
|
64
|
+
}, [scUserContext.user, blockedBy, blockedByUser]);
|
|
55
65
|
/**
|
|
56
66
|
* If sync enabled pull the remote status every 5sec
|
|
57
67
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchUserBlockedBy.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAC,SAAS,EAAC,MAAM,uCAAuC,CAAC;AAEhE;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,IAAI,GAAG,IAAI,EACX,aAAa,GAAG,IAAI,EACpB,IAAI,GAAG,IAAI,GAKZ;IACC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAU,
|
|
1
|
+
{"version":3,"file":"useSCFetchUserBlockedBy.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchUserBlockedBy.ts"],"names":[],"mappings":"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"}
|