@ironcode/vas-lib 0.0.29 → 0.0.30
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/cjs/lib/entity/vas-fire-user.dto.d.ts +2 -0
- package/cjs/lib/entity/vas-fire-user.dto.d.ts.map +1 -1
- package/cjs/lib/entity/vas-fire-user.dto.js.map +1 -1
- package/cjs/lib/entity/vas-fire-user.model.d.ts +3 -1
- package/cjs/lib/entity/vas-fire-user.model.d.ts.map +1 -1
- package/cjs/lib/entity/vas-fire-user.model.js +8 -4
- package/cjs/lib/entity/vas-fire-user.model.js.map +1 -1
- package/esm2020/lib/entity/vas-fire-user.dto.mjs +1 -1
- package/esm2020/lib/entity/vas-fire-user.model.mjs +9 -5
- package/fesm2015/ironcode-vas-lib.mjs +8 -4
- package/fesm2015/ironcode-vas-lib.mjs.map +1 -1
- package/fesm2020/ironcode-vas-lib.mjs +8 -4
- package/fesm2020/ironcode-vas-lib.mjs.map +1 -1
- package/lib/entity/vas-fire-user.dto.d.ts +2 -0
- package/lib/entity/vas-fire-user.model.d.ts +3 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vas-fire-user.dto.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,CAAC,OAAO,MAAM,yBAAyB,GAAG,MAAM,CACpD,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAC9E,CAAC;AAEF,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,QAAQ,EAAE,yBAAyB,CAAC;IACpC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"vas-fire-user.dto.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,CAAC,OAAO,MAAM,yBAAyB,GAAG,MAAM,CACpD,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAC9E,CAAC;AAEF,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,QAAQ,EAAE,yBAAyB,CAAC;IACpC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vas-fire-user.dto.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.dto.ts"],"names":[],"mappings":"","sourcesContent":["import { VasUserDto } from './vas-user.dto';\nimport { VasAccountDto } from './vas-account.dto';\nimport { VasMembershipDto } from './vas-membership.dto';\n\nexport declare type VasFireUserDtoAccountType = Record<\n string, Omit<VasAccountDto, 'memberships'> & { membership: VasMembershipDto }\n>;\n\nexport interface VasFireUserDto extends VasUserDto {\n accounts: VasFireUserDtoAccountType;\n tokens: Array<string>;\n created: string;\n modified: string;\n topics: Array<string>;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"vas-fire-user.dto.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.dto.ts"],"names":[],"mappings":"","sourcesContent":["import { VasUserDto } from './vas-user.dto';\nimport { VasAccountDto } from './vas-account.dto';\nimport { VasMembershipDto } from './vas-membership.dto';\n\nexport declare type VasFireUserDtoAccountType = Record<\n string, Omit<VasAccountDto, 'memberships'> & { membership: VasMembershipDto }\n>;\n\nexport interface VasFireUserDto extends VasUserDto {\n accounts: VasFireUserDtoAccountType;\n tokens: Array<string>;\n created: string;\n modified: string;\n topics: Array<string>;\n language: string;\n fullName: string;\n}\n"]}
|
|
@@ -13,7 +13,9 @@ export declare class VasFireUserModel extends VasUserModel implements VasFireUse
|
|
|
13
13
|
accounts: VasFireUserDtoAccountType;
|
|
14
14
|
tokens: Array<string>;
|
|
15
15
|
topics: Array<string>;
|
|
16
|
-
|
|
16
|
+
language: string;
|
|
17
|
+
fullName: string;
|
|
18
|
+
constructor(id: string, created: string, serverCreated: string, createdBy: string, modified: string, serverModified: string, modifiedBy: string, email: string, username: string, accounts: VasFireUserDtoAccountType, tokens: Array<string>, topics: Array<string>, language: string, fullName: string);
|
|
17
19
|
static fromDto(dto: VasFireUserDto): VasFireUserModel;
|
|
18
20
|
static newUser(uid: string, displayName: string, email: string): VasFireUserModel;
|
|
19
21
|
toDto(): VasFireUserDto;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vas-fire-user.model.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,cAAc;IAGxD,EAAE,EAAE,MAAM;IACV,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,MAAM;IACrB,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,MAAM;IAChB,cAAc,EAAE,MAAM;IACtB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,MAAM;IACzB,QAAQ,EAAE,yBAAyB;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"vas-fire-user.model.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,cAAc;IAGxD,EAAE,EAAE,MAAM;IACV,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,MAAM;IACrB,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,MAAM;IAChB,cAAc,EAAE,MAAM;IACtB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,MAAM;IACzB,QAAQ,EAAE,yBAAyB;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;gBAbP,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAW,EACpB,aAAa,EAAE,MAAW,EAC1B,SAAS,EAAE,MAAW,EACtB,QAAQ,EAAE,MAAW,EACrB,cAAc,EAAE,MAAW,EAC3B,UAAU,EAAE,MAAW,EACvB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EACzB,QAAQ,EAAE,yBAAyB,EACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM;WAeF,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,gBAAgB;WAmBvD,OAAO,CACnB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GACZ,gBAAgB;IAmBH,KAAK,IAAI,cAAc;IAmBvC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAO7B;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAO7B;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,WAAW,IAAI,IAAI;CAGpB"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const moment_1 = tslib_1.__importDefault(require("moment/moment"));
|
|
6
6
|
const vas_user_model_1 = require("./vas-user.model");
|
|
7
7
|
class VasFireUserModel extends vas_user_model_1.VasUserModel {
|
|
8
|
-
constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', email, username, accounts, tokens, topics) {
|
|
8
|
+
constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', email, username, accounts, tokens, topics, language, fullName) {
|
|
9
9
|
super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, email, username);
|
|
10
10
|
this.id = id;
|
|
11
11
|
this.created = created;
|
|
@@ -19,12 +19,14 @@ class VasFireUserModel extends vas_user_model_1.VasUserModel {
|
|
|
19
19
|
this.accounts = accounts;
|
|
20
20
|
this.tokens = tokens;
|
|
21
21
|
this.topics = topics;
|
|
22
|
+
this.language = language;
|
|
23
|
+
this.fullName = fullName;
|
|
22
24
|
}
|
|
23
25
|
static fromDto(dto) {
|
|
24
|
-
return new VasFireUserModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.email || '', dto.username || '', dto.accounts || {}, dto.tokens || [], dto.topics || []);
|
|
26
|
+
return new VasFireUserModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.email || '', dto.username || '', dto.accounts || {}, dto.tokens || [], dto.topics || [], dto.language || '', dto.fullName || '');
|
|
25
27
|
}
|
|
26
28
|
static newUser(uid, displayName, email) {
|
|
27
|
-
return new VasFireUserModel(uid, (0, moment_1.default)().toISOString(),
|
|
29
|
+
return new VasFireUserModel(uid, (0, moment_1.default)().toISOString(), (0, moment_1.default)().toISOString(), uid, (0, moment_1.default)().toISOString(), (0, moment_1.default)().toISOString(), uid, email, displayName, {}, [], [], '', '');
|
|
28
30
|
}
|
|
29
31
|
toDto() {
|
|
30
32
|
return {
|
|
@@ -39,7 +41,9 @@ class VasFireUserModel extends vas_user_model_1.VasUserModel {
|
|
|
39
41
|
username: this.username,
|
|
40
42
|
accounts: this.accounts,
|
|
41
43
|
tokens: this.tokens,
|
|
42
|
-
topics: this.topics
|
|
44
|
+
topics: this.topics,
|
|
45
|
+
language: this.language,
|
|
46
|
+
fullName: this.fullName
|
|
43
47
|
};
|
|
44
48
|
}
|
|
45
49
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vas-fire-user.model.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.model.ts"],"names":[],"mappings":";;;;AACA,mEAAmC;AACnC,qDAAgD;AAEhD,MAAa,gBAAiB,SAAQ,6BAAY;IAEhD,YACkB,EAAU,EACV,UAAkB,EAAE,EACpB,gBAAwB,EAAE,EAC1B,YAAoB,EAAE,EACtB,WAAmB,EAAE,EACrB,iBAAyB,EAAE,EAC3B,aAAqB,EAAE,EACvB,KAAa,EACb,QAAgB,EACzB,QAAmC,EACnC,MAAqB,EACrB,MAAqB;
|
|
1
|
+
{"version":3,"file":"vas-fire-user.model.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { VasFireUserDto, VasFireUserDtoAccountType } from './vas-fire-user.dto';\nimport moment from 'moment/moment';\nimport { VasUserModel } from './vas-user.model';\n\nexport class VasFireUserModel extends VasUserModel implements VasFireUserDto {\n\n constructor(\n public override id: string,\n public override created: string = '',\n public override serverCreated: string = '',\n public override createdBy: string = '',\n public override modified: string = '',\n public override serverModified: string = '',\n public override modifiedBy: string = '',\n public override email: string,\n public override username: string,\n public accounts: VasFireUserDtoAccountType,\n public tokens: Array<string>,\n public topics: Array<string>,\n public language: string,\n public fullName: string,\n ) {\n super(\n id,\n created,\n serverCreated,\n createdBy,\n modified,\n serverModified,\n modifiedBy,\n email,\n username\n );\n }\n\n public static override fromDto(dto: VasFireUserDto): VasFireUserModel {\n return new VasFireUserModel(\n dto.id || '',\n dto.created || '',\n dto.serverCreated || '',\n dto.createdBy || '',\n dto.modified || '',\n dto.serverModified || '',\n dto.modifiedBy || '',\n dto.email || '',\n dto.username || '',\n dto.accounts || {},\n dto.tokens || [],\n dto.topics || [],\n dto.language || '',\n dto.fullName || ''\n );\n }\n\n public static newUser(\n uid: string,\n displayName: string,\n email: string\n ): VasFireUserModel {\n return new VasFireUserModel(\n uid,\n moment().toISOString(),\n moment().toISOString(),\n uid,\n moment().toISOString(),\n moment().toISOString(),\n uid,\n email,\n displayName,\n {},\n [],\n [],\n '',\n ''\n )\n }\n\n public override toDto(): VasFireUserDto {\n return {\n id: this.id,\n created: this.created,\n serverCreated: this.serverCreated,\n createdBy: this.createdBy,\n modified: this.modified,\n serverModified: this.serverModified,\n modifiedBy: this.modifiedBy,\n email: this.email,\n username: this.username,\n accounts: this.accounts,\n tokens: this.tokens,\n topics: this.topics,\n language: this.language,\n fullName: this.fullName\n };\n }\n\n /**\n * Adds token to tokens list if it is not already present\n * @param token the new token\n */\n addToken(token: string): void {\n if (this.tokens.includes(token)) {\n return;\n }\n this.tokens.push(token);\n }\n\n /**\n * Remove token from tokens list\n * @param token the token to remove\n */\n removeToken(token: string): void {\n this.tokens = this.tokens.filter(t => t !== token);\n }\n\n /**\n * Resets the tokens list\n */\n resetTokens(): void {\n this.tokens = [];\n }\n\n /**\n * Adds topic to topics list if it is not already present\n * @param topic the new token\n */\n addTopic(topic: string): void {\n if (this.topics.includes(topic)) {\n return;\n }\n this.topics.push(topic);\n }\n\n /**\n * Remove topic from topic list\n * @param topic the topic to remove\n */\n removeTopic(topic: string): void {\n this.topics = this.topics.filter(t => t !== topic);\n }\n\n /**\n * Resets the topic list\n */\n resetTopics(): void {\n this.topics = [];\n }\n}\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFzLWZpcmUtdXNlci5kdG8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy92YXMtbGliL3NyYy9saWIvZW50aXR5L3Zhcy1maXJlLXVzZXIuZHRvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBWYXNVc2VyRHRvIH0gZnJvbSAnLi92YXMtdXNlci5kdG8nO1xuaW1wb3J0IHsgVmFzQWNjb3VudER0byB9IGZyb20gJy4vdmFzLWFjY291bnQuZHRvJztcbmltcG9ydCB7IFZhc01lbWJlcnNoaXBEdG8gfSBmcm9tICcuL3Zhcy1tZW1iZXJzaGlwLmR0byc7XG5cbmV4cG9ydCBkZWNsYXJlIHR5cGUgVmFzRmlyZVVzZXJEdG9BY2NvdW50VHlwZSA9IFJlY29yZDxcbiAgc3RyaW5nLCBPbWl0PFZhc0FjY291bnREdG8sICdtZW1iZXJzaGlwcyc+
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFzLWZpcmUtdXNlci5kdG8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy92YXMtbGliL3NyYy9saWIvZW50aXR5L3Zhcy1maXJlLXVzZXIuZHRvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBWYXNVc2VyRHRvIH0gZnJvbSAnLi92YXMtdXNlci5kdG8nO1xuaW1wb3J0IHsgVmFzQWNjb3VudER0byB9IGZyb20gJy4vdmFzLWFjY291bnQuZHRvJztcbmltcG9ydCB7IFZhc01lbWJlcnNoaXBEdG8gfSBmcm9tICcuL3Zhcy1tZW1iZXJzaGlwLmR0byc7XG5cbmV4cG9ydCBkZWNsYXJlIHR5cGUgVmFzRmlyZVVzZXJEdG9BY2NvdW50VHlwZSA9IFJlY29yZDxcbiAgc3RyaW5nLCBPbWl0PFZhc0FjY291bnREdG8sICdtZW1iZXJzaGlwcyc+ICYgeyBtZW1iZXJzaGlwOiBWYXNNZW1iZXJzaGlwRHRvIH1cbj47XG5cbmV4cG9ydCBpbnRlcmZhY2UgVmFzRmlyZVVzZXJEdG8gZXh0ZW5kcyBWYXNVc2VyRHRvIHtcbiAgYWNjb3VudHM6IFZhc0ZpcmVVc2VyRHRvQWNjb3VudFR5cGU7XG4gIHRva2VuczogQXJyYXk8c3RyaW5nPjtcbiAgY3JlYXRlZDogc3RyaW5nO1xuICBtb2RpZmllZDogc3RyaW5nO1xuICB0b3BpY3M6IEFycmF5PHN0cmluZz47XG4gIGxhbmd1YWdlOiBzdHJpbmc7XG4gIGZ1bGxOYW1lOiBzdHJpbmc7XG59XG4iXX0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import moment from 'moment/moment';
|
|
2
2
|
import { VasUserModel } from './vas-user.model';
|
|
3
3
|
export class VasFireUserModel extends VasUserModel {
|
|
4
|
-
constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', email, username, accounts, tokens, topics) {
|
|
4
|
+
constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', email, username, accounts, tokens, topics, language, fullName) {
|
|
5
5
|
super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, email, username);
|
|
6
6
|
this.id = id;
|
|
7
7
|
this.created = created;
|
|
@@ -15,12 +15,14 @@ export class VasFireUserModel extends VasUserModel {
|
|
|
15
15
|
this.accounts = accounts;
|
|
16
16
|
this.tokens = tokens;
|
|
17
17
|
this.topics = topics;
|
|
18
|
+
this.language = language;
|
|
19
|
+
this.fullName = fullName;
|
|
18
20
|
}
|
|
19
21
|
static fromDto(dto) {
|
|
20
|
-
return new VasFireUserModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.email || '', dto.username || '', dto.accounts || {}, dto.tokens || [], dto.topics || []);
|
|
22
|
+
return new VasFireUserModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.email || '', dto.username || '', dto.accounts || {}, dto.tokens || [], dto.topics || [], dto.language || '', dto.fullName || '');
|
|
21
23
|
}
|
|
22
24
|
static newUser(uid, displayName, email) {
|
|
23
|
-
return new VasFireUserModel(uid, moment().toISOString(),
|
|
25
|
+
return new VasFireUserModel(uid, moment().toISOString(), moment().toISOString(), uid, moment().toISOString(), moment().toISOString(), uid, email, displayName, {}, [], [], '', '');
|
|
24
26
|
}
|
|
25
27
|
toDto() {
|
|
26
28
|
return {
|
|
@@ -35,7 +37,9 @@ export class VasFireUserModel extends VasUserModel {
|
|
|
35
37
|
username: this.username,
|
|
36
38
|
accounts: this.accounts,
|
|
37
39
|
tokens: this.tokens,
|
|
38
|
-
topics: this.topics
|
|
40
|
+
topics: this.topics,
|
|
41
|
+
language: this.language,
|
|
42
|
+
fullName: this.fullName
|
|
39
43
|
};
|
|
40
44
|
}
|
|
41
45
|
/**
|
|
@@ -85,4 +89,4 @@ export class VasFireUserModel extends VasUserModel {
|
|
|
85
89
|
this.topics = [];
|
|
86
90
|
}
|
|
87
91
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vas-fire-user.model.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-fire-user.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { VasFireUserDto, VasFireUserDtoAccountType } from './vas-fire-user.dto';\nimport moment from 'moment/moment';\nimport { VasUserModel } from './vas-user.model';\n\nexport class VasFireUserModel extends VasUserModel implements VasFireUserDto {\n\n  constructor(\n    public override id: string,\n    public override created: string = '',\n    public override serverCreated: string = '',\n    public override createdBy: string = '',\n    public override modified: string = '',\n    public override serverModified: string = '',\n    public override modifiedBy: string = '',\n    public override email: string,\n    public override username: string,\n    public accounts: VasFireUserDtoAccountType,\n    public tokens: Array<string>,\n    public topics: Array<string>,\n    public language: string,\n    public fullName: string,\n  ) {\n    super(\n      id,\n      created,\n      serverCreated,\n      createdBy,\n      modified,\n      serverModified,\n      modifiedBy,\n      email,\n      username\n    );\n  }\n\n  public static override fromDto(dto: VasFireUserDto): VasFireUserModel {\n    return new VasFireUserModel(\n      dto.id || '',\n      dto.created || '',\n      dto.serverCreated || '',\n      dto.createdBy || '',\n      dto.modified || '',\n      dto.serverModified || '',\n      dto.modifiedBy || '',\n      dto.email || '',\n      dto.username || '',\n      dto.accounts || {},\n      dto.tokens || [],\n      dto.topics || [],\n      dto.language || '',\n      dto.fullName || ''\n    );\n  }\n\n  public static newUser(\n    uid: string,\n    displayName: string,\n    email: string\n  ): VasFireUserModel {\n    return new VasFireUserModel(\n      uid,\n      moment().toISOString(),\n      moment().toISOString(),\n      uid,\n      moment().toISOString(),\n      moment().toISOString(),\n      uid,\n      email,\n      displayName,\n      {},\n      [],\n      [],\n      '',\n      ''\n    )\n  }\n\n  public override toDto(): VasFireUserDto {\n    return {\n      id: this.id,\n      created: this.created,\n      serverCreated: this.serverCreated,\n      createdBy: this.createdBy,\n      modified: this.modified,\n      serverModified: this.serverModified,\n      modifiedBy: this.modifiedBy,\n      email: this.email,\n      username: this.username,\n      accounts: this.accounts,\n      tokens: this.tokens,\n      topics: this.topics,\n      language: this.language,\n      fullName: this.fullName\n    };\n  }\n\n  /**\n   * Adds token to tokens list if it is not already present\n   * @param token the new token\n   */\n  addToken(token: string): void {\n    if (this.tokens.includes(token)) {\n      return;\n    }\n    this.tokens.push(token);\n  }\n\n  /**\n   * Remove token from tokens list\n   * @param token the token to remove\n   */\n  removeToken(token: string): void {\n    this.tokens = this.tokens.filter(t => t !== token);\n  }\n\n  /**\n   * Resets the tokens list\n   */\n  resetTokens(): void {\n    this.tokens = [];\n  }\n\n  /**\n   * Adds topic to topics list if it is not already present\n   * @param topic the new token\n   */\n  addTopic(topic: string): void {\n    if (this.topics.includes(topic)) {\n      return;\n    }\n    this.topics.push(topic);\n  }\n\n  /**\n   * Remove topic from topic list\n   * @param topic the topic to remove\n   */\n  removeTopic(topic: string): void {\n    this.topics = this.topics.filter(t => t !== topic);\n  }\n\n  /**\n   * Resets the topic list\n   */\n  resetTopics(): void {\n    this.topics = [];\n  }\n}\n"]}
|
|
@@ -66,7 +66,7 @@ class VasUserModel extends VasBaseModel {
|
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
class VasFireUserModel extends VasUserModel {
|
|
69
|
-
constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', email, username, accounts, tokens, topics) {
|
|
69
|
+
constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', email, username, accounts, tokens, topics, language, fullName) {
|
|
70
70
|
super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, email, username);
|
|
71
71
|
this.id = id;
|
|
72
72
|
this.created = created;
|
|
@@ -80,12 +80,14 @@ class VasFireUserModel extends VasUserModel {
|
|
|
80
80
|
this.accounts = accounts;
|
|
81
81
|
this.tokens = tokens;
|
|
82
82
|
this.topics = topics;
|
|
83
|
+
this.language = language;
|
|
84
|
+
this.fullName = fullName;
|
|
83
85
|
}
|
|
84
86
|
static fromDto(dto) {
|
|
85
|
-
return new VasFireUserModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.email || '', dto.username || '', dto.accounts || {}, dto.tokens || [], dto.topics || []);
|
|
87
|
+
return new VasFireUserModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.email || '', dto.username || '', dto.accounts || {}, dto.tokens || [], dto.topics || [], dto.language || '', dto.fullName || '');
|
|
86
88
|
}
|
|
87
89
|
static newUser(uid, displayName, email) {
|
|
88
|
-
return new VasFireUserModel(uid, moment().toISOString(),
|
|
90
|
+
return new VasFireUserModel(uid, moment().toISOString(), moment().toISOString(), uid, moment().toISOString(), moment().toISOString(), uid, email, displayName, {}, [], [], '', '');
|
|
89
91
|
}
|
|
90
92
|
toDto() {
|
|
91
93
|
return {
|
|
@@ -100,7 +102,9 @@ class VasFireUserModel extends VasUserModel {
|
|
|
100
102
|
username: this.username,
|
|
101
103
|
accounts: this.accounts,
|
|
102
104
|
tokens: this.tokens,
|
|
103
|
-
topics: this.topics
|
|
105
|
+
topics: this.topics,
|
|
106
|
+
language: this.language,
|
|
107
|
+
fullName: this.fullName
|
|
104
108
|
};
|
|
105
109
|
}
|
|
106
110
|
/**
|