@lightdash/common 1.202.11 → 1.203.1

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.
@@ -13,6 +13,7 @@ export interface OAuthHiddenInput {
13
13
  export interface OAuthUser {
14
14
  firstName: string;
15
15
  lastName: string;
16
+ email: string | null;
16
17
  organizationName: string;
17
18
  }
18
19
  export interface OAuthScopeDescription {
@@ -26,6 +27,8 @@ export interface OAuthAuthorizeParams {
26
27
  scope: string;
27
28
  scopes: OAuthScopeDescription[];
28
29
  user: OAuthUser;
30
+ /** Where "Switch account" sends the user after logging out */
31
+ loginUrl: string;
29
32
  hiddenInputs: OAuthHiddenInput[];
30
33
  }
31
34
  export interface OAuthRedirectParams {
@@ -1 +1 @@
1
- {"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,i7CA2D3B,CAAC;AA4KF,QAAA,MAAM,WAAW;aACb,OAAO,EACH,wLAAwL;aAC5L,KAAK,EAAE,6LAA6L;aACpM,cAAc,EACV,sLAAsL;CACpL,CAAC;AAwDX,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC;AACtD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,WAAW,CAAC;AAGrD,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAChC,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,gBAAgB,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB;AAwBD;;GAEG;AACH,eAAO,MAAM,gBAAgB,gBACZ,MAAM,KACpB,qBAAqB,EASvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,MAKhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,WAC1B,mBAAmB,SACpB,MAAM,YACH,MAAM,EAAE,aACR,aAAa,KACxB,MAQG,CAAC;AAEP;;GAEG;AACH,eAAO,MAAM,4BAA4B,WAC9B,MAAM,aACH,MAAM,EAAE,KAInB,MAA0E,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,0BAA0B,UAC5B,MAAM,YACH,MAAM,EAAE,aACR,aAAa,KACxB,MAME,CAAC;AAEN;;;GAGG;AACH,eAAO,MAAM,0BAA0B,WAC3B,oBAAoB,KAC7B,MAKG,CAAC;AAEP;;;GAGG;AACH,eAAO,MAAM,yBAAyB,WAC1B,mBAAmB,KAC5B,MAKG,CAAC"}
1
+ {"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,i7CA2D3B,CAAC;AAoTF,QAAA,MAAM,WAAW;aACb,OAAO,EACH,wLAAwL;aAC5L,KAAK,EAAE,6LAA6L;aACpM,cAAc,EACV,sLAAsL;CACpL,CAAC;AAwDX,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC;AACtD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,WAAW,CAAC;AAGrD,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAChC,IAAI,EAAE,SAAS,CAAC;IAChB,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,gBAAgB,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB;AAwBD;;GAEG;AACH,eAAO,MAAM,gBAAgB,gBACZ,MAAM,KACpB,qBAAqB,EASvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,MAKhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,WAC1B,mBAAmB,SACpB,MAAM,YACH,MAAM,EAAE,aACR,aAAa,KACxB,MAQG,CAAC;AAEP;;GAEG;AACH,eAAO,MAAM,4BAA4B,WAC9B,MAAM,aACH,MAAM,EAAE,KAInB,MAA0E,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,0BAA0B,UAC5B,MAAM,YACH,MAAM,EAAE,aACR,aAAa,KACxB,MAME,CAAC;AAQN;;;GAGG;AACH,eAAO,MAAM,0BAA0B,WAC3B,oBAAoB,KAC7B,MASG,CAAC;AAEP;;;GAGG;AACH,eAAO,MAAM,yBAAyB,WAC1B,mBAAmB,KAC5B,MAKG,CAAC"}
@@ -111,24 +111,116 @@ const OAUTH_AUTHORIZE_TEMPLATE = `
111
111
  }
112
112
  .oauth-message {
113
113
  text-align: center;
114
- margin-bottom: 24px;
114
+ margin-bottom: 16px;
115
115
  font-size: 14px;
116
116
  color: #111418;
117
117
  }
118
118
  .oauth-message strong {
119
119
  font-weight: 600;
120
120
  }
121
- .oauth-scopes {
121
+ .oauth-account {
122
+ border: 1px solid #e9ecef;
123
+ border-radius: 8px;
124
+ overflow: hidden;
125
+ margin-bottom: 20px;
126
+ }
127
+ .oauth-account-user {
128
+ display: flex;
129
+ align-items: center;
130
+ gap: 12px;
131
+ padding: 12px 14px;
132
+ }
133
+ .oauth-avatar {
134
+ flex-shrink: 0;
135
+ width: 36px;
136
+ height: 36px;
137
+ border-radius: 50%;
138
+ background: #111418;
139
+ color: #f8fafc;
140
+ font-size: 13px;
141
+ font-weight: 600;
142
+ letter-spacing: 0.02em;
143
+ display: flex;
144
+ align-items: center;
145
+ justify-content: center;
146
+ text-transform: uppercase;
147
+ }
148
+ .oauth-account-id {
149
+ flex: 1;
150
+ min-width: 0;
151
+ }
152
+ .oauth-account-name {
153
+ font-weight: 600;
154
+ color: #111418;
155
+ overflow: hidden;
156
+ text-overflow: ellipsis;
157
+ white-space: nowrap;
158
+ }
159
+ .oauth-account-email {
160
+ font-size: 12px;
161
+ color: #6c757d;
162
+ overflow: hidden;
163
+ text-overflow: ellipsis;
164
+ white-space: nowrap;
165
+ }
166
+ .oauth-switch-link {
167
+ flex-shrink: 0;
168
+ font-size: 12px;
169
+ font-weight: 500;
170
+ color: #6c757d;
171
+ text-decoration: none;
172
+ }
173
+ .oauth-switch-link:hover {
174
+ color: #111418;
175
+ text-decoration: underline;
176
+ }
177
+ .oauth-account-org {
178
+ display: flex;
179
+ align-items: center;
180
+ gap: 8px;
181
+ padding: 8px 14px;
122
182
  border-top: 1px solid #e9ecef;
123
- padding-top: 16px;
183
+ background: #f8fafc;
184
+ }
185
+ .oauth-org-icon {
186
+ flex-shrink: 0;
187
+ width: 15px;
188
+ height: 15px;
189
+ color: #6c757d;
190
+ }
191
+ .oauth-account-org-name {
192
+ flex: 1;
193
+ min-width: 0;
194
+ font-size: 13px;
195
+ font-weight: 500;
196
+ color: #111418;
197
+ overflow: hidden;
198
+ text-overflow: ellipsis;
199
+ white-space: nowrap;
200
+ }
201
+ .oauth-account-org-label {
202
+ flex-shrink: 0;
203
+ font-size: 11px;
204
+ color: #6c757d;
205
+ }
206
+ .oauth-scopes {
124
207
  margin-bottom: 16px;
125
208
  }
209
+ .oauth-scopes-title {
210
+ font-size: 13px;
211
+ font-weight: 600;
212
+ color: #111418;
213
+ margin: 0 0 4px 0;
214
+ }
126
215
  .oauth-scope-item {
127
216
  display: flex;
128
217
  gap: 12px;
129
218
  padding: 12px 0;
130
219
  border-bottom: 1px solid #f8fafc;
131
220
  }
221
+ .oauth-scope-item:last-child {
222
+ border-bottom: none;
223
+ }
132
224
  .oauth-scope-icon {
133
225
  flex-shrink: 0;
134
226
  width: 16px;
@@ -149,7 +241,9 @@ const OAUTH_AUTHORIZE_TEMPLATE = `
149
241
  line-height: 1.4;
150
242
  }
151
243
  .oauth-btn-row {
244
+ /* row-reverse keeps Authorize as the first submit button (Enter approves) while showing Cancel on the left */
152
245
  display: flex;
246
+ flex-direction: row-reverse;
153
247
  justify-content: center;
154
248
  gap: 12px;
155
249
  margin-top: 24px;
@@ -194,10 +288,35 @@ const OAUTH_AUTHORIZE_TEMPLATE = `
194
288
  </div>
195
289
 
196
290
  <p class="oauth-message">
197
- <strong>{{client_name}}</strong> wants to access your Lightdash account <strong>{{user.firstName}} {{user.lastName}}</strong>
291
+ <strong>{{client_name}}</strong> wants to access your Lightdash account
198
292
  </p>
199
293
 
294
+ <div class="oauth-account">
295
+ <div class="oauth-account-user">
296
+ <div class="oauth-avatar" aria-hidden="true">{{user.initials}}</div>
297
+ <div class="oauth-account-id">
298
+ <div class="oauth-account-name">{{user.firstName}} {{user.lastName}}</div>
299
+ {{#if user.email}}
300
+ <div class="oauth-account-email">{{user.email}}</div>
301
+ {{/if}}
302
+ </div>
303
+ <a class="oauth-switch-link" id="oauth-switch-account" href="{{loginUrl}}">Switch account</a>
304
+ </div>
305
+ {{#if user.organizationName}}
306
+ <div class="oauth-account-org">
307
+ <svg class="oauth-org-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
308
+ <path d="M3 21h18" />
309
+ <path d="M9 8h1M9 12h1M9 16h1M14 8h1M14 12h1M14 16h1" />
310
+ <path d="M5 21V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v16" />
311
+ </svg>
312
+ <span class="oauth-account-org-name">{{user.organizationName}}</span>
313
+ <span class="oauth-account-org-label">Organization</span>
314
+ </div>
315
+ {{/if}}
316
+ </div>
317
+
200
318
  <div class="oauth-scopes">
319
+ <p class="oauth-scopes-title">{{client_name}} will be able to:</p>
201
320
  {{#each scopes}}
202
321
  <div class="oauth-scope-item">
203
322
  <svg class="oauth-scope-icon" viewBox="0 0 16 16" fill="currentColor">
@@ -222,6 +341,23 @@ const OAUTH_AUTHORIZE_TEMPLATE = `
222
341
  </div>
223
342
  </form>
224
343
  </div>
344
+ <script>
345
+ (function () {
346
+ var switchLink = document.getElementById('oauth-switch-account');
347
+ switchLink.addEventListener('click', function (event) {
348
+ event.preventDefault();
349
+ var loginUrl = switchLink.href;
350
+ // Log out first so the login page doesn't bounce straight back with the same session
351
+ fetch('/api/v1/logout', { credentials: 'same-origin' })
352
+ .catch(function () {
353
+ // Navigate anyway; the login page still lets the user switch accounts
354
+ })
355
+ .then(function () {
356
+ window.location.href = loginUrl;
357
+ });
358
+ });
359
+ })();
360
+ </script>
225
361
  </body>
226
362
  </html>
227
363
  `;
@@ -346,6 +482,10 @@ export const generateOAuthSuccessResponse = (title = 'Authentication Successful!
346
482
  * Generates an error OAuth response
347
483
  */
348
484
  export const generateOAuthErrorResponse = (title, messages, iconType = 'error') => generateOAuthResponseHtml('error', title, [...messages, 'You can close this window and try again.'], iconType);
485
+ const getUserInitials = (user) => {
486
+ const initials = `${user.firstName.charAt(0)}${user.lastName.charAt(0)}`.trim();
487
+ return initials || user.email?.charAt(0) || '?';
488
+ };
349
489
  /**
350
490
  * Generates an OAuth authorization page HTML using Handlebars templating
351
491
  * This prevents XSS issues by auto-escaping all user content
@@ -354,6 +494,10 @@ export const generateOAuthAuthorizePage = (params) => compiledAuthorizeTemplate(
354
494
  styles: oauthPageStyles,
355
495
  logo: LIGHTDASH_LOGO_SVG,
356
496
  ...params,
497
+ user: {
498
+ ...params.user,
499
+ initials: getUserInitials(params.user),
500
+ },
357
501
  });
358
502
  /**
359
503
  * Generates an OAuth redirect page HTML using JavaScript redirect
@@ -1 +1 @@
1
- {"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"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"}