saasufy-components 9.5.2 → 9.5.3
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/oauth-handler.js +9 -2
- package/package.json +1 -1
package/oauth-handler.js
CHANGED
|
@@ -25,6 +25,13 @@ class OAuthHandler extends SocketConsumer {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
+
getProviderFromState(state) {
|
|
29
|
+
if (typeof state !== 'string') return '';
|
|
30
|
+
let lastDashIndex = state.lastIndexOf('-');
|
|
31
|
+
if (lastDashIndex === -1) return state;
|
|
32
|
+
return state.slice(0, lastDashIndex);
|
|
33
|
+
}
|
|
34
|
+
|
|
28
35
|
async connectedCallback() {
|
|
29
36
|
this.innerHTML = '';
|
|
30
37
|
|
|
@@ -45,7 +52,7 @@ class OAuthHandler extends SocketConsumer {
|
|
|
45
52
|
|
|
46
53
|
let relevantStates = expectedOAuthState
|
|
47
54
|
.split(',')
|
|
48
|
-
.filter(expectedState =>
|
|
55
|
+
.filter(expectedState => this.getProviderFromState(expectedState) === provider);
|
|
49
56
|
|
|
50
57
|
// Do not process. The state may have been set for a different provider
|
|
51
58
|
// which is handled on the same page.
|
|
@@ -60,7 +67,7 @@ class OAuthHandler extends SocketConsumer {
|
|
|
60
67
|
let urlSearchParams = new URLSearchParams(location.search);
|
|
61
68
|
let state = urlSearchParams.get(stateParamName);
|
|
62
69
|
|
|
63
|
-
let stateProvider = (state
|
|
70
|
+
let stateProvider = this.getProviderFromState(state);
|
|
64
71
|
if (stateProvider !== provider) return;
|
|
65
72
|
|
|
66
73
|
let code = urlSearchParams.get(codeParamName);
|