@vertesia/ui 1.5.0-dev.20260713.151751Z → 1.5.0-dev.20260717.131047Z
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/env/index.d.ts +19 -0
- package/lib/env/index.d.ts.map +1 -1
- package/lib/env/index.js +6 -0
- package/lib/env/index.js.map +1 -1
- package/lib/features/agent/chat/ArtifactsTab.d.ts.map +1 -1
- package/lib/features/agent/chat/ArtifactsTab.js +65 -11
- package/lib/features/agent/chat/ArtifactsTab.js.map +1 -1
- package/lib/features/agent/chat/ModernAgentConversation.js +51 -48
- package/lib/features/agent/chat/ModernAgentConversation.js.map +1 -1
- package/lib/features/agent/chat/hooks/useArtifacts.d.ts +8 -1
- package/lib/features/agent/chat/hooks/useArtifacts.d.ts.map +1 -1
- package/lib/features/agent/chat/hooks/useArtifacts.js +28 -10
- package/lib/features/agent/chat/hooks/useArtifacts.js.map +1 -1
- package/lib/features/document-viewer/UniversalDocumentViewer.d.ts +73 -0
- package/lib/features/document-viewer/UniversalDocumentViewer.d.ts.map +1 -0
- package/lib/features/document-viewer/UniversalDocumentViewer.js +415 -0
- package/lib/features/document-viewer/UniversalDocumentViewer.js.map +1 -0
- package/lib/features/document-viewer/index.d.ts +2 -0
- package/lib/features/document-viewer/index.d.ts.map +1 -0
- package/lib/features/document-viewer/index.js +2 -0
- package/lib/features/document-viewer/index.js.map +1 -0
- package/lib/features/index.d.ts +1 -0
- package/lib/features/index.d.ts.map +1 -1
- package/lib/features/index.js +1 -0
- package/lib/features/index.js.map +1 -1
- package/lib/features/permissions/UserPermissionsProvider.d.ts +2 -3
- package/lib/features/permissions/UserPermissionsProvider.d.ts.map +1 -1
- package/lib/features/permissions/UserPermissionsProvider.js +31 -38
- package/lib/features/permissions/UserPermissionsProvider.js.map +1 -1
- package/lib/features/store/objects/components/ContentOverview.d.ts.map +1 -1
- package/lib/features/store/objects/components/ContentOverview.js +73 -13
- package/lib/features/store/objects/components/ContentOverview.js.map +1 -1
- package/lib/i18n/locales/ar.json +2 -0
- package/lib/i18n/locales/de.json +2 -0
- package/lib/i18n/locales/en.json +2 -0
- package/lib/i18n/locales/es.json +2 -0
- package/lib/i18n/locales/fr.json +2 -0
- package/lib/i18n/locales/it.json +2 -0
- package/lib/i18n/locales/ja.json +2 -0
- package/lib/i18n/locales/ko.json +2 -0
- package/lib/i18n/locales/pt.json +2 -0
- package/lib/i18n/locales/ru.json +2 -0
- package/lib/i18n/locales/tr.json +2 -0
- package/lib/i18n/locales/zh-TW.json +2 -0
- package/lib/i18n/locales/zh.json +2 -0
- package/lib/router/HistoryNavigator.d.ts.map +1 -1
- package/lib/router/HistoryNavigator.js +4 -1
- package/lib/router/HistoryNavigator.js.map +1 -1
- package/lib/router/Nav.d.ts.map +1 -1
- package/lib/router/Nav.js +7 -1
- package/lib/router/Nav.js.map +1 -1
- package/lib/router/Router.d.ts.map +1 -1
- package/lib/router/Router.js +19 -4
- package/lib/router/Router.js.map +1 -1
- package/lib/router/path.d.ts +15 -0
- package/lib/router/path.d.ts.map +1 -1
- package/lib/router/path.js +43 -0
- package/lib/router/path.js.map +1 -1
- package/lib/session/UserSession.d.ts +6 -0
- package/lib/session/UserSession.d.ts.map +1 -1
- package/lib/session/UserSession.js +31 -9
- package/lib/session/UserSession.js.map +1 -1
- package/lib/session/UserSessionProvider.d.ts.map +1 -1
- package/lib/session/UserSessionProvider.js +111 -49
- package/lib/session/UserSessionProvider.js.map +1 -1
- package/lib/session/auth/composable.d.ts.map +1 -1
- package/lib/session/auth/composable.js +52 -3
- package/lib/session/auth/composable.js.map +1 -1
- package/lib/session/auth/domainRouting.d.ts +25 -0
- package/lib/session/auth/domainRouting.d.ts.map +1 -1
- package/lib/session/auth/domainRouting.js +36 -0
- package/lib/session/auth/domainRouting.js.map +1 -1
- package/lib/shell/login/SignInRestrictedEnvStep.d.ts +1 -1
- package/lib/shell/login/SignInRestrictedEnvStep.js +1 -1
- package/lib/shell/login/SigninScreen.js +9 -1
- package/lib/shell/login/SigninScreen.js.map +1 -1
- package/lib/shell/login/productionUrl.d.ts +0 -14
- package/lib/shell/login/productionUrl.d.ts.map +1 -1
- package/lib/shell/login/productionUrl.js +14 -5
- package/lib/shell/login/productionUrl.js.map +1 -1
- package/lib/vertesia-ui-core.js +3 -3
- package/lib/vertesia-ui-core.js.map +1 -1
- package/lib/vertesia-ui-env.js +1 -1
- package/lib/vertesia-ui-env.js.map +1 -1
- package/lib/vertesia-ui-features.js +28 -28
- package/lib/vertesia-ui-features.js.map +1 -1
- package/lib/vertesia-ui-i18n.js +13 -13
- package/lib/vertesia-ui-router.js +1 -1
- package/lib/vertesia-ui-router.js.map +1 -1
- package/lib/vertesia-ui-session.js +1 -1
- package/lib/vertesia-ui-session.js.map +1 -1
- package/lib/vertesia-ui-shell.js +1 -1
- package/lib/vertesia-ui-shell.js.map +1 -1
- package/lib/vertesia-ui-widgets.js +2 -2
- package/lib/vertesia-ui-widgets.js.map +1 -1
- package/llms.txt +70 -70
- package/package.json +8 -7
- package/src/env/index.ts +24 -0
- package/src/features/agent/chat/ArtifactsTab.tsx +155 -21
- package/src/features/agent/chat/ModernAgentConversation.tsx +53 -49
- package/src/features/agent/chat/hooks/useArtifacts.ts +44 -11
- package/src/features/document-viewer/UniversalDocumentViewer.test.tsx +123 -0
- package/src/features/document-viewer/UniversalDocumentViewer.tsx +746 -0
- package/src/features/document-viewer/index.ts +1 -0
- package/src/features/index.ts +1 -0
- package/src/features/permissions/UserPermissionsProvider.tsx +36 -39
- package/src/features/store/objects/components/ContentOverview.tsx +99 -26
- package/src/i18n/locales/ar.json +2 -0
- package/src/i18n/locales/de.json +2 -0
- package/src/i18n/locales/en.json +2 -0
- package/src/i18n/locales/es.json +2 -0
- package/src/i18n/locales/fr.json +2 -0
- package/src/i18n/locales/it.json +2 -0
- package/src/i18n/locales/ja.json +2 -0
- package/src/i18n/locales/ko.json +2 -0
- package/src/i18n/locales/pt.json +2 -0
- package/src/i18n/locales/ru.json +2 -0
- package/src/i18n/locales/tr.json +2 -0
- package/src/i18n/locales/zh-TW.json +2 -0
- package/src/i18n/locales/zh.json +2 -0
- package/src/router/HistoryNavigator.ts +4 -1
- package/src/router/Nav.tsx +7 -1
- package/src/router/Router.tsx +18 -4
- package/src/router/path.test.ts +87 -0
- package/src/router/path.ts +38 -0
- package/src/session/UserSession.ts +32 -9
- package/src/session/UserSessionProvider.tsx +138 -62
- package/src/session/auth/composable.test.ts +111 -0
- package/src/session/auth/composable.ts +58 -3
- package/src/session/auth/domainRouting.test.ts +28 -1
- package/src/session/auth/domainRouting.ts +38 -0
- package/src/shell/login/SignInRestrictedEnvStep.tsx +1 -1
- package/src/shell/login/SigninScreen.tsx +9 -1
- package/src/shell/login/productionUrl.test.ts +8 -5
- package/src/shell/login/productionUrl.ts +15 -5
|
@@ -3,11 +3,16 @@ import { Env } from '@vertesia/ui/env';
|
|
|
3
3
|
import { onAuthStateChanged } from 'firebase/auth';
|
|
4
4
|
import { useEffect, useRef, useState } from 'react';
|
|
5
5
|
import { getComposableToken, RestrictedEnvironmentError, STSError, UserNotFoundError } from './auth/composable';
|
|
6
|
-
import { shouldRedirectToCentralAuth } from './auth/domainRouting';
|
|
6
|
+
import { authReturnUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
|
|
7
7
|
import { getFirebaseAuth } from './auth/firebase';
|
|
8
8
|
import { useAuthState } from './auth/useAuthState';
|
|
9
9
|
import { LastSelectedAccountId_KEY, LastSelectedProjectId_KEY, UserSession, UserSessionContext } from './UserSession';
|
|
10
10
|
const CENTRAL_AUTH_REDIRECT = 'https://internal-auth.vertesia.app/';
|
|
11
|
+
function clearAuthHash() {
|
|
12
|
+
const url = new URL(window.location.href);
|
|
13
|
+
url.hash = '';
|
|
14
|
+
window.history.replaceState(window.history.state, '', `${url.pathname}${url.search}`);
|
|
15
|
+
}
|
|
11
16
|
export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
12
17
|
const hashParams = new URLSearchParams(location.hash.substring(1));
|
|
13
18
|
const token = hashParams.get('token');
|
|
@@ -18,8 +23,7 @@ export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
|
18
23
|
const authFlowRef = useRef(undefined);
|
|
19
24
|
const redirectToCentralAuth = (projectId, accountId) => {
|
|
20
25
|
const url = new URL(`${CENTRAL_AUTH_REDIRECT}?sts=${Env.endpoints.sts ?? 'https://sts.vertesia.io'}`);
|
|
21
|
-
const currentUrl =
|
|
22
|
-
currentUrl.hash = '';
|
|
26
|
+
const currentUrl = authReturnUrl();
|
|
23
27
|
if (projectId)
|
|
24
28
|
currentUrl.searchParams.set('p', projectId);
|
|
25
29
|
if (accountId)
|
|
@@ -50,6 +54,27 @@ export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
|
50
54
|
project_id: selectedProject,
|
|
51
55
|
},
|
|
52
56
|
});
|
|
57
|
+
if (Env.isLocalDev && Env.devAuthToken) {
|
|
58
|
+
session.setSession = setSession;
|
|
59
|
+
getComposableToken(selectedAccount, selectedProject, Env.devAuthToken)
|
|
60
|
+
.then((res) => {
|
|
61
|
+
session.login(res.rawToken).then(() => setSession(session.clone()));
|
|
62
|
+
})
|
|
63
|
+
.catch((err) => {
|
|
64
|
+
console.error('Failed to initialize dev auth token', err);
|
|
65
|
+
Env.logger.error('Failed to initialize dev auth token', {
|
|
66
|
+
vertesia: {
|
|
67
|
+
account_id: selectedAccount,
|
|
68
|
+
project_id: selectedProject,
|
|
69
|
+
error: err,
|
|
70
|
+
},
|
|
71
|
+
});
|
|
72
|
+
session.isLoading = false;
|
|
73
|
+
session.authError = err instanceof Error ? err : new Error(String(err));
|
|
74
|
+
setSession(session.clone());
|
|
75
|
+
});
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
53
78
|
if (token && state) {
|
|
54
79
|
session.setSession = setSession;
|
|
55
80
|
const validationError = verifyState(state);
|
|
@@ -69,8 +94,7 @@ export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
|
69
94
|
.then((res) => {
|
|
70
95
|
session.login(res.rawToken, { loadOnboardingStatus }).then(() => {
|
|
71
96
|
setSession(session.clone());
|
|
72
|
-
|
|
73
|
-
window.location.hash = '';
|
|
97
|
+
clearAuthHash();
|
|
74
98
|
});
|
|
75
99
|
})
|
|
76
100
|
.catch((err) => {
|
|
@@ -105,7 +129,7 @@ export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
|
105
129
|
window.alert('Authentication failed due to an issue with the authentication service. Please try again later.');
|
|
106
130
|
session.logout();
|
|
107
131
|
setSession(session.clone());
|
|
108
|
-
|
|
132
|
+
clearAuthHash();
|
|
109
133
|
return;
|
|
110
134
|
}
|
|
111
135
|
console.error('Failed to fetch user token from studio, redirecting to central auth', err);
|
|
@@ -118,7 +142,11 @@ export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
|
118
142
|
});
|
|
119
143
|
return;
|
|
120
144
|
}
|
|
121
|
-
|
|
145
|
+
let cancelled = false;
|
|
146
|
+
let unsubscribe;
|
|
147
|
+
const startFirebaseOrCentralAuth = () => {
|
|
148
|
+
if (cancelled)
|
|
149
|
+
return;
|
|
122
150
|
// If the current host is not in the Firebase allowlist, central auth owns sign-in.
|
|
123
151
|
if (!session.isLoggedIn()) {
|
|
124
152
|
console.log('Auth: not logged in & no token/state');
|
|
@@ -139,65 +167,99 @@ export function UserSessionProvider({ children, loadOnboardingStatus = true }) {
|
|
|
139
167
|
redirectToCentralAuth();
|
|
140
168
|
return; // Don't register onAuthStateChanged listener when redirecting
|
|
141
169
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
170
|
+
console.log('Auth: host is in Firebase auth allowlist');
|
|
171
|
+
Env.logger.info('Host is in Firebase auth allowlist', {
|
|
172
|
+
vertesia: {
|
|
173
|
+
account_id: selectedAccount,
|
|
174
|
+
project_id: selectedProject,
|
|
175
|
+
},
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
unsubscribe = onAuthStateChanged(getFirebaseAuth(), async (firebaseUser) => {
|
|
179
|
+
if (firebaseUser) {
|
|
180
|
+
console.log('Auth: successful login with firebase');
|
|
181
|
+
Env.logger.info('Successful login with firebase', {
|
|
145
182
|
vertesia: {
|
|
146
183
|
account_id: selectedAccount,
|
|
147
184
|
project_id: selectedProject,
|
|
148
185
|
},
|
|
149
186
|
});
|
|
187
|
+
session.setSession = setSession;
|
|
188
|
+
await getComposableToken(selectedAccount, selectedProject, undefined, false, shouldRedirectToCentralAuth())
|
|
189
|
+
.then((res) => {
|
|
190
|
+
session
|
|
191
|
+
.login(res.rawToken, { loadOnboardingStatus })
|
|
192
|
+
.then(() => setSession(session.clone()));
|
|
193
|
+
})
|
|
194
|
+
.catch((err) => {
|
|
195
|
+
console.error('Failed to fetch user token from studio', err);
|
|
196
|
+
Env.logger.error('Failed to fetch user token from studio', {
|
|
197
|
+
vertesia: {
|
|
198
|
+
account_id: selectedAccount,
|
|
199
|
+
project_id: selectedProject,
|
|
200
|
+
error: err,
|
|
201
|
+
},
|
|
202
|
+
});
|
|
203
|
+
// Keep the Firebase session for UserNotFoundError (signup flow) and
|
|
204
|
+
// RestrictedEnvironmentError (identity is valid; the environment is gated).
|
|
205
|
+
// Logging out would retrigger onAuthStateChanged and clear the authError.
|
|
206
|
+
if (!(err instanceof UserNotFoundError) && !(err instanceof RestrictedEnvironmentError)) {
|
|
207
|
+
session.logout();
|
|
208
|
+
}
|
|
209
|
+
session.isLoading = false;
|
|
210
|
+
session.authError = err;
|
|
211
|
+
setSession(session.clone());
|
|
212
|
+
});
|
|
150
213
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
console.log('Auth: successful login with firebase');
|
|
156
|
-
Env.logger.info('Successful login with firebase', {
|
|
157
|
-
vertesia: {
|
|
158
|
-
account_id: selectedAccount,
|
|
159
|
-
project_id: selectedProject,
|
|
160
|
-
},
|
|
161
|
-
});
|
|
162
|
-
session.setSession = setSession;
|
|
163
|
-
await getComposableToken(selectedAccount, selectedProject, undefined, false, shouldRedirectToCentralAuth())
|
|
164
|
-
.then((res) => {
|
|
165
|
-
session.login(res.rawToken, { loadOnboardingStatus }).then(() => setSession(session.clone()));
|
|
166
|
-
})
|
|
167
|
-
.catch((err) => {
|
|
168
|
-
console.error('Failed to fetch user token from studio', err);
|
|
169
|
-
Env.logger.error('Failed to fetch user token from studio', {
|
|
214
|
+
else {
|
|
215
|
+
// anonymous user
|
|
216
|
+
console.log('Auth: using anonymous user');
|
|
217
|
+
Env.logger.info('Using anonymous user', {
|
|
170
218
|
vertesia: {
|
|
171
219
|
account_id: selectedAccount,
|
|
172
220
|
project_id: selectedProject,
|
|
173
|
-
error: err,
|
|
174
221
|
},
|
|
175
222
|
});
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
// Logging out would retrigger onAuthStateChanged and clear the authError.
|
|
179
|
-
if (!(err instanceof UserNotFoundError) && !(err instanceof RestrictedEnvironmentError)) {
|
|
180
|
-
session.logout();
|
|
181
|
-
}
|
|
182
|
-
session.isLoading = false;
|
|
183
|
-
session.authError = err;
|
|
223
|
+
session.client.withAuthCallback(undefined);
|
|
224
|
+
session.logout();
|
|
184
225
|
setSession(session.clone());
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
226
|
+
}
|
|
227
|
+
});
|
|
228
|
+
};
|
|
229
|
+
if (Env.authTokenProvider) {
|
|
230
|
+
session.setSession = setSession;
|
|
231
|
+
void Env.authTokenProvider()
|
|
232
|
+
.then(async (injectedToken) => {
|
|
233
|
+
if (!injectedToken) {
|
|
234
|
+
startFirebaseOrCentralAuth();
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
const res = await getComposableToken(selectedAccount, selectedProject, injectedToken, false, shouldRedirectToCentralAuth());
|
|
238
|
+
await session.login(res.rawToken, { loadOnboardingStatus });
|
|
239
|
+
if (!cancelled)
|
|
240
|
+
setSession(session.clone());
|
|
241
|
+
})
|
|
242
|
+
.catch((err) => {
|
|
243
|
+
console.warn('Auth: failed to initialize injected auth token', err);
|
|
244
|
+
Env.logger.warn('Failed to initialize injected auth token', {
|
|
191
245
|
vertesia: {
|
|
192
246
|
account_id: selectedAccount,
|
|
193
247
|
project_id: selectedProject,
|
|
248
|
+
error: err,
|
|
194
249
|
},
|
|
195
250
|
});
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
251
|
+
startFirebaseOrCentralAuth();
|
|
252
|
+
});
|
|
253
|
+
return () => {
|
|
254
|
+
cancelled = true;
|
|
255
|
+
unsubscribe?.();
|
|
256
|
+
};
|
|
257
|
+
}
|
|
258
|
+
startFirebaseOrCentralAuth();
|
|
259
|
+
return () => {
|
|
260
|
+
cancelled = true;
|
|
261
|
+
unsubscribe?.();
|
|
262
|
+
};
|
|
201
263
|
};
|
|
202
264
|
useEffect(() => {
|
|
203
265
|
return authFlowRef.current?.();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserSessionProvider.js","sourceRoot":"","sources":["../../src/session/UserSessionProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAkB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"UserSessionProvider.js","sourceRoot":"","sources":["../../src/session/UserSessionProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composable.d.ts","sourceRoot":"","sources":["../../../src/session/auth/composable.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,gBAAgB,EAAqC,MAAM,kBAAkB,CAAC;AAS5F,UAAU,uBAAuB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"composable.d.ts","sourceRoot":"","sources":["../../../src/session/auth/composable.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,gBAAgB,EAAqC,MAAM,kBAAkB,CAAC;AAS5F,UAAU,uBAAuB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAwCD,wBAAsB,oBAAoB,CACtC,UAAU,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EACpD,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,EACZ,UAAU,SAAI,GACf,OAAO,CAAC,MAAM,CAAC,CA8PjB;AAED;;;;;;GAMG;AACH,wBAAsB,qCAAqC,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,mBAE/G;AAED;;;;GAIG;AACH,wBAAsB,qCAAqC,CACvD,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,mBAGf;AAED,qEAAqE;AACrE,wBAAgB,uBAAuB,IAAI,MAAM,GAAG,SAAS,CAE5D;AAED,wBAAsB,kBAAkB,CACpC,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,UAAQ,EACpB,eAAe,UAAQ,GACxB,OAAO,CAAC,uBAAuB,CAAC,CAgElC;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IACxC,KAAK,EAAE,MAAM,CAAC;gBACF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAK7C;AAED,qBAAa,QAAS,SAAQ,KAAK;IAC/B,MAAM,EAAE,MAAM,CAAC;gBACH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAK9C;AAED;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAI9B"}
|
|
@@ -8,6 +8,40 @@ import { LastSelectedAccountId_KEY, LastSelectedProjectId_KEY } from '../constan
|
|
|
8
8
|
import { getFirebaseAuth, getFirebaseAuthToken } from './firebase';
|
|
9
9
|
let AUTH_TOKEN_RAW;
|
|
10
10
|
let AUTH_TOKEN;
|
|
11
|
+
function normalizeIssuer(value) {
|
|
12
|
+
return value?.replace(/\/+$/, '');
|
|
13
|
+
}
|
|
14
|
+
function decodeToken(token) {
|
|
15
|
+
return jwtDecode(token);
|
|
16
|
+
}
|
|
17
|
+
function isVertesiaIssuedToken(token) {
|
|
18
|
+
if (!token)
|
|
19
|
+
return false;
|
|
20
|
+
try {
|
|
21
|
+
const decoded = decodeToken(token);
|
|
22
|
+
return normalizeIssuer(decoded.iss) === normalizeIssuer(Env.endpoints.sts);
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function canUseVertesiaTokenDirectly(token, accountId, projectId) {
|
|
29
|
+
const decoded = decodeToken(token);
|
|
30
|
+
const hasAuthorizationClaims = Boolean(decoded.permissions?.length ||
|
|
31
|
+
decoded.account_roles?.length ||
|
|
32
|
+
decoded.project_roles?.length ||
|
|
33
|
+
decoded.apps?.length);
|
|
34
|
+
if (!hasAuthorizationClaims) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
if (accountId && decoded.account?.id !== accountId) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
if (projectId && decoded.project?.id !== projectId) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
11
45
|
export async function fetchComposableToken(getIdToken, accountId, projectId, ttl, retryCount = 0) {
|
|
12
46
|
console.log(`Getting/refreshing composable token for account ${accountId} and project ${projectId} `);
|
|
13
47
|
Env.logger.info('Getting/refreshing composable token', {
|
|
@@ -265,19 +299,34 @@ export function getCurrentVertesiaToken() {
|
|
|
265
299
|
export async function getComposableToken(accountId, projectId, initToken, forceRefresh = false, useInternalAuth = false) {
|
|
266
300
|
const selectedAccount = accountId ?? localStorage.getItem(LastSelectedAccountId_KEY) ?? undefined;
|
|
267
301
|
const selectedProject = projectId ?? localStorage.getItem(`${LastSelectedProjectId_KEY}-${selectedAccount}`) ?? undefined;
|
|
302
|
+
const devAuthToken = Env.isLocalDev ? Env.devAuthToken : undefined;
|
|
303
|
+
const suppliedToken = devAuthToken ?? initToken ?? AUTH_TOKEN_RAW;
|
|
268
304
|
//token is still valid for more than 5 minutes
|
|
269
305
|
if (!forceRefresh && AUTH_TOKEN_RAW && AUTH_TOKEN && AUTH_TOKEN.exp > Date.now() / 1000 + 300) {
|
|
270
306
|
return { rawToken: AUTH_TOKEN_RAW, token: AUTH_TOKEN, error: false };
|
|
271
307
|
}
|
|
308
|
+
if (!forceRefresh &&
|
|
309
|
+
isVertesiaIssuedToken(suppliedToken) &&
|
|
310
|
+
canUseVertesiaTokenDirectly(suppliedToken, selectedAccount, selectedProject)) {
|
|
311
|
+
AUTH_TOKEN_RAW = suppliedToken;
|
|
312
|
+
AUTH_TOKEN = decodeToken(AUTH_TOKEN_RAW);
|
|
313
|
+
if (!AUTH_TOKEN.exp) {
|
|
314
|
+
throw new Error('Invalid composable token');
|
|
315
|
+
}
|
|
316
|
+
return { rawToken: AUTH_TOKEN_RAW, token: AUTH_TOKEN, error: false };
|
|
317
|
+
}
|
|
272
318
|
//token is close to expire, refresh it
|
|
273
|
-
if (!useInternalAuth && getFirebaseAuth().currentUser) {
|
|
319
|
+
if (!devAuthToken && !useInternalAuth && getFirebaseAuth().currentUser) {
|
|
274
320
|
//we have a firebase user, get the token from there
|
|
275
321
|
AUTH_TOKEN_RAW = await fetchComposableTokenFromFirebaseToken(selectedAccount, selectedProject);
|
|
276
322
|
}
|
|
277
|
-
else if (initToken || AUTH_TOKEN_RAW) {
|
|
323
|
+
else if (!devAuthToken && (initToken || AUTH_TOKEN_RAW)) {
|
|
278
324
|
// we have a token already and no firebase user, refresh it
|
|
279
325
|
AUTH_TOKEN_RAW = await fetchComposableToken(() => Promise.resolve(initToken ?? AUTH_TOKEN_RAW), selectedAccount, selectedProject);
|
|
280
326
|
}
|
|
327
|
+
else if (devAuthToken) {
|
|
328
|
+
AUTH_TOKEN_RAW = devAuthToken;
|
|
329
|
+
}
|
|
281
330
|
if (!AUTH_TOKEN_RAW) {
|
|
282
331
|
Env.logger.error('Cannot acquire a composable token', {
|
|
283
332
|
vertesia: {
|
|
@@ -287,7 +336,7 @@ export async function getComposableToken(accountId, projectId, initToken, forceR
|
|
|
287
336
|
});
|
|
288
337
|
throw new Error('Cannot acquire a composable token');
|
|
289
338
|
}
|
|
290
|
-
AUTH_TOKEN =
|
|
339
|
+
AUTH_TOKEN = decodeToken(AUTH_TOKEN_RAW);
|
|
291
340
|
if (!AUTH_TOKEN?.exp || !AUTH_TOKEN_RAW) {
|
|
292
341
|
console.error('Invalid composable token', AUTH_TOKEN);
|
|
293
342
|
Env.logger.error('Invalid composable token', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composable.js","sourceRoot":"","sources":["../../../src/session/auth/composable.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAyB,iCAAiC,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEnE,IAAI,cAAkC,CAAC;AACvC,IAAI,UAAwC,CAAC;AAS7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,UAAoD,EACpD,SAAkB,EAClB,SAAkB,EAClB,GAAY,EACZ,UAAU,GAAG,CAAC;IAEd,OAAO,CAAC,GAAG,CAAC,mDAAmD,SAAS,gBAAgB,SAAS,GAAG,CAAC,CAAC;IACtG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE;QACnD,QAAQ,EAAE;YACN,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,UAAU;SAC1B;KACJ,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC,CAAC,mBAAmB;IACvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACzC,CAAC;IAED,qEAAqE;IACrE,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,WAAW,CAAC,CAAC;IAC5D,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE;QAC9C,QAAQ,EAAE;YACN,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,WAAW;SACvB;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC;QACD,oCAAoC;QACpC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,WAAW,cAAc,CAAC,CAAC;QACrD,MAAM,WAAW,GAAG;YAChB,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS;SACpE,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE;YAC/B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,OAAO,EAAE,EAAE,oCAAoC;aAC3E;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;SACpC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YACpD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE;gBAC5C,QAAQ,EAAE;oBACN,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;oBACrB,KAAK,EAAE,KAAK;iBACf;aACJ,CAAC,CAAC;YACH,MAAM,IAAI,QAAQ,CAAC,6BAA6B,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,IAAI,MAAM,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YACpC,6DAA6D;YAC7D,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAClE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,EAAE;gBAClE,QAAQ,EAAE;oBACN,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;oBACrB,MAAM,EAAE,MAAM,EAAE,MAAM;iBACzB;aACJ,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,mBAAmB,EAAE;gBAC3E,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACL,aAAa,EAAE,UAAU,OAAO,EAAE;oBAClC,cAAc,EAAE,kBAAkB;iBACrC;aACJ,CAAC,CAAC;YAEH,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAChC,6BAA6B;gBAC7B,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;gBACtD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;oBACtD,QAAQ,EAAE;wBACN,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,SAAS;qBACxB;iBACJ,CAAC,CAAC;gBACH,MAAM,cAAc,GAAG,SAAS,CAAqB,OAAO,CAAC,CAAC;gBAC9D,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC;oBACzB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;oBAC/C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAClD,CAAC;gBACD,MAAM,IAAI,iBAAiB,CAAC,kCAAkC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;YAC1F,CAAC;YAED,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAChC,+DAA+D;gBAC/D,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,EAAE;oBACpE,QAAQ,EAAE;wBACN,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,SAAS;qBACxB;iBACJ,CAAC,CAAC;gBACH,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACvE,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;gBACrE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE;oBAC7C,QAAQ,EAAE;wBACN,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,SAAS;wBACrB,MAAM,EAAE,cAAc,CAAC,MAAM;qBAChC;iBACJ,CAAC,CAAC;gBACH,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YACpD,CAAC;YAED,+CAA+C;YAC/C,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACxD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE;gBACxD,QAAQ,EAAE;oBACN,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;iBACxB;aACJ,CAAC,CAAC;YACH,OAAO,oBAAoB,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QACnF,CAAC;QAED,IAAI,OAAO,IAAI,MAAM,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,8DAA8D,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC5F,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE;gBAC7E,QAAQ,EAAE;oBACN,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;oBACrB,MAAM,EAAE,MAAM,EAAE,MAAM;iBACzB;aACJ,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,SAAS,CAAqB,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC;gBACzB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAClD,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE;gBAC/B,QAAQ,EAAE;oBACN,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;oBACrB,KAAK,EAAE,cAAc,CAAC,KAAK;iBAC9B;aACJ,CAAC,CAAC;YACH,MAAM,IAAI,iBAAiB,CAAC,gBAAgB,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACxB,+EAA+E;YAC/E,iFAAiF;YACjF,8EAA8E;YAC9E,sCAAsC;YACtC,MAAM,IAAI,GAAG,MAAM,MAAM;iBACpB,KAAK,EAAE;iBACP,IAAI,EAAE;iBACN,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5B,IAAI,IAAI,EAAE,SAAS,KAAK,iCAAiC,EAAE,CAAC;gBACxD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,EAAE;oBAC5E,QAAQ,EAAE;wBACN,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,SAAS;qBACxB;iBACJ,CAAC,CAAC;gBACH,MAAM,IAAI,0BAA0B,CAChC,IAAI,CAAC,OAAO,IAAI,qEAAqE,CACxF,CAAC;YACN,CAAC;YAED,gFAAgF;YAChF,wBAAwB;YACxB,2CAA2C;YAC3C,6DAA6D;YAC7D,4CAA4C;YAE5C,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;gBACjB,+EAA+E;gBAC/E,OAAO,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC;gBAC3F,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,EAAE;oBACvE,QAAQ,EAAE;wBACN,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,SAAS;wBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,WAAW,EAAE,UAAU;qBAC1B;iBACJ,CAAC,CAAC;gBACH,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAChF,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,iFAAiF,CAAC,CAAC;YAC/F,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,EAAE;gBACzE,QAAQ,EAAE;oBACN,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;oBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,WAAW,EAAE,UAAU;iBAC1B;aACJ,CAAC,CAAC;YAEH,oDAAoD;YACpD,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;YACnD,IAAI,SAAS,EAAE,CAAC;gBACZ,YAAY,CAAC,UAAU,CAAC,GAAG,yBAAyB,IAAI,SAAS,EAAE,CAAC,CAAC;YACzE,CAAC;YAED,iFAAiF;YACjF,OAAO,oBAAoB,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;QACvF,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACtC,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACxE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE;gBAC5C,QAAQ,EAAE;oBACN,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,KAAK,EAAE,SAAS;oBAChB,UAAU,EAAE,SAAS;oBACrB,UAAU,EAAE,SAAS;iBACxB;aACJ,CAAC,CAAC;YACH,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IACI,KAAK,YAAY,iBAAiB;YAClC,KAAK,YAAY,QAAQ;YACzB,KAAK,YAAY,0BAA0B,EAC7C,CAAC;YACC,oEAAoE;YACpE,MAAM,KAAK,CAAC;QAChB,CAAC;QAED,6DAA6D;QAC7D,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;QACnD,IAAI,SAAS,EAAE,CAAC;YACZ,YAAY,CAAC,UAAU,CAAC,GAAG,yBAAyB,IAAI,SAAS,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;QAChE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;YACxD,QAAQ,EAAE;gBACN,UAAU,EAAE,SAAS;gBACrB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,KAAK;aACf;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,gCAAgC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,SAAkB,EAAE,SAAkB,EAAE,GAAY;IAC5G,OAAO,oBAAoB,CAAC,oBAAoB,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;AACjF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,qCAAqC,CACvD,aAAqB,EACrB,SAAkB,EAClB,SAAkB,EAClB,GAAY;IAEZ,OAAO,oBAAoB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;AACjG,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,uBAAuB;IACnC,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,SAAkB,EAClB,SAAkB,EAClB,SAAkB,EAClB,YAAY,GAAG,KAAK,EACpB,eAAe,GAAG,KAAK;IAEvB,MAAM,eAAe,GAAG,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,SAAS,CAAC;IAClG,MAAM,eAAe,GACjB,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,yBAAyB,IAAI,eAAe,EAAE,CAAC,IAAI,SAAS,CAAC;IAEtG,8CAA8C;IAC9C,IAAI,CAAC,YAAY,IAAI,cAAc,IAAI,UAAU,IAAI,UAAU,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC;QAC5F,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACzE,CAAC;IAED,sCAAsC;IACtC,IAAI,CAAC,eAAe,IAAI,eAAe,EAAE,CAAC,WAAW,EAAE,CAAC;QACpD,mDAAmD;QACnD,cAAc,GAAG,MAAM,qCAAqC,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IACnG,CAAC;SAAM,IAAI,SAAS,IAAI,cAAc,EAAE,CAAC;QACrC,2DAA2D;QAC3D,cAAc,GAAG,MAAM,oBAAoB,CACvC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,cAAc,CAAC,EAClD,eAAe,EACf,eAAe,CAClB,CAAC;IACN,CAAC;IAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;YAClD,QAAQ,EAAE;gBACN,UAAU,EAAE,eAAe;gBAC3B,UAAU,EAAE,eAAe;aAC9B;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACzD,CAAC;IAED,UAAU,GAAG,SAAS,CAAC,cAAc,CAAqB,CAAC;IAE3D,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAC;QACtD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACzC,QAAQ,EAAE;gBACN,UAAU,EAAE,eAAe;gBAC3B,UAAU,EAAE,eAAe;aAC9B;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AACzE,CAAC;AAED,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IACxC,KAAK,CAAS;IACd,YAAY,OAAe,EAAE,KAAa;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;CACJ;AAED,MAAM,OAAO,QAAS,SAAQ,KAAK;IAC/B,MAAM,CAAS;IACf,YAAY,OAAe,EAAE,MAAc;QACvC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;CACJ;AAED;;;;;GAKG;AACH,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IACjD,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC7C,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"composable.js","sourceRoot":"","sources":["../../../src/session/auth/composable.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,4 +5,29 @@ declare global {
|
|
|
5
5
|
}
|
|
6
6
|
export declare function shouldUseFirebaseAuth(_hostname?: string): boolean;
|
|
7
7
|
export declare function shouldRedirectToCentralAuth(_hostname?: string): boolean;
|
|
8
|
+
/**
|
|
9
|
+
* The page URL to return to after a central-auth round-trip (`redirect_uri`).
|
|
10
|
+
*
|
|
11
|
+
* Apps served under a deep gateway mount carry a `<base href="/tenants/<t>/apps/<app>/.../app/">`
|
|
12
|
+
* that the app-gateway injects at serve time. The in-app router rewrites the address bar relative
|
|
13
|
+
* to the origin rather than that mount, so by the time the auth flow runs `window.location` can
|
|
14
|
+
* read as the bare origin `/`. Building `redirect_uri` from that drops the app path, and the
|
|
15
|
+
* post-login token bounces back to a URL that serves no app.
|
|
16
|
+
*
|
|
17
|
+
* Prefer the live location when it still sits under the mount (preserves the in-app deep route);
|
|
18
|
+
* otherwise fall back to `document.baseURI` — the mount, which the router cannot clobber. With no
|
|
19
|
+
* `<base>` element (the Studio UI), `document.baseURI` is the document URL and its `pathname` is a
|
|
20
|
+
* prefix of the live location, so the live URL is used unchanged — no behavior change there.
|
|
21
|
+
*/
|
|
22
|
+
export declare function authReturnUrl(): URL;
|
|
23
|
+
/**
|
|
24
|
+
* The app's mount root URL — the served `<base href>` (or the origin root for the Studio UI).
|
|
25
|
+
*
|
|
26
|
+
* Used for full-reload navigations that intentionally reset to the app root (logout, account /
|
|
27
|
+
* project switch). Building these from a bare `/` drops a gateway-mounted app off its mount and
|
|
28
|
+
* lands on a URL that serves no app; resolving against `document.baseURI` keeps the reload inside
|
|
29
|
+
* the mount. For the Studio UI (no `<base>` element) `document.baseURI` is the origin root, so the
|
|
30
|
+
* behavior is unchanged.
|
|
31
|
+
*/
|
|
32
|
+
export declare function mountRootUrl(): URL;
|
|
8
33
|
//# sourceMappingURL=domainRouting.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domainRouting.d.ts","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,SAAS,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KACtC;CACJ;AAED,wBAAgB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,WAEvD;AAED,wBAAgB,2BAA2B,CAAC,SAAS,CAAC,EAAE,MAAM,WAE7D"}
|
|
1
|
+
{"version":3,"file":"domainRouting.d.ts","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,SAAS,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KACtC;CACJ;AAED,wBAAgB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,WAEvD;AAED,wBAAgB,2BAA2B,CAAC,SAAS,CAAC,EAAE,MAAM,WAE7D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAMnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,IAAI,GAAG,CAKlC"}
|
|
@@ -4,4 +4,40 @@ export function shouldUseFirebaseAuth(_hostname) {
|
|
|
4
4
|
export function shouldRedirectToCentralAuth(_hostname) {
|
|
5
5
|
return !shouldUseFirebaseAuth();
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* The page URL to return to after a central-auth round-trip (`redirect_uri`).
|
|
9
|
+
*
|
|
10
|
+
* Apps served under a deep gateway mount carry a `<base href="/tenants/<t>/apps/<app>/.../app/">`
|
|
11
|
+
* that the app-gateway injects at serve time. The in-app router rewrites the address bar relative
|
|
12
|
+
* to the origin rather than that mount, so by the time the auth flow runs `window.location` can
|
|
13
|
+
* read as the bare origin `/`. Building `redirect_uri` from that drops the app path, and the
|
|
14
|
+
* post-login token bounces back to a URL that serves no app.
|
|
15
|
+
*
|
|
16
|
+
* Prefer the live location when it still sits under the mount (preserves the in-app deep route);
|
|
17
|
+
* otherwise fall back to `document.baseURI` — the mount, which the router cannot clobber. With no
|
|
18
|
+
* `<base>` element (the Studio UI), `document.baseURI` is the document URL and its `pathname` is a
|
|
19
|
+
* prefix of the live location, so the live URL is used unchanged — no behavior change there.
|
|
20
|
+
*/
|
|
21
|
+
export function authReturnUrl() {
|
|
22
|
+
const base = new URL(document.baseURI);
|
|
23
|
+
const current = new URL(window.location.href);
|
|
24
|
+
const target = current.pathname.startsWith(base.pathname) ? current : base;
|
|
25
|
+
target.hash = '';
|
|
26
|
+
return target;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* The app's mount root URL — the served `<base href>` (or the origin root for the Studio UI).
|
|
30
|
+
*
|
|
31
|
+
* Used for full-reload navigations that intentionally reset to the app root (logout, account /
|
|
32
|
+
* project switch). Building these from a bare `/` drops a gateway-mounted app off its mount and
|
|
33
|
+
* lands on a URL that serves no app; resolving against `document.baseURI` keeps the reload inside
|
|
34
|
+
* the mount. For the Studio UI (no `<base>` element) `document.baseURI` is the origin root, so the
|
|
35
|
+
* behavior is unchanged.
|
|
36
|
+
*/
|
|
37
|
+
export function mountRootUrl() {
|
|
38
|
+
const url = new URL(document.baseURI);
|
|
39
|
+
url.hash = '';
|
|
40
|
+
url.search = '';
|
|
41
|
+
return url;
|
|
42
|
+
}
|
|
7
43
|
//# sourceMappingURL=domainRouting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domainRouting.js","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,qBAAqB,CAAC,SAAkB;IACpD,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,SAAkB;IAC1D,OAAO,CAAC,qBAAqB,EAAE,CAAC;AACpC,CAAC"}
|
|
1
|
+
{"version":3,"file":"domainRouting.js","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,qBAAqB,CAAC,SAAkB;IACpD,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,SAAkB;IAC1D,OAAO,CAAC,qBAAqB,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;IACjB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY;IACxB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;IACd,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;IAChB,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -3,7 +3,7 @@ interface SignInRestrictedEnvStepProps {
|
|
|
3
3
|
onUseDifferentEmail: () => void;
|
|
4
4
|
}
|
|
5
5
|
/**
|
|
6
|
-
* Shown when the STS rejects sign-in because the current environment (
|
|
6
|
+
* Shown when the STS rejects sign-in because the current environment (any non-production tier) is
|
|
7
7
|
* restricted to early-access users. Offers a redirect to the production web application — in the
|
|
8
8
|
* user's own region — and a way to sign in with a different account. If the user takes no action, it
|
|
9
9
|
* redirects automatically after {@link AUTO_REDIRECT_SECONDS}. See
|
|
@@ -9,7 +9,7 @@ import { resetSignInState } from './signInUtils';
|
|
|
9
9
|
/** Seconds of inactivity on this screen before the user is redirected to production automatically. */
|
|
10
10
|
const AUTO_REDIRECT_SECONDS = 15;
|
|
11
11
|
/**
|
|
12
|
-
* Shown when the STS rejects sign-in because the current environment (
|
|
12
|
+
* Shown when the STS rejects sign-in because the current environment (any non-production tier) is
|
|
13
13
|
* restricted to early-access users. Offers a redirect to the production web application — in the
|
|
14
14
|
* user's own region — and a way to sign in with a different account. If the user takes no action, it
|
|
15
15
|
* redirects automatically after {@link AUTO_REDIRECT_SECONDS}. See
|
|
@@ -42,7 +42,15 @@ function SigninScreenImpl({ isNested = false, lightLogo, darkLogo, preservePath,
|
|
|
42
42
|
const [pendingProvider, setPendingProvider] = useState(null);
|
|
43
43
|
useEffect(() => {
|
|
44
44
|
if (!preservePath) {
|
|
45
|
-
|
|
45
|
+
// Reset to the app's mount root, not the bare origin. A gateway-mounted app carries a
|
|
46
|
+
// served `<base href>` deep mount; collapsing to '/' drops the app off that mount (the
|
|
47
|
+
// bare origin serves no app) and the address bar can no longer be reloaded. This effect
|
|
48
|
+
// also flashes briefly for already-authenticated users during the loading transition, so
|
|
49
|
+
// a bare '/' here loses the URL even on a normal login. Deriving the root from
|
|
50
|
+
// `document.baseURI` keeps it inside the mount; for the origin-served Studio UI the
|
|
51
|
+
// pathname is '/', so the behavior is unchanged.
|
|
52
|
+
const mountRoot = new URL(document.baseURI).pathname || '/';
|
|
53
|
+
history.replaceState({}, '', mountRoot);
|
|
46
54
|
}
|
|
47
55
|
}, [preservePath]);
|
|
48
56
|
// Route based on authError surfaced by the session.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SigninScreen.js","sourceRoot":"","sources":["../../../src/shell/login/SigninScreen.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SigninScreen.js","sourceRoot":"","sources":["../../../src/shell/login/SigninScreen.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,eAAoC,MAAM,mBAAmB,CAAC;AACrE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EACH,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EAGrB,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,GAC3B,MAAM,eAAe,CAAC;AAWvB,MAAM,UAAU,YAAY,CAAC,EACzB,aAAa,EACb,QAAQ,GAAG,KAAK,EAChB,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,uBAAuB,GACP;IAChB,MAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC/E,MAAM,KAAK,GAAG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC/E,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAClB,KAAC,gBAAgB,IACb,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,GACtC,CACL,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAgB,EAAE,MAA0B;IACnE,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC/B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;AACP,CAAC;AAID,SAAS,gBAAgB,CAAC,EACtB,QAAQ,GAAG,KAAK,EAChB,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,iBAAiB,GACiC;IAClD,MAAM,EAAE,CAAC,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,CAAC;IACjE,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;IAEvC,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAA6B,GAAG,EAAE,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAChH,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAO,GAAG,EAAE;QACxC,MAAM,CAAC,GAAG,uBAAuB,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAyB,SAAS,CAAC,CAAC;IACxE,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAoB,IAAI,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,sFAAsF;YACtF,uFAAuF;YACvF,wFAAwF;YACxF,yFAAyF;YACzF,+EAA+E;YAC/E,oFAAoF;YACpF,iDAAiD;YACjD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC;YAC5D,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,oDAAoD;IACpD,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;YACzC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;aAAM,IAAI,SAAS,YAAY,0BAA0B,EAAE,CAAC;YACzD,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;YACpC,IAAI,OAAO;gBAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;IACL,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,sFAAsF;IACtF,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QACpC,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,wBAAwB,CAAC;YACrB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,YAAY,EAAE,OAAO,CAAC,QAAQ;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,SAAS;SAC/B,CAAC,CAAC;QACH,kBAAkB,EAAE,CAAC;IACzB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,kBAAkB,GAAG,WAAW,CAAC,CAAC,CAAS,EAAE,CAAyB,EAAE,EAAE;QAC5E,QAAQ,CAAC,CAAC,CAAC,CAAC;QACZ,SAAS,CAAC,CAAC,CAAC,CAAC;QACb,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE;QAC5B,OAAO,CAAC,OAAO,CAAC,CAAC;QACjB,SAAS,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9B,wBAAwB,EAAE,CAAC;QAC3B,kBAAkB,EAAE,CAAC;QACrB,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,QAAQ,CAAC,EAAE,CAAC,CAAC;QACb,SAAS,CAAC,SAAS,CAAC,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,CAAC;QACjB,KAAK,OAAO,EAAE,CAAC;IACnB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,iBAAiB,GAAG,WAAW,CACjC,CAAC,QAAoB,EAAE,EAAE;QACrB,sFAAsF;QACtF,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,aAAa,EAAE,UAAU,CAAC;QAC1D,mFAAmF;QACnF,IAAI,SAAS;YAAE,UAAU,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7D,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,CAAC,SAAS,CAAC,CAAC;QACnB,uGAAuG;IAC3G,CAAC,EACD,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,CAAC,CAClD,CAAC;IAEF,gFAAgF;IAChF,8EAA8E;IAC9E,+EAA+E;IAC/E,2EAA2E;IAC3E,yCAAyC;IACzC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,uEAAuE;QAC/F,QAAQ,CAAC,EAAE,CAAC,CAAC;QACb,SAAS,CAAC,SAAS,CAAC,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,CAAC;QACjB,KAAK,gBAAgB,EAAE,CAAC;IAC5B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,wEAAwE;IACxE,MAAM,QAAQ,GAAG,CAAC,IAAgB,EAAE,OAAe,EAAE,EAAE;QACnD,MAAM,OAAO,GAAkB,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;QAC5E,KAAK,KAAK,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,cAAc,EAAE;YAC9C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAChC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACT,UAAU,CAAC,SAAS,CAAC,CAAC;YACtB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;QAC/B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,MAAM,4BAA4B,GAC9B,iBAAiB;QACjB,SAAS,KAAK,SAAS;QACvB,CAAC,CAAC,SAAS,YAAY,iBAAiB,CAAC;QACzC,CAAC,CAAC,SAAS,YAAY,0BAA0B,CAAC,CAAC;IAEvD,IAAI,SAAS,IAAI,IAAI,IAAI,4BAA4B;QAAE,OAAO,IAAI,CAAC;IAEnE,IAAI,OAAO,GAAoB,IAAI,CAAC;IACpC,IAAI,IAAI,KAAK,SAAS,IAAI,eAAe,EAAE,CAAC;QACxC,OAAO,GAAG,KAAC,iBAAiB,IAAC,QAAQ,EAAE,eAAe,GAAI,CAAC;IAC/D,CAAC;SAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,GAAG,CACN,KAAC,uBAAuB,IACpB,KAAK,EAAE,KAAK,IAAI,aAAa,EAAE,KAAK,IAAI,EAAE,EAC1C,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,MAAM,EAAE,IAAI,IAAI,aAAa,EAAE,UAAU,IAAI,SAAS,EACnF,MAAM,EAAE,SAAS,GACnB,CACL,CAAC;IACN,CAAC;SAAM,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,GAAG,KAAC,uBAAuB,IAAC,mBAAmB,EAAE,SAAS,GAAI,CAAC;IAC1E,CAAC;SAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAClE,OAAO,GAAG,KAAC,UAAU,IAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAI,CAAC;IACpE,CAAC;SAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,MAAM,EAAE,CAAC;QACrC,OAAO,GAAG,CACN,KAAC,gBAAgB,IACb,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAe,CAAC,GACvF,CACL,CAAC;IACN,CAAC;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,GAAG,KAAC,mBAAmB,IAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;IAC1G,CAAC;SAAM,IAAI,IAAI,KAAK,WAAW,IAAI,aAAa,EAAE,CAAC;QAC/C,OAAO,GAAG,CACN,KAAC,mBAAmB,IAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAC5G,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,OAAO,GAAG,KAAC,eAAe,IAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,GAAI,CAAC;IACtF,CAAC;IAED,OAAO,CACH,cACI,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EACzB,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,wCAAwC,YAErF,cAAK,SAAS,EAAC,iEAAiE,YAC5E,eAAK,SAAS,EAAC,mCAAmC,aAC7C,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CACxB,eAAK,SAAS,EAAC,MAAM,aAChB,SAAS,IAAI,cAAK,GAAG,EAAE,SAAS,EAAE,GAAG,EAAC,UAAU,EAAC,SAAS,EAAC,wBAAwB,GAAG,EACtF,QAAQ,IAAI,cAAK,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAC,UAAU,EAAC,SAAS,EAAC,wBAAwB,GAAG,IACnF,CACT,EAEA,OAAO,EAEP,SAAS;wBACN,CAAC,CAAC,SAAS,YAAY,iBAAiB,CAAC;wBACzC,CAAC,CAAC,SAAS,YAAY,0BAA0B,CAAC;wBAClD,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,CACjC,cAAK,SAAS,EAAC,mDAAmD,YAC9D,0BACK,CAAC,CAAC,kBAAkB,CAAC,EACtB,cAAM,EACL,CAAC,CAAC,yBAAyB,CAAC,EAC7B,YAAG,SAAS,EAAC,gBAAgB,EAAC,IAAI,EAAC,+BAA+B,uCAE9D,EACH,CAAC,CAAC,0BAA0B,CAAC,EAC9B,cAAK,SAAS,EAAC,cAAc,YACxB,CAAC,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,GAC9C,IACJ,GACJ,CACT,EAEL,eAAK,SAAS,EAAC,6DAA6D,aACxE,YAAG,IAAI,EAAC,gCAAgC,EAAC,SAAS,EAAC,kCAAkC,YAChF,CAAC,CAAC,oBAAoB,CAAC,GACxB,EACJ,eAAM,SAAS,EAAC,aAAa,uBAAS,EACtC,YAAG,IAAI,EAAC,8BAA8B,EAAC,SAAS,EAAC,kCAAkC,YAC9E,CAAC,CAAC,qBAAqB,CAAC,GACzB,EACJ,eAAM,SAAS,EAAC,aAAa,uBAAS,EACtC,KAAC,SAAS,IAAC,SAAS,EAAC,gBAAgB,GAAG,IACtC,IACJ,GACJ,GACJ,CACT,CAAC;AACN,CAAC"}
|
|
@@ -1,16 +1,2 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Resolve the URL of the production Vertesia web application for a given deployment region. Used by
|
|
3
|
-
* the "restricted environment" sign-in step to send a user without early access to production, where
|
|
4
|
-
* they do have access — in their own region, never another one (an EU user must not land on the US
|
|
5
|
-
* site, and vice versa).
|
|
6
|
-
*
|
|
7
|
-
* The mapping mirrors the server's `detectUiUrl` production branch (packages/server-common):
|
|
8
|
-
* - US (`us` / `us1`) or unknown region → `https://cloud.vertesia.io/` (canonical, non-regional)
|
|
9
|
-
* - any other region (e.g. `eu1`, `jp1`) → `https://cloud.{region}.vertesia.io/`
|
|
10
|
-
*
|
|
11
|
-
* Region is preferred over parsing the current hostname because it is well-defined for every serving
|
|
12
|
-
* pattern (including the direct-routing `*.ui.{region}.vertesia.io` hosts, which carry no
|
|
13
|
-
* `preview.`/`preprod.` prefix to strip). Callers pass `Env.region` from `@vertesia/ui/env`.
|
|
14
|
-
*/
|
|
15
1
|
export declare function getProductionAppUrl(region?: string): string;
|
|
16
2
|
//# sourceMappingURL=productionUrl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"productionUrl.d.ts","sourceRoot":"","sources":["../../../src/shell/login/productionUrl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"productionUrl.d.ts","sourceRoot":"","sources":["../../../src/shell/login/productionUrl.ts"],"names":[],"mappings":"AAwBA,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAG3D"}
|