gs2 1.3.114 → 1.3.115
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/identifier/model/Password.d.ts +4 -0
- package/identifier/model/Password.js +14 -0
- package/identifier/model/Password.js.map +1 -1
- package/identifier/model/Password.ts +14 -0
- package/megaField/model/AreaModel.d.ts +5 -0
- package/megaField/model/AreaModel.js +23 -1
- package/megaField/model/AreaModel.js.map +1 -1
- package/megaField/model/AreaModel.ts +24 -1
- package/package.json +1 -1
- package/serialKey/model/SerialKey.d.ts +2 -2
- package/serialKey/model/SerialKey.js +9 -9
- package/serialKey/model/SerialKey.js.map +1 -1
- package/serialKey/model/SerialKey.ts +9 -9
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import IModel from '../../core/interface/IModel';
|
|
2
2
|
export default class Password implements IModel {
|
|
3
|
+
private passwordId;
|
|
3
4
|
private userId;
|
|
4
5
|
private userName;
|
|
5
6
|
private createdAt;
|
|
@@ -7,6 +8,9 @@ export default class Password implements IModel {
|
|
|
7
8
|
static getUserName(grn: string): string | null;
|
|
8
9
|
static isValid(grn: string): boolean;
|
|
9
10
|
static createGrn(ownerId: string | null, userName: string | null): string | null;
|
|
11
|
+
getPasswordId(): string | null;
|
|
12
|
+
setPasswordId(passwordId: string | null): this;
|
|
13
|
+
withPasswordId(passwordId: string | null): this;
|
|
10
14
|
getUserId(): string | null;
|
|
11
15
|
setUserId(userId: string | null): this;
|
|
12
16
|
withUserId(userId: string | null): this;
|
|
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
var grnFormat = "grn:gs2::{ownerId}:identifier:user:{userName}";
|
|
19
19
|
var Password = /** @class */ (function () {
|
|
20
20
|
function Password() {
|
|
21
|
+
this.passwordId = null;
|
|
21
22
|
this.userId = null;
|
|
22
23
|
this.userName = null;
|
|
23
24
|
this.createdAt = null;
|
|
@@ -54,6 +55,17 @@ var Password = /** @class */ (function () {
|
|
|
54
55
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
55
56
|
.replace('{userName}', userName !== null && userName !== void 0 ? userName : '');
|
|
56
57
|
};
|
|
58
|
+
Password.prototype.getPasswordId = function () {
|
|
59
|
+
return this.passwordId;
|
|
60
|
+
};
|
|
61
|
+
Password.prototype.setPasswordId = function (passwordId) {
|
|
62
|
+
this.passwordId = passwordId;
|
|
63
|
+
return this;
|
|
64
|
+
};
|
|
65
|
+
Password.prototype.withPasswordId = function (passwordId) {
|
|
66
|
+
this.passwordId = passwordId;
|
|
67
|
+
return this;
|
|
68
|
+
};
|
|
57
69
|
Password.prototype.getUserId = function () {
|
|
58
70
|
return this.userId;
|
|
59
71
|
};
|
|
@@ -92,12 +104,14 @@ var Password = /** @class */ (function () {
|
|
|
92
104
|
return null;
|
|
93
105
|
}
|
|
94
106
|
return new Password()
|
|
107
|
+
.withPasswordId(data["passwordId"])
|
|
95
108
|
.withUserId(data["userId"])
|
|
96
109
|
.withUserName(data["userName"])
|
|
97
110
|
.withCreatedAt(data["createdAt"]);
|
|
98
111
|
};
|
|
99
112
|
Password.prototype.toDict = function () {
|
|
100
113
|
return {
|
|
114
|
+
"passwordId": this.getPasswordId(),
|
|
101
115
|
"userId": this.getUserId(),
|
|
102
116
|
"userName": this.getUserName(),
|
|
103
117
|
"createdAt": this.getCreatedAt(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Password.js","sourceRoot":"","sources":["Password.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAGH,IAAM,SAAS,GAAW,+CAA+C,CAAC;AAE1E;IAAA;QACY,WAAM,GAAgB,IAAI,CAAC;QAC3B,aAAQ,GAAgB,IAAI,CAAC;QAC7B,cAAS,GAAgB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Password.js","sourceRoot":"","sources":["Password.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ import IModel from '../../core/interface/IModel';
|
|
|
18
18
|
const grnFormat: string = "grn:gs2::{ownerId}:identifier:user:{userName}";
|
|
19
19
|
|
|
20
20
|
export default class Password implements IModel {
|
|
21
|
+
private passwordId: string|null = null;
|
|
21
22
|
private userId: string|null = null;
|
|
22
23
|
private userName: string|null = null;
|
|
23
24
|
private createdAt: number|null = null;
|
|
@@ -62,6 +63,17 @@ export default class Password implements IModel {
|
|
|
62
63
|
.replace('{ownerId}', ownerId ?? '')
|
|
63
64
|
.replace('{userName}', userName ?? '');
|
|
64
65
|
}
|
|
66
|
+
public getPasswordId(): string|null {
|
|
67
|
+
return this.passwordId;
|
|
68
|
+
}
|
|
69
|
+
public setPasswordId(passwordId: string|null) {
|
|
70
|
+
this.passwordId = passwordId;
|
|
71
|
+
return this;
|
|
72
|
+
}
|
|
73
|
+
public withPasswordId(passwordId: string|null): this {
|
|
74
|
+
this.passwordId = passwordId;
|
|
75
|
+
return this;
|
|
76
|
+
}
|
|
65
77
|
public getUserId(): string|null {
|
|
66
78
|
return this.userId;
|
|
67
79
|
}
|
|
@@ -101,6 +113,7 @@ export default class Password implements IModel {
|
|
|
101
113
|
return null;
|
|
102
114
|
}
|
|
103
115
|
return new Password()
|
|
116
|
+
.withPasswordId(data["passwordId"])
|
|
104
117
|
.withUserId(data["userId"])
|
|
105
118
|
.withUserName(data["userName"])
|
|
106
119
|
.withCreatedAt(data["createdAt"]);
|
|
@@ -108,6 +121,7 @@ export default class Password implements IModel {
|
|
|
108
121
|
|
|
109
122
|
public toDict(): {[key: string]: any} {
|
|
110
123
|
return {
|
|
124
|
+
"passwordId": this.getPasswordId(),
|
|
111
125
|
"userId": this.getUserId(),
|
|
112
126
|
"userName": this.getUserName(),
|
|
113
127
|
"createdAt": this.getCreatedAt(),
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import IModel from '../../core/interface/IModel';
|
|
2
|
+
import LayerModel from './LayerModel';
|
|
2
3
|
export default class AreaModel implements IModel {
|
|
3
4
|
private areaModelId;
|
|
4
5
|
private name;
|
|
5
6
|
private metadata;
|
|
7
|
+
private layerModels;
|
|
6
8
|
static getRegion(grn: string): string | null;
|
|
7
9
|
static getOwnerId(grn: string): string | null;
|
|
8
10
|
static getNamespaceName(grn: string): string | null;
|
|
@@ -18,6 +20,9 @@ export default class AreaModel implements IModel {
|
|
|
18
20
|
getMetadata(): string | null;
|
|
19
21
|
setMetadata(metadata: string | null): this;
|
|
20
22
|
withMetadata(metadata: string | null): this;
|
|
23
|
+
getLayerModels(): LayerModel[] | null;
|
|
24
|
+
setLayerModels(layerModels: LayerModel[] | null): this;
|
|
25
|
+
withLayerModels(layerModels: LayerModel[] | null): this;
|
|
21
26
|
static fromDict(data: {
|
|
22
27
|
[key: string]: any;
|
|
23
28
|
}): AreaModel | null;
|
|
@@ -15,12 +15,15 @@ express or implied. See the License for the specific language governing
|
|
|
15
15
|
permissions and limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
var tslib_1 = require("tslib");
|
|
19
|
+
var LayerModel_1 = tslib_1.__importDefault(require("./LayerModel"));
|
|
18
20
|
var grnFormat = "grn:gs2:{region}:{ownerId}:megaField:{namespaceName}:model:area:{areaModelName}";
|
|
19
21
|
var AreaModel = /** @class */ (function () {
|
|
20
22
|
function AreaModel() {
|
|
21
23
|
this.areaModelId = null;
|
|
22
24
|
this.name = null;
|
|
23
25
|
this.metadata = null;
|
|
26
|
+
this.layerModels = null;
|
|
24
27
|
}
|
|
25
28
|
AreaModel.getRegion = function (grn) {
|
|
26
29
|
var match = grn.match(grnFormat
|
|
@@ -121,6 +124,17 @@ var AreaModel = /** @class */ (function () {
|
|
|
121
124
|
this.metadata = metadata;
|
|
122
125
|
return this;
|
|
123
126
|
};
|
|
127
|
+
AreaModel.prototype.getLayerModels = function () {
|
|
128
|
+
return this.layerModels;
|
|
129
|
+
};
|
|
130
|
+
AreaModel.prototype.setLayerModels = function (layerModels) {
|
|
131
|
+
this.layerModels = layerModels;
|
|
132
|
+
return this;
|
|
133
|
+
};
|
|
134
|
+
AreaModel.prototype.withLayerModels = function (layerModels) {
|
|
135
|
+
this.layerModels = layerModels;
|
|
136
|
+
return this;
|
|
137
|
+
};
|
|
124
138
|
AreaModel.fromDict = function (data) {
|
|
125
139
|
if (data == undefined || data == null) {
|
|
126
140
|
return null;
|
|
@@ -128,13 +142,21 @@ var AreaModel = /** @class */ (function () {
|
|
|
128
142
|
return new AreaModel()
|
|
129
143
|
.withAreaModelId(data["areaModelId"])
|
|
130
144
|
.withName(data["name"])
|
|
131
|
-
.withMetadata(data["metadata"])
|
|
145
|
+
.withMetadata(data["metadata"])
|
|
146
|
+
.withLayerModels(data.layerModels ?
|
|
147
|
+
data.layerModels.map(function (item) {
|
|
148
|
+
return LayerModel_1.default.fromDict(item);
|
|
149
|
+
}) : []);
|
|
132
150
|
};
|
|
133
151
|
AreaModel.prototype.toDict = function () {
|
|
134
152
|
return {
|
|
135
153
|
"areaModelId": this.getAreaModelId(),
|
|
136
154
|
"name": this.getName(),
|
|
137
155
|
"metadata": this.getMetadata(),
|
|
156
|
+
"layerModels": this.getLayerModels() ?
|
|
157
|
+
this.getLayerModels().map(function (item) {
|
|
158
|
+
return item.toDict();
|
|
159
|
+
}) : [],
|
|
138
160
|
};
|
|
139
161
|
};
|
|
140
162
|
return AreaModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AreaModel.js","sourceRoot":"","sources":["AreaModel.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"AreaModel.js","sourceRoot":"","sources":["AreaModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,12 +15,14 @@ permissions and limitations under the License.
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
|
+
import LayerModel from './LayerModel';
|
|
18
19
|
const grnFormat: string = "grn:gs2:{region}:{ownerId}:megaField:{namespaceName}:model:area:{areaModelName}";
|
|
19
20
|
|
|
20
21
|
export default class AreaModel implements IModel {
|
|
21
22
|
private areaModelId: string|null = null;
|
|
22
23
|
private name: string|null = null;
|
|
23
24
|
private metadata: string|null = null;
|
|
25
|
+
private layerModels: LayerModel[]|null = null;
|
|
24
26
|
|
|
25
27
|
public static getRegion(grn: string): string|null {
|
|
26
28
|
const match = grn.match(grnFormat
|
|
@@ -135,6 +137,17 @@ export default class AreaModel implements IModel {
|
|
|
135
137
|
this.metadata = metadata;
|
|
136
138
|
return this;
|
|
137
139
|
}
|
|
140
|
+
public getLayerModels(): LayerModel[]|null {
|
|
141
|
+
return this.layerModels;
|
|
142
|
+
}
|
|
143
|
+
public setLayerModels(layerModels: LayerModel[]|null) {
|
|
144
|
+
this.layerModels = layerModels;
|
|
145
|
+
return this;
|
|
146
|
+
}
|
|
147
|
+
public withLayerModels(layerModels: LayerModel[]|null): this {
|
|
148
|
+
this.layerModels = layerModels;
|
|
149
|
+
return this;
|
|
150
|
+
}
|
|
138
151
|
|
|
139
152
|
public static fromDict(data: {[key: string]: any}): AreaModel|null {
|
|
140
153
|
if (data == undefined || data == null) {
|
|
@@ -143,7 +156,12 @@ export default class AreaModel implements IModel {
|
|
|
143
156
|
return new AreaModel()
|
|
144
157
|
.withAreaModelId(data["areaModelId"])
|
|
145
158
|
.withName(data["name"])
|
|
146
|
-
.withMetadata(data["metadata"])
|
|
159
|
+
.withMetadata(data["metadata"])
|
|
160
|
+
.withLayerModels(data.layerModels ?
|
|
161
|
+
data.layerModels.map((item: {[key: string]: any}) => {
|
|
162
|
+
return LayerModel.fromDict(item);
|
|
163
|
+
}
|
|
164
|
+
) : []);
|
|
147
165
|
}
|
|
148
166
|
|
|
149
167
|
public toDict(): {[key: string]: any} {
|
|
@@ -151,6 +169,11 @@ export default class AreaModel implements IModel {
|
|
|
151
169
|
"areaModelId": this.getAreaModelId(),
|
|
152
170
|
"name": this.getName(),
|
|
153
171
|
"metadata": this.getMetadata(),
|
|
172
|
+
"layerModels": this.getLayerModels() ?
|
|
173
|
+
this.getLayerModels()!.map((item: LayerModel) => {
|
|
174
|
+
return item.toDict();
|
|
175
|
+
}
|
|
176
|
+
) : [],
|
|
154
177
|
};
|
|
155
178
|
}
|
|
156
179
|
}
|
package/package.json
CHANGED
|
@@ -12,9 +12,9 @@ export default class SerialKey implements IModel {
|
|
|
12
12
|
static getRegion(grn: string): string | null;
|
|
13
13
|
static getOwnerId(grn: string): string | null;
|
|
14
14
|
static getNamespaceName(grn: string): string | null;
|
|
15
|
-
static
|
|
15
|
+
static getCode(grn: string): string | null;
|
|
16
16
|
static isValid(grn: string): boolean;
|
|
17
|
-
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null,
|
|
17
|
+
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, code: string | null): string | null;
|
|
18
18
|
getSerialKeyId(): string | null;
|
|
19
19
|
setSerialKeyId(serialKeyId: string | null): this;
|
|
20
20
|
withSerialKeyId(serialKeyId: string | null): this;
|
|
@@ -15,7 +15,7 @@ express or implied. See the License for the specific language governing
|
|
|
15
15
|
permissions and limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
var grnFormat = "grn:gs2:{region}:{ownerId}:serialKey:{namespaceName}:serialKey:{
|
|
18
|
+
var grnFormat = "grn:gs2:{region}:{ownerId}:serialKey:{namespaceName}:serialKey:{code}";
|
|
19
19
|
var SerialKey = /** @class */ (function () {
|
|
20
20
|
function SerialKey() {
|
|
21
21
|
this.serialKeyId = null;
|
|
@@ -33,7 +33,7 @@ var SerialKey = /** @class */ (function () {
|
|
|
33
33
|
.replace('{region}', '(.*)')
|
|
34
34
|
.replace('{ownerId}', '.*')
|
|
35
35
|
.replace('{namespaceName}', '.*')
|
|
36
|
-
.replace('{
|
|
36
|
+
.replace('{code}', '.*'));
|
|
37
37
|
if (match) {
|
|
38
38
|
return match[1];
|
|
39
39
|
}
|
|
@@ -44,7 +44,7 @@ var SerialKey = /** @class */ (function () {
|
|
|
44
44
|
.replace('{region}', '.*')
|
|
45
45
|
.replace('{ownerId}', '(.*)')
|
|
46
46
|
.replace('{namespaceName}', '.*')
|
|
47
|
-
.replace('{
|
|
47
|
+
.replace('{code}', '.*'));
|
|
48
48
|
if (match) {
|
|
49
49
|
return match[1];
|
|
50
50
|
}
|
|
@@ -55,18 +55,18 @@ var SerialKey = /** @class */ (function () {
|
|
|
55
55
|
.replace('{region}', '.*')
|
|
56
56
|
.replace('{ownerId}', '.*')
|
|
57
57
|
.replace('{namespaceName}', '(.*)')
|
|
58
|
-
.replace('{
|
|
58
|
+
.replace('{code}', '.*'));
|
|
59
59
|
if (match) {
|
|
60
60
|
return match[1];
|
|
61
61
|
}
|
|
62
62
|
return null;
|
|
63
63
|
};
|
|
64
|
-
SerialKey.
|
|
64
|
+
SerialKey.getCode = function (grn) {
|
|
65
65
|
var match = grn.match(grnFormat
|
|
66
66
|
.replace('{region}', '.*')
|
|
67
67
|
.replace('{ownerId}', '.*')
|
|
68
68
|
.replace('{namespaceName}', '.*')
|
|
69
|
-
.replace('{
|
|
69
|
+
.replace('{code}', '(.*)'));
|
|
70
70
|
if (match) {
|
|
71
71
|
return match[1];
|
|
72
72
|
}
|
|
@@ -82,17 +82,17 @@ var SerialKey = /** @class */ (function () {
|
|
|
82
82
|
if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
|
|
83
83
|
return false;
|
|
84
84
|
}
|
|
85
|
-
if (this.
|
|
85
|
+
if (this.getCode(grn) == null || this.getCode(grn) === '') {
|
|
86
86
|
return false;
|
|
87
87
|
}
|
|
88
88
|
return true;
|
|
89
89
|
};
|
|
90
|
-
SerialKey.createGrn = function (region, ownerId, namespaceName,
|
|
90
|
+
SerialKey.createGrn = function (region, ownerId, namespaceName, code) {
|
|
91
91
|
return grnFormat
|
|
92
92
|
.replace('{region}', region !== null && region !== void 0 ? region : '')
|
|
93
93
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
94
94
|
.replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
|
|
95
|
-
.replace('{
|
|
95
|
+
.replace('{code}', code !== null && code !== void 0 ? code : '');
|
|
96
96
|
};
|
|
97
97
|
SerialKey.prototype.getSerialKeyId = function () {
|
|
98
98
|
return this.serialKeyId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SerialKey.js","sourceRoot":"","sources":["SerialKey.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAGH,IAAM,SAAS,GAAW,
|
|
1
|
+
{"version":3,"file":"SerialKey.js","sourceRoot":"","sources":["SerialKey.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ permissions and limitations under the License.
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
|
-
const grnFormat: string = "grn:gs2:{region}:{ownerId}:serialKey:{namespaceName}:serialKey:{
|
|
18
|
+
const grnFormat: string = "grn:gs2:{region}:{ownerId}:serialKey:{namespaceName}:serialKey:{code}";
|
|
19
19
|
|
|
20
20
|
export default class SerialKey implements IModel {
|
|
21
21
|
private serialKeyId: string|null = null;
|
|
@@ -33,7 +33,7 @@ export default class SerialKey implements IModel {
|
|
|
33
33
|
.replace('{region}', '(.*)')
|
|
34
34
|
.replace('{ownerId}', '.*')
|
|
35
35
|
.replace('{namespaceName}', '.*')
|
|
36
|
-
.replace('{
|
|
36
|
+
.replace('{code}', '.*')
|
|
37
37
|
);
|
|
38
38
|
if (match) {
|
|
39
39
|
return match[1];
|
|
@@ -46,7 +46,7 @@ export default class SerialKey implements IModel {
|
|
|
46
46
|
.replace('{region}', '.*')
|
|
47
47
|
.replace('{ownerId}', '(.*)')
|
|
48
48
|
.replace('{namespaceName}', '.*')
|
|
49
|
-
.replace('{
|
|
49
|
+
.replace('{code}', '.*')
|
|
50
50
|
);
|
|
51
51
|
if (match) {
|
|
52
52
|
return match[1];
|
|
@@ -59,7 +59,7 @@ export default class SerialKey implements IModel {
|
|
|
59
59
|
.replace('{region}', '.*')
|
|
60
60
|
.replace('{ownerId}', '.*')
|
|
61
61
|
.replace('{namespaceName}', '(.*)')
|
|
62
|
-
.replace('{
|
|
62
|
+
.replace('{code}', '.*')
|
|
63
63
|
);
|
|
64
64
|
if (match) {
|
|
65
65
|
return match[1];
|
|
@@ -67,12 +67,12 @@ export default class SerialKey implements IModel {
|
|
|
67
67
|
return null;
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
public static
|
|
70
|
+
public static getCode(grn: string): string|null {
|
|
71
71
|
const match = grn.match(grnFormat
|
|
72
72
|
.replace('{region}', '.*')
|
|
73
73
|
.replace('{ownerId}', '.*')
|
|
74
74
|
.replace('{namespaceName}', '.*')
|
|
75
|
-
.replace('{
|
|
75
|
+
.replace('{code}', '(.*)')
|
|
76
76
|
);
|
|
77
77
|
if (match) {
|
|
78
78
|
return match[1];
|
|
@@ -90,7 +90,7 @@ export default class SerialKey implements IModel {
|
|
|
90
90
|
if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
|
|
91
91
|
return false;
|
|
92
92
|
}
|
|
93
|
-
if (this.
|
|
93
|
+
if (this.getCode(grn) == null || this.getCode(grn) === '') {
|
|
94
94
|
return false;
|
|
95
95
|
}
|
|
96
96
|
return true;
|
|
@@ -100,13 +100,13 @@ export default class SerialKey implements IModel {
|
|
|
100
100
|
region: string|null,
|
|
101
101
|
ownerId: string|null,
|
|
102
102
|
namespaceName: string|null,
|
|
103
|
-
|
|
103
|
+
code: string|null,
|
|
104
104
|
): string|null {
|
|
105
105
|
return grnFormat
|
|
106
106
|
.replace('{region}', region ?? '')
|
|
107
107
|
.replace('{ownerId}', ownerId ?? '')
|
|
108
108
|
.replace('{namespaceName}', namespaceName ?? '')
|
|
109
|
-
.replace('{
|
|
109
|
+
.replace('{code}', code ?? '');
|
|
110
110
|
}
|
|
111
111
|
public getSerialKeyId(): string|null {
|
|
112
112
|
return this.serialKeyId;
|