@lightdash/common 0.1790.0 → 0.1791.0

package/dist/esm/types/auth.js

@@ -1,3 +1,4 @@
+import { ForbiddenError } from './errors';
 /**
  * Prefixes for the authorization tokens we store in the database
  */
@@ -7,10 +8,14 @@ export var AuthTokenPrefix;
     AuthTokenPrefix["SERVICE_ACCOUNT"] = "ldsvc_";
     AuthTokenPrefix["PERSONAL_ACCESS_TOKEN"] = "ldpat_";
 })(AuthTokenPrefix || (AuthTokenPrefix = {}));
-export function getEmbeddedAuth(account) {
-    if (account.authentication.type !== 'jwt') {
-        throw new Error('Account is not an embedded account');
+export function assertEmbeddedAuth(account) {
+    if (account?.authentication.type !== 'jwt') {
+        throw new ForbiddenError('Account is not an embedded account');
+    }
+}
+export function assertSessionAuth(account) {
+    if (account?.authentication.type !== 'session') {
+        throw new ForbiddenError('Account is not a session account');
     }
-    return account.authentication;
 }
 //# sourceMappingURL=auth.js.map

package/dist/esm/types/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/auth.ts"],"names":[],"mappings":"AAoBA;;GAEG;AACH,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,iCAAc,CAAA;IACd,6CAA0B,CAAA;IAC1B,mDAAgC,CAAA;AACpC,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAiCD,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC5C,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,OAAO,CAAC,cAAc,CAAC;AAClC,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAwB1C;;GAEG;AACH,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,iCAAc,CAAA;IACd,6CAA0B,CAAA;IAC1B,mDAAgC,CAAA;AACpC,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAsDD,MAAM,UAAU,kBAAkB,CAC9B,OAA4B;IAE5B,IAAI,OAAO,EAAE,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACzC,MAAM,IAAI,cAAc,CAAC,oCAAoC,CAAC,CAAC;IACnE,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,OAA4B;IAE5B,IAAI,OAAO,EAAE,cAAc,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,IAAI,cAAc,CAAC,kCAAkC,CAAC,CAAC;IACjE,CAAC;AACL,CAAC"}

package/dist/esm/types/user.d.ts

@@ -2,21 +2,42 @@ import { type AbilityBuilder } from '@casl/ability';
 import { type MemberAbility } from '../authorization/types';
 import { type AnyType } from './any';
 import { type OpenIdIdentityIssuerType } from './openIdIdentity';
+import { type Organization } from './organization';
 import { type OrganizationMemberRole } from './organizationMemberProfile';
-export type BaseUser = {
+export type AccountUser = {
+    id: string;
+    email: string | undefined;
+    isActive: boolean;
+    abilityRules: AbilityBuilder<MemberAbility>['rules'];
+    ability: MemberAbility;
+    type: 'lightdash' | 'external';
+};
+export interface LightdashUser {
+    userUuid: string;
+    firstName: string;
+    lastName: string;
     organizationUuid?: string;
     organizationName?: string;
     organizationCreatedAt?: Date;
+    userId: number;
     role?: OrganizationMemberRole;
+    isTrackingAnonymized: boolean;
+    isMarketingOptedIn: boolean;
+    isSetupComplete: boolean;
+    email: string | undefined;
     isActive: boolean;
-};
-export interface LightdashUser extends BaseUser {
+    createdAt: Date;
+    updatedAt: Date;
+    isPending?: boolean;
+}
+export interface LightdashSessionUser extends AccountUser {
+    type: 'lightdash';
     userUuid: string;
     userId: number;
-    type?: 'lightdash';
-    email: string | undefined;
     firstName: string;
     lastName: string;
+    organization: Pick<Organization, 'organizationUuid' | 'name'>;
+    role?: OrganizationMemberRole;
     isTrackingAnonymized: boolean;
     isMarketingOptedIn: boolean;
     isSetupComplete: boolean;
@@ -24,11 +45,10 @@ export interface LightdashUser extends BaseUser {
     updatedAt: Date;
     isPending?: boolean;
 }
-export type ExternalUser = BaseUser & Partial<LightdashUser> & {
-    externalId: string;
+export interface ExternalUser extends AccountUser {
     type: 'external';
-};
-export type LightdashUserWithOrg = Required<LightdashUser | ExternalUser>;
+}
+export type LightdashUserWithOrg = Required<LightdashUser>;
 export declare const isUserWithOrg: (user: LightdashUser) => user is LightdashUserWithOrg;
 export interface LightdashUserWithAbilityRules extends LightdashUser {
     abilityRules: AbilityBuilder<MemberAbility>['rules'];

package/dist/esm/types/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/types/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAE1E,MAAM,MAAM,QAAQ,GAAG;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,IAAI,CAAC;IAC7B,IAAI,CAAC,EAAE,sBAAsB,CAAC;IAE9B,QAAQ,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,QAAQ;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAEhB,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,YAAY,GAAG,QAAQ,GAC/B,OAAO,CAAC,aAAa,CAAC,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC,aAAa,GAAG,YAAY,CAAC,CAAC;AAE1E,eAAO,MAAM,aAAa,SAChB,aAAa,KACpB,IAAI,IAAI,oBAIsB,CAAC;AAElC,MAAM,WAAW,6BAA8B,SAAQ,aAAa;IAChE,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC;CACxD;AAED,MAAM,WAAW,WAAY,SAAQ,6BAA6B;IAC9D,OAAO,EAAE,aAAa,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACvB,MAAM,EAAE;QACJ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,wBAAwB,CAAC;QACrC,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAC/B,CAAC;CACL;AAED,eAAO,MAAM,YAAY,SAAU,OAAO,KAAG,IAAI,IAAI,UAUP,CAAC;AAE/C,MAAM,MAAM,uBAAuB,GAAG;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAC9C,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,uBAAuB,EAAE,CAAC;CACtC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC1C,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IAClC,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF,oBAAY,gBAAgB;IACxB,KAAK,UAAU;IACf,SAAS,aAAa;CACzB;AAED,MAAM,MAAM,gBAAgB,GAAG,wBAAwB,GAAG,gBAAgB,CAAC;AAE3E,MAAM,MAAM,YAAY,GAAG;IACvB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACrC,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,0BAA0B,SAC7B,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,KACnC,uBAED,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/types/user.ts"],"names":[],"mappings":"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"}

package/dist/esm/types/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/types/user.ts"],"names":[],"mappings":"AAuCA,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,IAAmB,EACS,EAAE,CAC9B,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ;IACzC,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ;IACzC,IAAI,CAAC,qBAAqB,YAAY,IAAI;IAC1C,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;AA6BlC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAsB,EAAE,CAC9D,OAAO,IAAI,KAAK,QAAQ;IACxB,IAAI,KAAK,IAAI;IACb,IAAI,CAAC,QAAQ,KAAK,SAAS;IAC3B,IAAI,CAAC,MAAM,KAAK,SAAS;IACzB,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;IAC/B,IAAI,CAAC,MAAM,KAAK,IAAI;IACpB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ;IACvC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ;IACtC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,QAAQ;IACrC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,CAAC;AA0B/C,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,mCAAe,CAAA;IACf,0CAAsB,CAAA;AAC1B,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAmBD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACtC,IAAkC,EACX,EAAE,CAAC,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;CACpB,CAAC,CAAC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/types/user.ts"],"names":[],"mappings":"AA+DA,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,IAAmB,EACS,EAAE,CAC9B,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ;IACzC,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ;IACzC,IAAI,CAAC,qBAAqB,YAAY,IAAI;IAC1C,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;AA6BlC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAsB,EAAE,CAC9D,OAAO,IAAI,KAAK,QAAQ;IACxB,IAAI,KAAK,IAAI;IACb,IAAI,CAAC,QAAQ,KAAK,SAAS;IAC3B,IAAI,CAAC,MAAM,KAAK,SAAS;IACzB,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;IAC/B,IAAI,CAAC,MAAM,KAAK,IAAI;IACpB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ;IACvC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ;IACtC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,QAAQ;IACrC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,CAAC;AA0B/C,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,mCAAe,CAAA;IACf,0CAAsB,CAAA;AAC1B,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAmBD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACtC,IAAkC,EACX,EAAE,CAAC,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;CACpB,CAAC,CAAC"}