@mtgame/core 0.0.72 → 0.0.74
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/api/file-api.d.ts +1 -1
- package/bundles/mtgame-core.umd.js +13 -6
- package/bundles/mtgame-core.umd.js.map +1 -1
- package/bundles/mtgame-core.umd.min.js +1 -1
- package/bundles/mtgame-core.umd.min.js.map +1 -1
- package/esm2015/api/file-api.js +8 -4
- package/esm2015/http-cookie.interceptor.js +8 -4
- package/esm5/api/file-api.js +9 -5
- package/esm5/http-cookie.interceptor.js +8 -4
- package/fesm2015/mtgame-core.js +12 -5
- package/fesm2015/mtgame-core.js.map +1 -1
- package/fesm5/mtgame-core.js +13 -6
- package/fesm5/mtgame-core.js.map +1 -1
- package/http-cookie.interceptor.d.ts +3 -1
- package/mtgame-core.metadata.json +1 -1
- package/package.json +1 -1
package/esm2015/api/file-api.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __awaiter, __decorate } from "tslib";
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
|
-
import { HttpClient } from '@angular/common/http';
|
|
3
|
+
import { HttpClient, HttpParams } from '@angular/common/http';
|
|
4
4
|
import { ConfigService } from '../services/config.service';
|
|
5
5
|
import { map } from 'rxjs/operators';
|
|
6
6
|
import { File } from '../models/file';
|
|
@@ -12,12 +12,16 @@ let FileApi = class FileApi {
|
|
|
12
12
|
this.httpClient = httpClient;
|
|
13
13
|
this.configService = configService;
|
|
14
14
|
}
|
|
15
|
-
upload(fileData, filename) {
|
|
15
|
+
upload(fileData, filename, width, height) {
|
|
16
16
|
return __awaiter(this, void 0, void 0, function* () {
|
|
17
|
+
const params = new HttpParams();
|
|
18
|
+
if (width && height) {
|
|
19
|
+
params.set('width', width.toString()).set('height', height.toString());
|
|
20
|
+
}
|
|
17
21
|
const formData = new FormData();
|
|
18
22
|
formData.append('file', fileData, filename);
|
|
19
23
|
return this.httpClient
|
|
20
|
-
.post(`${this.configService.get('apiUrl')}/api/v1/file/`, formData)
|
|
24
|
+
.post(`${this.configService.get('apiUrl')}/api/v1/file/`, formData, { params })
|
|
21
25
|
.pipe(map(data => File.toFront(data)))
|
|
22
26
|
.toPromise();
|
|
23
27
|
});
|
|
@@ -43,4 +47,4 @@ FileApi = __decorate([
|
|
|
43
47
|
Injectable({ providedIn: 'root' })
|
|
44
48
|
], FileApi);
|
|
45
49
|
export { FileApi };
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS1hcGkuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AbXRnYW1lL2NvcmUvIiwic291cmNlcyI6WyJhcGkvZmlsZS1hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7OztBQUd0QyxJQUFhLE9BQU8sR0FBcEIsTUFBYSxPQUFPO0lBQ2xCLFlBQ1UsVUFBc0IsRUFDdEIsYUFBNEI7UUFENUIsZUFBVSxHQUFWLFVBQVUsQ0FBWTtRQUN0QixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtJQUNuQyxDQUFDO0lBRUUsTUFBTSxDQUFDLFFBQWEsRUFBRSxRQUFpQixFQUFFLEtBQWMsRUFBRSxNQUFlOztZQUM1RSxNQUFNLE1BQU0sR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQ2hDLElBQUksS0FBSyxJQUFJLE1BQU0sRUFBRTtnQkFDbkIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQzthQUN4RTtZQUVELE1BQU0sUUFBUSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7WUFDaEMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBQzVDLE9BQU8sSUFBSSxDQUFDLFVBQVU7aUJBQ25CLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsUUFBUSxFQUFFLEVBQUMsTUFBTSxFQUFDLENBQUM7aUJBQzVFLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7aUJBQ3JDLFNBQVMsRUFBRSxDQUFDO1FBQ2pCLENBQUM7S0FBQTtJQUVLLGdCQUFnQixDQUFDLEtBQXNDOztZQUMzRCxNQUFNLFFBQVEsR0FBRyxJQUFJLFFBQVEsRUFBRSxDQUFDO1lBQ2hDLEtBQUssTUFBTSxJQUFJLElBQUksS0FBSyxFQUFFO2dCQUN4QixRQUFRLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQzthQUNwRDtZQUNELE9BQU8sSUFBSSxDQUFDLFVBQVU7aUJBQ25CLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQywyQkFBMkIsRUFBRSxRQUFRLEVBQUUsRUFBQyxZQUFZLEVBQUUsTUFBTSxFQUFDLENBQUM7aUJBQ3RHLFNBQVMsRUFBRSxDQUFDO1FBQ2pCLENBQUM7S0FBQTtDQUNGLENBQUE7O1lBM0J1QixVQUFVO1lBQ1AsYUFBYTs7O0FBSDNCLE9BQU87SUFEbkIsVUFBVSxDQUFDLEVBQUMsVUFBVSxFQUFFLE1BQU0sRUFBQyxDQUFDO0dBQ3BCLE9BQU8sQ0E2Qm5CO1NBN0JZLE9BQU8iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBIdHRwQ2xpZW50LCBIdHRwUGFyYW1zIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgQ29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NvbmZpZy5zZXJ2aWNlJztcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEZpbGUgfSBmcm9tICcuLi9tb2RlbHMvZmlsZSc7XG5cbkBJbmplY3RhYmxlKHtwcm92aWRlZEluOiAncm9vdCd9KVxuZXhwb3J0IGNsYXNzIEZpbGVBcGkge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGh0dHBDbGllbnQ6IEh0dHBDbGllbnQsXG4gICAgcHJpdmF0ZSBjb25maWdTZXJ2aWNlOiBDb25maWdTZXJ2aWNlLFxuICApIHt9XG5cbiAgYXN5bmMgdXBsb2FkKGZpbGVEYXRhOiBhbnksIGZpbGVuYW1lPzogc3RyaW5nLCB3aWR0aD86IG51bWJlciwgaGVpZ2h0PzogbnVtYmVyKTogUHJvbWlzZTxGaWxlPiB7XG4gICAgY29uc3QgcGFyYW1zID0gbmV3IEh0dHBQYXJhbXMoKTtcbiAgICBpZiAod2lkdGggJiYgaGVpZ2h0KSB7XG4gICAgICBwYXJhbXMuc2V0KCd3aWR0aCcsIHdpZHRoLnRvU3RyaW5nKCkpLnNldCgnaGVpZ2h0JywgaGVpZ2h0LnRvU3RyaW5nKCkpO1xuICAgIH1cblxuICAgIGNvbnN0IGZvcm1EYXRhID0gbmV3IEZvcm1EYXRhKCk7XG4gICAgZm9ybURhdGEuYXBwZW5kKCdmaWxlJywgZmlsZURhdGEsIGZpbGVuYW1lKTtcbiAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50XG4gICAgICAucG9zdChgJHt0aGlzLmNvbmZpZ1NlcnZpY2UuZ2V0KCdhcGlVcmwnKX0vYXBpL3YxL2ZpbGUvYCwgZm9ybURhdGEsIHtwYXJhbXN9KVxuICAgICAgLnBpcGUobWFwKGRhdGEgPT4gRmlsZS50b0Zyb250KGRhdGEpKSlcbiAgICAgIC50b1Byb21pc2UoKTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVppcEFyY2hpdmUoZmlsZXM6IHtmaWxlOiBhbnksIGZpbGVuYW1lOiBzdHJpbmd9W10pOiBQcm9taXNlPGFueT4ge1xuICAgIGNvbnN0IGZvcm1EYXRhID0gbmV3IEZvcm1EYXRhKCk7XG4gICAgZm9yIChjb25zdCBmaWxlIG9mIGZpbGVzKSB7XG4gICAgICBmb3JtRGF0YS5hcHBlbmQoJ2ZpbGVzJywgZmlsZS5maWxlLCBmaWxlLmZpbGVuYW1lKTtcbiAgICB9XG4gICAgcmV0dXJuIHRoaXMuaHR0cENsaWVudFxuICAgICAgLnBvc3QoYCR7dGhpcy5jb25maWdTZXJ2aWNlLmdldCgnYXBpVXJsJyl9L2FwaS92MS9maWxlL3ppcF9hcmNoaXZlL2AsIGZvcm1EYXRhLCB7cmVzcG9uc2VUeXBlOiAnYmxvYid9KVxuICAgICAgLnRvUHJvbWlzZSgpO1xuICB9XG59XG4iXX0=
|
|
@@ -2,9 +2,11 @@ import { __decorate, __param } from "tslib";
|
|
|
2
2
|
import { Inject, Injectable, Injector, PLATFORM_ID } from '@angular/core';
|
|
3
3
|
import { getCookie } from './utils/cookie';
|
|
4
4
|
import { isPlatformBrowser } from '@angular/common';
|
|
5
|
+
import { ConfigService } from './services/config.service';
|
|
5
6
|
let HttpCookieInterceptor = class HttpCookieInterceptor {
|
|
6
|
-
constructor(injector, platformId) {
|
|
7
|
+
constructor(injector, configService, platformId) {
|
|
7
8
|
this.injector = injector;
|
|
9
|
+
this.configService = configService;
|
|
8
10
|
this.platformId = platformId;
|
|
9
11
|
this.isBrowser = isPlatformBrowser(this.platformId);
|
|
10
12
|
}
|
|
@@ -12,7 +14,8 @@ let HttpCookieInterceptor = class HttpCookieInterceptor {
|
|
|
12
14
|
if (!this.isBrowser) {
|
|
13
15
|
return next.handle(req);
|
|
14
16
|
}
|
|
15
|
-
|
|
17
|
+
const apiUrl = this.configService.get('apiUrl');
|
|
18
|
+
if (apiUrl === req.url.substr(0, apiUrl.length)) {
|
|
16
19
|
req = req.clone({ withCredentials: true });
|
|
17
20
|
}
|
|
18
21
|
const csrf = getCookie('csrftoken');
|
|
@@ -26,11 +29,12 @@ let HttpCookieInterceptor = class HttpCookieInterceptor {
|
|
|
26
29
|
};
|
|
27
30
|
HttpCookieInterceptor.ctorParameters = () => [
|
|
28
31
|
{ type: Injector },
|
|
32
|
+
{ type: ConfigService },
|
|
29
33
|
{ type: String, decorators: [{ type: Inject, args: [PLATFORM_ID,] }] }
|
|
30
34
|
];
|
|
31
35
|
HttpCookieInterceptor = __decorate([
|
|
32
36
|
Injectable(),
|
|
33
|
-
__param(
|
|
37
|
+
__param(2, Inject(PLATFORM_ID))
|
|
34
38
|
], HttpCookieInterceptor);
|
|
35
39
|
export { HttpCookieInterceptor };
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1jb29raWUuaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AbXRnYW1lL2NvcmUvIiwic291cmNlcyI6WyJodHRwLWNvb2tpZS5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUcxRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzFELElBQWEscUJBQXFCLEdBQWxDLE1BQWEscUJBQXFCO0lBR2hDLFlBQ1UsUUFBa0IsRUFDbEIsYUFBNEIsRUFDUCxVQUFrQjtRQUZ2QyxhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQ2xCLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQ1AsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUx6QyxjQUFTLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBT3ZELENBQUM7SUFFRCxTQUFTLENBQUMsR0FBcUIsRUFBRSxJQUFpQjtRQUNoRCxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRTtZQUNuQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDekI7UUFDRCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRCxJQUFJLE1BQU0sS0FBSyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQy9DLEdBQUcsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUMsZUFBZSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUM7U0FDMUM7UUFDRCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDcEMsSUFBSSxJQUFJLEVBQUU7WUFDUixHQUFHLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDZCxVQUFVLEVBQUUsRUFBQyxhQUFhLEVBQUUsSUFBSSxFQUFDO2FBQ2xDLENBQUMsQ0FBQztTQUNKO1FBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzFCLENBQUM7Q0FDRixDQUFBOztZQXRCcUIsUUFBUTtZQUNILGFBQWE7eUNBQ25DLE1BQU0sU0FBQyxXQUFXOztBQU5WLHFCQUFxQjtJQURqQyxVQUFVLEVBQUU7SUFPUixXQUFBLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQTtHQU5YLHFCQUFxQixDQTBCakM7U0ExQlkscUJBQXFCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlLCBJbmplY3RvciwgUExBVEZPUk1fSUQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3QgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBnZXRDb29raWUgfSBmcm9tICcuL3V0aWxzL2Nvb2tpZSc7XG5pbXBvcnQgeyBpc1BsYXRmb3JtQnJvd3NlciB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XG5pbXBvcnQgeyBDb25maWdTZXJ2aWNlIH0gZnJvbSAnLi9zZXJ2aWNlcy9jb25maWcuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBIdHRwQ29va2llSW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBwcml2YXRlIGlzQnJvd3NlciA9IGlzUGxhdGZvcm1Ccm93c2VyKHRoaXMucGxhdGZvcm1JZCk7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBpbmplY3RvcjogSW5qZWN0b3IsXG4gICAgcHJpdmF0ZSBjb25maWdTZXJ2aWNlOiBDb25maWdTZXJ2aWNlLFxuICAgIEBJbmplY3QoUExBVEZPUk1fSUQpIHByaXZhdGUgcGxhdGZvcm1JZDogc3RyaW5nLFxuICApIHtcbiAgfVxuXG4gIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIGlmICghdGhpcy5pc0Jyb3dzZXIpIHtcbiAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpO1xuICAgIH1cbiAgICBjb25zdCBhcGlVcmwgPSB0aGlzLmNvbmZpZ1NlcnZpY2UuZ2V0KCdhcGlVcmwnKTtcbiAgICBpZiAoYXBpVXJsID09PSByZXEudXJsLnN1YnN0cigwLCBhcGlVcmwubGVuZ3RoKSkge1xuICAgICAgcmVxID0gcmVxLmNsb25lKHt3aXRoQ3JlZGVudGlhbHM6IHRydWV9KTtcbiAgICB9XG4gICAgY29uc3QgY3NyZiA9IGdldENvb2tpZSgnY3NyZnRva2VuJyk7XG4gICAgaWYgKGNzcmYpIHtcbiAgICAgIHJlcSA9IHJlcS5jbG9uZSh7XG4gICAgICAgIHNldEhlYWRlcnM6IHsnWC1DU1JGVG9rZW4nOiBjc3JmfVxuICAgICAgfSk7XG4gICAgfVxuICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpO1xuICB9XG59XG4iXX0=
|
package/esm5/api/file-api.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __awaiter, __decorate, __generator, __values } from "tslib";
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
|
-
import { HttpClient } from '@angular/common/http';
|
|
3
|
+
import { HttpClient, HttpParams } from '@angular/common/http';
|
|
4
4
|
import { ConfigService } from '../services/config.service';
|
|
5
5
|
import { map } from 'rxjs/operators';
|
|
6
6
|
import { File } from '../models/file';
|
|
@@ -12,14 +12,18 @@ var FileApi = /** @class */ (function () {
|
|
|
12
12
|
this.httpClient = httpClient;
|
|
13
13
|
this.configService = configService;
|
|
14
14
|
}
|
|
15
|
-
FileApi.prototype.upload = function (fileData, filename) {
|
|
15
|
+
FileApi.prototype.upload = function (fileData, filename, width, height) {
|
|
16
16
|
return __awaiter(this, void 0, void 0, function () {
|
|
17
|
-
var formData;
|
|
17
|
+
var params, formData;
|
|
18
18
|
return __generator(this, function (_a) {
|
|
19
|
+
params = new HttpParams();
|
|
20
|
+
if (width && height) {
|
|
21
|
+
params.set('width', width.toString()).set('height', height.toString());
|
|
22
|
+
}
|
|
19
23
|
formData = new FormData();
|
|
20
24
|
formData.append('file', fileData, filename);
|
|
21
25
|
return [2 /*return*/, this.httpClient
|
|
22
|
-
.post(this.configService.get('apiUrl') + "/api/v1/file/", formData)
|
|
26
|
+
.post(this.configService.get('apiUrl') + "/api/v1/file/", formData, { params: params })
|
|
23
27
|
.pipe(map(function (data) { return File.toFront(data); }))
|
|
24
28
|
.toPromise()];
|
|
25
29
|
});
|
|
@@ -61,4 +65,4 @@ var FileApi = /** @class */ (function () {
|
|
|
61
65
|
return FileApi;
|
|
62
66
|
}());
|
|
63
67
|
export { FileApi };
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS1hcGkuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AbXRnYW1lL2NvcmUvIiwic291cmNlcyI6WyJhcGkvZmlsZS1hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7OztBQUd0QztJQUNFLGlCQUNVLFVBQXNCLEVBQ3RCLGFBQTRCO1FBRDVCLGVBQVUsR0FBVixVQUFVLENBQVk7UUFDdEIsa0JBQWEsR0FBYixhQUFhLENBQWU7SUFDbkMsQ0FBQztJQUVFLHdCQUFNLEdBQVosVUFBYSxRQUFhLEVBQUUsUUFBaUIsRUFBRSxLQUFjLEVBQUUsTUFBZTs7OztnQkFDdEUsTUFBTSxHQUFHLElBQUksVUFBVSxFQUFFLENBQUM7Z0JBQ2hDLElBQUksS0FBSyxJQUFJLE1BQU0sRUFBRTtvQkFDbkIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztpQkFDeEU7Z0JBRUssUUFBUSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7Z0JBQ2hDLFFBQVEsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDNUMsc0JBQU8sSUFBSSxDQUFDLFVBQVU7eUJBQ25CLElBQUksQ0FBSSxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsa0JBQWUsRUFBRSxRQUFRLEVBQUUsRUFBQyxNQUFNLFFBQUEsRUFBQyxDQUFDO3lCQUM1RSxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBbEIsQ0FBa0IsQ0FBQyxDQUFDO3lCQUNyQyxTQUFTLEVBQUUsRUFBQzs7O0tBQ2hCO0lBRUssa0NBQWdCLEdBQXRCLFVBQXVCLEtBQXNDOzs7OztnQkFDckQsUUFBUSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7O29CQUNoQyxLQUFtQixVQUFBLFNBQUEsS0FBSyxDQUFBLDJFQUFFO3dCQUFmLElBQUk7d0JBQ2IsUUFBUSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7cUJBQ3BEOzs7Ozs7Ozs7Z0JBQ0Qsc0JBQU8sSUFBSSxDQUFDLFVBQVU7eUJBQ25CLElBQUksQ0FBSSxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsOEJBQTJCLEVBQUUsUUFBUSxFQUFFLEVBQUMsWUFBWSxFQUFFLE1BQU0sRUFBQyxDQUFDO3lCQUN0RyxTQUFTLEVBQUUsRUFBQzs7O0tBQ2hCOztnQkExQnFCLFVBQVU7Z0JBQ1AsYUFBYTs7O0lBSDNCLE9BQU87UUFEbkIsVUFBVSxDQUFDLEVBQUMsVUFBVSxFQUFFLE1BQU0sRUFBQyxDQUFDO09BQ3BCLE9BQU8sQ0E2Qm5CO2tCQXBDRDtDQW9DQyxBQTdCRCxJQTZCQztTQTdCWSxPQUFPIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSHR0cENsaWVudCwgSHR0cFBhcmFtcyB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IENvbmZpZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9jb25maWcuc2VydmljZSc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBGaWxlIH0gZnJvbSAnLi4vbW9kZWxzL2ZpbGUnO1xuXG5ASW5qZWN0YWJsZSh7cHJvdmlkZWRJbjogJ3Jvb3QnfSlcbmV4cG9ydCBjbGFzcyBGaWxlQXBpIHtcbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBodHRwQ2xpZW50OiBIdHRwQ2xpZW50LFxuICAgIHByaXZhdGUgY29uZmlnU2VydmljZTogQ29uZmlnU2VydmljZSxcbiAgKSB7fVxuXG4gIGFzeW5jIHVwbG9hZChmaWxlRGF0YTogYW55LCBmaWxlbmFtZT86IHN0cmluZywgd2lkdGg/OiBudW1iZXIsIGhlaWdodD86IG51bWJlcik6IFByb21pc2U8RmlsZT4ge1xuICAgIGNvbnN0IHBhcmFtcyA9IG5ldyBIdHRwUGFyYW1zKCk7XG4gICAgaWYgKHdpZHRoICYmIGhlaWdodCkge1xuICAgICAgcGFyYW1zLnNldCgnd2lkdGgnLCB3aWR0aC50b1N0cmluZygpKS5zZXQoJ2hlaWdodCcsIGhlaWdodC50b1N0cmluZygpKTtcbiAgICB9XG5cbiAgICBjb25zdCBmb3JtRGF0YSA9IG5ldyBGb3JtRGF0YSgpO1xuICAgIGZvcm1EYXRhLmFwcGVuZCgnZmlsZScsIGZpbGVEYXRhLCBmaWxlbmFtZSk7XG4gICAgcmV0dXJuIHRoaXMuaHR0cENsaWVudFxuICAgICAgLnBvc3QoYCR7dGhpcy5jb25maWdTZXJ2aWNlLmdldCgnYXBpVXJsJyl9L2FwaS92MS9maWxlL2AsIGZvcm1EYXRhLCB7cGFyYW1zfSlcbiAgICAgIC5waXBlKG1hcChkYXRhID0+IEZpbGUudG9Gcm9udChkYXRhKSkpXG4gICAgICAudG9Qcm9taXNlKCk7XG4gIH1cblxuICBhc3luYyBjcmVhdGVaaXBBcmNoaXZlKGZpbGVzOiB7ZmlsZTogYW55LCBmaWxlbmFtZTogc3RyaW5nfVtdKTogUHJvbWlzZTxhbnk+IHtcbiAgICBjb25zdCBmb3JtRGF0YSA9IG5ldyBGb3JtRGF0YSgpO1xuICAgIGZvciAoY29uc3QgZmlsZSBvZiBmaWxlcykge1xuICAgICAgZm9ybURhdGEuYXBwZW5kKCdmaWxlcycsIGZpbGUuZmlsZSwgZmlsZS5maWxlbmFtZSk7XG4gICAgfVxuICAgIHJldHVybiB0aGlzLmh0dHBDbGllbnRcbiAgICAgIC5wb3N0KGAke3RoaXMuY29uZmlnU2VydmljZS5nZXQoJ2FwaVVybCcpfS9hcGkvdjEvZmlsZS96aXBfYXJjaGl2ZS9gLCBmb3JtRGF0YSwge3Jlc3BvbnNlVHlwZTogJ2Jsb2InfSlcbiAgICAgIC50b1Byb21pc2UoKTtcbiAgfVxufVxuIl19
|
|
@@ -2,9 +2,11 @@ import { __decorate, __param } from "tslib";
|
|
|
2
2
|
import { Inject, Injectable, Injector, PLATFORM_ID } from '@angular/core';
|
|
3
3
|
import { getCookie } from './utils/cookie';
|
|
4
4
|
import { isPlatformBrowser } from '@angular/common';
|
|
5
|
+
import { ConfigService } from './services/config.service';
|
|
5
6
|
var HttpCookieInterceptor = /** @class */ (function () {
|
|
6
|
-
function HttpCookieInterceptor(injector, platformId) {
|
|
7
|
+
function HttpCookieInterceptor(injector, configService, platformId) {
|
|
7
8
|
this.injector = injector;
|
|
9
|
+
this.configService = configService;
|
|
8
10
|
this.platformId = platformId;
|
|
9
11
|
this.isBrowser = isPlatformBrowser(this.platformId);
|
|
10
12
|
}
|
|
@@ -12,7 +14,8 @@ var HttpCookieInterceptor = /** @class */ (function () {
|
|
|
12
14
|
if (!this.isBrowser) {
|
|
13
15
|
return next.handle(req);
|
|
14
16
|
}
|
|
15
|
-
|
|
17
|
+
var apiUrl = this.configService.get('apiUrl');
|
|
18
|
+
if (apiUrl === req.url.substr(0, apiUrl.length)) {
|
|
16
19
|
req = req.clone({ withCredentials: true });
|
|
17
20
|
}
|
|
18
21
|
var csrf = getCookie('csrftoken');
|
|
@@ -25,13 +28,14 @@ var HttpCookieInterceptor = /** @class */ (function () {
|
|
|
25
28
|
};
|
|
26
29
|
HttpCookieInterceptor.ctorParameters = function () { return [
|
|
27
30
|
{ type: Injector },
|
|
31
|
+
{ type: ConfigService },
|
|
28
32
|
{ type: String, decorators: [{ type: Inject, args: [PLATFORM_ID,] }] }
|
|
29
33
|
]; };
|
|
30
34
|
HttpCookieInterceptor = __decorate([
|
|
31
35
|
Injectable(),
|
|
32
|
-
__param(
|
|
36
|
+
__param(2, Inject(PLATFORM_ID))
|
|
33
37
|
], HttpCookieInterceptor);
|
|
34
38
|
return HttpCookieInterceptor;
|
|
35
39
|
}());
|
|
36
40
|
export { HttpCookieInterceptor };
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1jb29raWUuaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AbXRnYW1lL2NvcmUvIiwic291cmNlcyI6WyJodHRwLWNvb2tpZS5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUcxRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzFEO0lBR0UsK0JBQ1UsUUFBa0IsRUFDbEIsYUFBNEIsRUFDUCxVQUFrQjtRQUZ2QyxhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQ2xCLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQ1AsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUx6QyxjQUFTLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBT3ZELENBQUM7SUFFRCx5Q0FBUyxHQUFULFVBQVUsR0FBcUIsRUFBRSxJQUFpQjtRQUNoRCxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRTtZQUNuQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDekI7UUFDRCxJQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRCxJQUFJLE1BQU0sS0FBSyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQy9DLEdBQUcsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUMsZUFBZSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUM7U0FDMUM7UUFDRCxJQUFNLElBQUksR0FBRyxTQUFTLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDcEMsSUFBSSxJQUFJLEVBQUU7WUFDUixHQUFHLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDZCxVQUFVLEVBQUUsRUFBQyxhQUFhLEVBQUUsSUFBSSxFQUFDO2FBQ2xDLENBQUMsQ0FBQztTQUNKO1FBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzFCLENBQUM7O2dCQXJCbUIsUUFBUTtnQkFDSCxhQUFhOzZDQUNuQyxNQUFNLFNBQUMsV0FBVzs7SUFOVixxQkFBcUI7UUFEakMsVUFBVSxFQUFFO1FBT1IsV0FBQSxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUE7T0FOWCxxQkFBcUIsQ0EwQmpDO0lBQUQsNEJBQUM7Q0FBQSxBQTFCRCxJQTBCQztTQTFCWSxxQkFBcUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUsIEluamVjdG9yLCBQTEFURk9STV9JRCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSHR0cEV2ZW50LCBIdHRwSGFuZGxlciwgSHR0cEludGVyY2VwdG9yLCBIdHRwUmVxdWVzdCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGdldENvb2tpZSB9IGZyb20gJy4vdXRpbHMvY29va2llJztcbmltcG9ydCB7IGlzUGxhdGZvcm1Ccm93c2VyIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcbmltcG9ydCB7IENvbmZpZ1NlcnZpY2UgfSBmcm9tICcuL3NlcnZpY2VzL2NvbmZpZy5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEh0dHBDb29raWVJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIHByaXZhdGUgaXNCcm93c2VyID0gaXNQbGF0Zm9ybUJyb3dzZXIodGhpcy5wbGF0Zm9ybUlkKTtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGluamVjdG9yOiBJbmplY3RvcixcbiAgICBwcml2YXRlIGNvbmZpZ1NlcnZpY2U6IENvbmZpZ1NlcnZpY2UsXG4gICAgQEluamVjdChQTEFURk9STV9JRCkgcHJpdmF0ZSBwbGF0Zm9ybUlkOiBzdHJpbmcsXG4gICkge1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcTogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgaWYgKCF0aGlzLmlzQnJvd3Nlcikge1xuICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSk7XG4gICAgfVxuICAgIGNvbnN0IGFwaVVybCA9IHRoaXMuY29uZmlnU2VydmljZS5nZXQoJ2FwaVVybCcpO1xuICAgIGlmIChhcGlVcmwgPT09IHJlcS51cmwuc3Vic3RyKDAsIGFwaVVybC5sZW5ndGgpKSB7XG4gICAgICByZXEgPSByZXEuY2xvbmUoe3dpdGhDcmVkZW50aWFsczogdHJ1ZX0pO1xuICAgIH1cbiAgICBjb25zdCBjc3JmID0gZ2V0Q29va2llKCdjc3JmdG9rZW4nKTtcbiAgICBpZiAoY3NyZikge1xuICAgICAgcmVxID0gcmVxLmNsb25lKHtcbiAgICAgICAgc2V0SGVhZGVyczogeydYLUNTUkZUb2tlbic6IGNzcmZ9XG4gICAgICB9KTtcbiAgICB9XG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSk7XG4gIH1cbn1cbiJdfQ==
|
package/fesm2015/mtgame-core.js
CHANGED
|
@@ -2203,12 +2203,16 @@ let FileApi = class FileApi {
|
|
|
2203
2203
|
this.httpClient = httpClient;
|
|
2204
2204
|
this.configService = configService;
|
|
2205
2205
|
}
|
|
2206
|
-
upload(fileData, filename) {
|
|
2206
|
+
upload(fileData, filename, width, height) {
|
|
2207
2207
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2208
|
+
const params = new HttpParams();
|
|
2209
|
+
if (width && height) {
|
|
2210
|
+
params.set('width', width.toString()).set('height', height.toString());
|
|
2211
|
+
}
|
|
2208
2212
|
const formData = new FormData();
|
|
2209
2213
|
formData.append('file', fileData, filename);
|
|
2210
2214
|
return this.httpClient
|
|
2211
|
-
.post(`${this.configService.get('apiUrl')}/api/v1/file/`, formData)
|
|
2215
|
+
.post(`${this.configService.get('apiUrl')}/api/v1/file/`, formData, { params })
|
|
2212
2216
|
.pipe(map(data => File.toFront(data)))
|
|
2213
2217
|
.toPromise();
|
|
2214
2218
|
});
|
|
@@ -6950,8 +6954,9 @@ function fileSizeValidator(maxFileSize) {
|
|
|
6950
6954
|
}
|
|
6951
6955
|
|
|
6952
6956
|
let HttpCookieInterceptor = class HttpCookieInterceptor {
|
|
6953
|
-
constructor(injector, platformId) {
|
|
6957
|
+
constructor(injector, configService, platformId) {
|
|
6954
6958
|
this.injector = injector;
|
|
6959
|
+
this.configService = configService;
|
|
6955
6960
|
this.platformId = platformId;
|
|
6956
6961
|
this.isBrowser = isPlatformBrowser(this.platformId);
|
|
6957
6962
|
}
|
|
@@ -6959,7 +6964,8 @@ let HttpCookieInterceptor = class HttpCookieInterceptor {
|
|
|
6959
6964
|
if (!this.isBrowser) {
|
|
6960
6965
|
return next.handle(req);
|
|
6961
6966
|
}
|
|
6962
|
-
|
|
6967
|
+
const apiUrl = this.configService.get('apiUrl');
|
|
6968
|
+
if (apiUrl === req.url.substr(0, apiUrl.length)) {
|
|
6963
6969
|
req = req.clone({ withCredentials: true });
|
|
6964
6970
|
}
|
|
6965
6971
|
const csrf = getCookie('csrftoken');
|
|
@@ -6973,11 +6979,12 @@ let HttpCookieInterceptor = class HttpCookieInterceptor {
|
|
|
6973
6979
|
};
|
|
6974
6980
|
HttpCookieInterceptor.ctorParameters = () => [
|
|
6975
6981
|
{ type: Injector },
|
|
6982
|
+
{ type: ConfigService },
|
|
6976
6983
|
{ type: String, decorators: [{ type: Inject, args: [PLATFORM_ID,] }] }
|
|
6977
6984
|
];
|
|
6978
6985
|
HttpCookieInterceptor = __decorate([
|
|
6979
6986
|
Injectable(),
|
|
6980
|
-
__param(
|
|
6987
|
+
__param(2, Inject(PLATFORM_ID))
|
|
6981
6988
|
], HttpCookieInterceptor);
|
|
6982
6989
|
|
|
6983
6990
|
/**
|