diff options
author | Juan Manuel Bardallo juanmanuel.bardallo@sic.uhu.es <juanmanuel.bardallo@sic.uhu.es> | 2019-06-07 10:17:53 +0200 |
---|---|---|
committer | Juan Manuel Bardallo juanmanuel.bardallo@sic.uhu.es <juanmanuel.bardallo@sic.uhu.es> | 2019-06-07 10:17:53 +0200 |
commit | 5d14e4e6d407e31b79ef263996692623b441fa38 (patch) | |
tree | 167ab4217985fa1679b41d71b6c06dca76a03363 | |
parent | 4ba1d5aefc6c437334fa031c58ecddca0f926a13 (diff) |
Mejora en la implementación de auth 2, para refrescar el token de usuario
38 files changed, 197 insertions, 151 deletions
diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/index.js b/admin/WebConsole3/frontend/library/globunet-angular/core/index.js index 2c3c81a5..99cf9ecd 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/index.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/index.js @@ -1,7 +1,3 @@ -"use strict"; -function __export(m) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} -Object.defineProperty(exports, "__esModule", { value: true }); -__export(require("./models/models")); -__export(require("./providers/providers")); +export * from "./models/models"; +export * from "./providers/providers"; +//# sourceMappingURL=index.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/index.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/index.js.map new file mode 100644 index 00000000..eead278a --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js b/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js index d82a6a7d..2a472eb5 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js @@ -1,8 +1,6 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class Resource { +export class Resource { constructor() { this.id = 0; } } -exports.Resource = Resource; +//# sourceMappingURL=resource.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js.map new file mode 100644 index 00000000..e59675df --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/api/resource.js.map @@ -0,0 +1 @@ +{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../../src/models/api/resource.ts"],"names":[],"mappings":"AAAA,MAAM;IAAN;QACE,OAAE,GAAW,CAAC,CAAC;IAEjB,CAAC;CAAA"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js index f49f46cc..10755515 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js @@ -1,7 +1,5 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const resource_1 = require("./api/resource"); -class GlobunetCoordinates extends resource_1.Resource { +import { Resource } from "./api/resource"; +export class GlobunetCoordinates extends Resource { constructor() { super(...arguments); this.latitude = 0; @@ -9,8 +7,7 @@ class GlobunetCoordinates extends resource_1.Resource { this.radius = 0; } } -exports.GlobunetCoordinates = GlobunetCoordinates; -class GlobunetAddress extends resource_1.Resource { +export class GlobunetAddress extends Resource { constructor() { super(...arguments); this.formattedAddress = ""; @@ -27,4 +24,4 @@ class GlobunetAddress extends resource_1.Resource { this.coordinates = new GlobunetCoordinates(); } } -exports.GlobunetAddress = GlobunetAddress; +//# sourceMappingURL=globunet-address.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js.map new file mode 100644 index 00000000..0681a7af --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-address.js.map @@ -0,0 +1 @@ +{"version":3,"file":"globunet-address.js","sourceRoot":"","sources":["../../src/models/globunet-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAExC,MAAM,0BAA2B,SAAQ,QAAQ;IAAjD;;QACI,aAAQ,GAAW,CAAC,CAAC;QACrB,cAAS,GAAW,CAAC,CAAC;QACtB,WAAM,GAAW,CAAC,CAAC;IACvB,CAAC;CAAA;AAED,MAAM,sBAAuB,SAAQ,QAAQ;IAA7C;;QACI,qBAAgB,GAAW,EAAE,CAAC;QAC9B,eAAU,GAAW,EAAE,CAAC;QACxB,iBAAY,GAAW,EAAE,CAAC;QAC1B,eAAU,GAAW,EAAE,CAAC;QACxB,aAAQ,GAAW,EAAE,CAAC;QACtB,aAAQ,GAAW,EAAE,CAAC;QACtB,iBAAY,GAAW,EAAE,CAAC;QAC1B,UAAK,GAAW,EAAE,CAAC;QACnB,cAAS,GAAW,EAAE,CAAC;QACvB,YAAO,GAAW,EAAE,CAAC;QACrB,gBAAW,GAAW,EAAE,CAAC;QACzB,gBAAW,GAAwB,IAAI,mBAAmB,EAAE,CAAC;IACjE,CAAC;CAAA"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js index 63bdbe8e..18264d20 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js @@ -1,7 +1,5 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const resource_1 = require("./api/resource"); -class GlobunetMedia extends resource_1.Resource { +import { Resource } from "./api/resource"; +export class GlobunetMedia extends Resource { constructor() { super(...arguments); this.name = ""; @@ -10,8 +8,7 @@ class GlobunetMedia extends resource_1.Resource { this.contentType = ""; } } -exports.GlobunetMedia = GlobunetMedia; -class GlobunetGalleryHasMedia extends resource_1.Resource { +export class GlobunetGalleryHasMedia extends Resource { constructor() { super(...arguments); this.position = 0; @@ -19,8 +16,7 @@ class GlobunetGalleryHasMedia extends resource_1.Resource { this.media = new GlobunetMedia(); } } -exports.GlobunetGalleryHasMedia = GlobunetGalleryHasMedia; -class GlobunetGallery extends resource_1.Resource { +export class GlobunetGallery extends Resource { constructor() { super(...arguments); this.name = ""; @@ -30,4 +26,4 @@ class GlobunetGallery extends resource_1.Resource { this.galleryHasMedias = new GlobunetGalleryHasMedia(); } } -exports.GlobunetGallery = GlobunetGallery; +//# sourceMappingURL=globunet-media.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js.map new file mode 100644 index 00000000..57c8bfb7 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-media.js.map @@ -0,0 +1 @@ +{"version":3,"file":"globunet-media.js","sourceRoot":"","sources":["../../src/models/globunet-media.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAExC,MAAM,oBAAqB,SAAQ,QAAQ;IAA3C;;QACI,SAAI,GAAW,EAAE,CAAC;QAClB,gBAAW,GAAW,EAAE,CAAC;QACzB,YAAO,GAAY,IAAI,CAAC;QAExB,gBAAW,GAAW,EAAE,CAAC;IAC7B,CAAC;CAAA;AAED,MAAM,8BAA+B,SAAQ,QAAQ;IAArD;;QACI,aAAQ,GAAW,CAAC,CAAC;QACrB,YAAO,GAAY,KAAK,CAAC;QACzB,UAAK,GAAkB,IAAI,aAAa,EAAE,CAAC;IAC/C,CAAC;CAAA;AAED,MAAM,sBAAuB,SAAQ,QAAQ;IAA7C;;QACI,SAAI,GAAW,EAAE,CAAC;QAClB,YAAO,GAAW,EAAE,CAAC;QACrB,kBAAa,GAAW,EAAE,CAAC;QAC3B,YAAO,GAAY,KAAK,CAAC;QACzB,qBAAgB,GAA4B,IAAI,uBAAuB,EAAE,CAAC;IAC9E,CAAC;CAAA"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js index b97dce59..4eb612b6 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js @@ -1,6 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class GlobunetUser { +export class GlobunetUser { constructor() { this.id = 0; this.username = ""; @@ -13,4 +11,4 @@ class GlobunetUser { this.timezone = ""; } } -exports.GlobunetUser = GlobunetUser; +//# sourceMappingURL=globunet-user.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js.map new file mode 100644 index 00000000..da36f9e4 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/globunet-user.js.map @@ -0,0 +1 @@ +{"version":3,"file":"globunet-user.js","sourceRoot":"","sources":["../../src/models/globunet-user.ts"],"names":[],"mappings":"AAAA,MAAM;IAAN;QACS,OAAE,GAAW,CAAC,CAAC;QACf,aAAQ,GAAW,EAAE,CAAC;QACtB,UAAK,GAAW,EAAE,CAAC;QACnB,YAAO,GAAa,KAAK,CAAC;QAC1B,UAAK,GAAa,EAAE,CAAC;QACrB,cAAS,GAAW,EAAE,CAAC;QACvB,aAAQ,GAAW,EAAE,CAAC;QACtB,WAAM,GAAW,EAAE,CAAC;QACpB,aAAQ,GAAW,EAAE,CAAC;IAE/B,CAAC;CAAA"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js b/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js index a489fbeb..7226c575 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js @@ -1,6 +1,3 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var globunet_user_1 = require("./globunet-user"); -exports.GlobunetUser = globunet_user_1.GlobunetUser; -var resource_1 = require("./api/resource"); -exports.Resource = resource_1.Resource; +export { GlobunetUser } from "./globunet-user"; +export { Resource } from "./api/resource"; +//# sourceMappingURL=models.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js.map new file mode 100644 index 00000000..564f2bcc --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/models/models.js.map @@ -0,0 +1 @@ +{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js index 2662453c..841d9bd7 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js @@ -1,8 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var resource_service_1 = require("./api/resource.service"); -exports.ResourceService = resource_service_1.ResourceService; -var sub_resource_service_1 = require("./api/sub-resource.service"); -exports.SubResourceService = sub_resource_service_1.SubResourceService; -var serializer_1 = require("./api/serializer"); -exports.Serializer = serializer_1.Serializer; +export { ResourceService } from "./api/resource.service"; +export { SubResourceService } from "./api/sub-resource.service"; +export { Serializer } from "./api/serializer"; +//# sourceMappingURL=api.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js.map new file mode 100644 index 00000000..ac34da85 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api.js.map @@ -0,0 +1 @@ +{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/providers/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js index 5e94b296..83c0ef6e 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js @@ -1,6 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class QueryOptions { +export class QueryOptions { constructor(props) { this.offset = 0; this.limit = 10000; @@ -26,4 +24,4 @@ class QueryOptions { return queryString.substring(0, queryString.length - 1); } } -exports.QueryOptions = QueryOptions; +//# sourceMappingURL=query-options.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js.map new file mode 100644 index 00000000..4788f484 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/query-options.js.map @@ -0,0 +1 @@ +{"version":3,"file":"query-options.js","sourceRoot":"","sources":["../../../src/providers/api/query-options.ts"],"names":[],"mappings":"AAKA,MAAM;IAKJ,YAAY,KAAU;QACpB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,UAAU;QACR,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3C,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACzC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEvC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,EAAC;YAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;gBACxC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;aAC3C;SACF;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,aAAa;QACX,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;YACvD,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js index fe6f862c..ba259d58 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js @@ -1,7 +1,5 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const operators_1 = require("rxjs/operators"); -class ResourceService { +import { map } from 'rxjs/operators'; +export class ResourceService { constructor(httpClient, url, endpoint, serializer) { this.httpClient = httpClient; this.url = url; @@ -10,20 +8,20 @@ class ResourceService { } create(item) { return this.httpClient - .post(`${this.url}/${this.endpoint}`, this.serializer.toJson(item)).pipe(operators_1.map(data => this.serializer.fromJson(data))); + .post(`${this.url}/${this.endpoint}`, this.serializer.toJson(item)).pipe(map(data => this.serializer.fromJson(data))); } update(item) { return this.httpClient - .patch(`${this.url}/${this.endpoint}/${item.id}`, this.serializer.toJson(item)).pipe(operators_1.map(data => this.serializer.fromJson(data))); + .patch(`${this.url}/${this.endpoint}/${item.id}`, this.serializer.toJson(item)).pipe(map(data => this.serializer.fromJson(data))); } read(id) { return this.httpClient - .get(`${this.url}/${this.endpoint}/${id}`).pipe(operators_1.map((data) => this.serializer.fromJson(data))); + .get(`${this.url}/${this.endpoint}/${id}`).pipe(map((data) => this.serializer.fromJson(data))); } list(queryOptions) { const params = queryOptions ? "?" + queryOptions.toQueryString() : ""; return this.httpClient - .get(`${this.url}/${this.endpoint}${params}`).pipe(operators_1.map((data) => this.convertData(data))); + .get(`${this.url}/${this.endpoint}${params}`).pipe(map((data) => this.convertData(data))); } delete(id) { return this.httpClient @@ -36,4 +34,4 @@ class ResourceService { return data.map((item) => this.serializer.fromJson(item)); } } -exports.ResourceService = ResourceService; +//# sourceMappingURL=resource.service.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js.map new file mode 100644 index 00000000..c2c9f127 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/resource.service.js.map @@ -0,0 +1 @@ +{"version":3,"file":"resource.service.js","sourceRoot":"","sources":["../../../src/providers/api/resource.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAKrC,MAAM;IACN,YACc,UAAsB,EACtB,GAAW,EACX,QAAgB,EAChB,UAAsB;QAHtB,eAAU,GAAV,UAAU,CAAY;QACtB,QAAG,GAAH,GAAG,CAAQ;QACX,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAE/B,MAAM,CAAC,IAAO;QACnB,OAAO,IAAI,CAAC,UAAU;aACnB,IAAI,CAAI,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAC3E,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,MAAM,CAAC,IAAO;QACnB,OAAO,IAAI,CAAC,UAAU;aACnB,KAAK,CAAI,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,EAAE,EACjD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,EAAU;QACb,OAAO,IAAI,CAAC,UAAU;aACnB,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAC/C,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAC,YAA2B;QAC9B,MAAM,MAAM,GAAG,YAAY,CAAA,CAAC,CAAA,GAAG,GAAC,YAAY,CAAC,aAAa,EAAE,CAAA,CAAC,CAAA,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,UAAU;aACnB,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,GAAG,MAAM,EAAE,CAAC,CAAC,IAAI,CAClD,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,EAAU;QACf,OAAO,IAAI,CAAC,UAAU;aACnB,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC;IAES,WAAW,CAAC,IAAS;QAC7B,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC;YACpB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACjB;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;CACF"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js index a9cf145b..576a21a6 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js @@ -1,6 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class Serializer { +export class Serializer { fromJson(json) { if (typeof json != "object") { json = { response: json }; @@ -11,4 +9,4 @@ class Serializer { return JSON.parse(JSON.stringify(resource)); } } -exports.Serializer = Serializer; +//# sourceMappingURL=serializer.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js.map new file mode 100644 index 00000000..e283a5f7 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/serializer.js.map @@ -0,0 +1 @@ +{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../../src/providers/api/serializer.ts"],"names":[],"mappings":"AAEA,MAAM;IACJ,QAAQ,CAAC,IAAS;QACjB,IAAG,OAAO,IAAI,IAAI,QAAQ,EAAC;YAC1B,IAAI,GAAG,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;SACxB;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,QAAkB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js index a27772d1..bc5c8d1a 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js @@ -1,7 +1,5 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const operators_1 = require("rxjs/operators"); -class SubResourceService { +import { map } from 'rxjs/operators'; +export class SubResourceService { constructor(httpClient, url, parentEndpoint, endpoint, serializer) { this.httpClient = httpClient; this.url = url; @@ -11,20 +9,20 @@ class SubResourceService { } create(parentId, item) { return this.httpClient - .post(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}`, this.serializer.toJson(item)).pipe(operators_1.map((data) => this.serializer.fromJson(data))); + .post(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}`, this.serializer.toJson(item)).pipe(map((data) => this.serializer.fromJson(data))); } update(parentId, item) { return this.httpClient - .patch(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}/${item.id}`, this.serializer.toJson(item)).pipe(operators_1.map((data) => this.serializer.fromJson(data))); + .patch(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}/${item.id}`, this.serializer.toJson(item)).pipe(map((data) => this.serializer.fromJson(data))); } read(parentId, id) { return this.httpClient - .get(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}/${id}`).pipe(operators_1.map((data) => this.serializer.fromJson(data))); + .get(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}/${id}`).pipe(map((data) => this.serializer.fromJson(data))); } list(parentId, queryOptions) { const params = queryOptions ? "?" + queryOptions.toQueryString() : ""; return this.httpClient - .get(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}${params}`).pipe(operators_1.map((data) => this.convertData(data))); + .get(`${this.url}/${this.parentEndpoint}/${parentId}/${this.endpoint}${params}`).pipe(map((data) => this.convertData(data))); } delete(parentId, id) { return this.httpClient @@ -37,4 +35,4 @@ class SubResourceService { return data.map((item) => this.serializer.fromJson(item)); } } -exports.SubResourceService = SubResourceService; +//# sourceMappingURL=sub-resource.service.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js.map new file mode 100644 index 00000000..dadbcfda --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/api/sub-resource.service.js.map @@ -0,0 +1 @@ +{"version":3,"file":"sub-resource.service.js","sourceRoot":"","sources":["../../../src/providers/api/sub-resource.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAIrC,MAAM;IACJ,YACU,UAAsB,EACtB,GAAW,EACX,cAAsB,EACtB,QAAgB,EAChB,UAAsB;QAJtB,eAAU,GAAV,UAAU,CAAY;QACtB,QAAG,GAAH,GAAG,CAAQ;QACX,mBAAc,GAAd,cAAc,CAAQ;QACtB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAY;IAAK,CAAC;IAE/B,MAAM,CAAC,QAAgB,EAAC,IAAO;QACtC,OAAO,IAAI,CAAC,UAAU;aACnB,IAAI,CAAI,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,EACxE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAClC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,QAAgB,EAAC,IAAO;QACpC,OAAO,IAAI,CAAC,UAAU;aACnB,KAAK,CAAI,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,EAAE,EACpF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACpC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAC,QAAgB,EAAE,EAAU;QAC/B,OAAO,IAAI,CAAC,UAAU;aACnB,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAClF,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAC,QAAgB,EAAE,YAA2B;QAChD,MAAM,MAAM,GAAG,YAAY,CAAA,CAAC,CAAA,GAAG,GAAC,YAAY,CAAC,aAAa,EAAE,CAAA,CAAC,CAAA,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,UAAU;aACnB,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,IAAI,CAAC,QAAQ,GAAG,MAAM,EAAE,CAAC,CAAC,IAAI,CACrF,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,QAAgB,EAAE,EAAU;QACjC,OAAO,IAAI,CAAC,UAAU;aACnB,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,cAAc,IAAI,QAAQ,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC;IACrF,CAAC;IAES,WAAW,CAAC,IAAS;QAC7B,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC;YACpB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACjB;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;CACF"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js index 8dad4869..dddb8f11 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js @@ -1,9 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var auth_module_1 = require("./auth/auth.module"); -exports.AuthModule = auth_module_1.AuthModule; -var auth_service_1 = require("./auth/auth.service"); -exports.AuthConfig = auth_service_1.AuthConfig; -exports.AuthService = auth_service_1.AuthService; -var token_interceptor_service_1 = require("./auth/token-interceptor.service"); -exports.TokenInterceptorService = token_interceptor_service_1.TokenInterceptorService; +export { AuthModule } from "./auth/auth.module"; +export { AuthConfig, AuthService } from "./auth/auth.service"; +export { TokenInterceptorService } from "./auth/token-interceptor.service"; +//# sourceMappingURL=auth.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js.map new file mode 100644 index 00000000..f2da0443 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth.js.map @@ -0,0 +1 @@ +{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/providers/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAC,uBAAuB,EAAC,MAAM,kCAAkC,CAAC"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js index d8a2ac50..d858c119 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js @@ -1,28 +1,28 @@ -"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; -Object.defineProperty(exports, "__esModule", { value: true }); var AuthModule_1; -"use strict"; -const core_1 = require("@angular/core"); -const common_1 = require("@angular/common"); -const http_1 = require("@angular/common/http"); -const rxjs_1 = require("rxjs"); -const auth_service_1 = require("./auth.service"); -const auth_service_2 = require("./auth.service"); -const globunet_user_1 = require("../../models/globunet-user"); +import { NgModule, Optional, SkipSelf, Inject } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HttpClientModule } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { AuthConfig } from './auth.service'; +import { AuthService } from './auth.service'; +import { GlobunetUser } from "../../models/globunet-user"; let AuthModule = AuthModule_1 = class AuthModule { constructor(authService, parentModule) { this.authService = authService; this.storageKey = ''; - this.loggedUser = new globunet_user_1.GlobunetUser(); + this.loggedUser = new GlobunetUser(); if (parentModule) { throw new Error('AuthModule is already loaded. Import it in the AppModule only'); } @@ -40,12 +40,12 @@ let AuthModule = AuthModule_1 = class AuthModule { return { ngModule: AuthModule_1, providers: [ - { provide: auth_service_1.AuthConfig, useValue: config } + { provide: AuthConfig, useValue: config } ] }; } login(username, password, user) { - return new rxjs_1.Observable((observer) => { + return new Observable((observer) => { this.authService.getAccessToken(username, password).subscribe(data => { this.storageKey = username + "_" + btoa(password); localStorage.setItem("AuthModule.storageKey", this.storageKey); @@ -79,10 +79,12 @@ let AuthModule = AuthModule_1 = class AuthModule { } }; AuthModule = AuthModule_1 = __decorate([ - core_1.NgModule({ - imports: [common_1.CommonModule, http_1.HttpClientModule], - providers: [auth_service_2.AuthService] + NgModule({ + imports: [CommonModule, HttpClientModule], + providers: [AuthService] }), - __param(0, core_1.Inject(auth_service_2.AuthService)), __param(1, core_1.Optional()), __param(1, core_1.Inject(AuthModule_1)), __param(1, core_1.SkipSelf()) + __param(0, Inject(AuthService)), __param(1, Optional()), __param(1, Inject(AuthModule_1)), __param(1, SkipSelf()), + __metadata("design:paramtypes", [AuthService, AuthModule]) ], AuthModule); -exports.AuthModule = AuthModule; +export { AuthModule }; +//# sourceMappingURL=auth.module.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js.map new file mode 100644 index 00000000..1ab5e9d9 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.module.js.map @@ -0,0 +1 @@ +{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../src/providers/auth/auth.module.ts"],"names":[],"mappings":"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"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.d.ts b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.d.ts index 9843c348..0e914f12 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.d.ts +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.d.ts @@ -19,7 +19,8 @@ export declare class AuthService { constructor(config: AuthConfig, http: HttpClient); setAuthorizationToken(data: any): void; getAccessToken(username: string, password: string): Observable<any>; - getAuthorizationToken(): string | null; + getRefreshToken(): Observable<any>; + getAuthorizationToken(): string; me(): Observable<GlobunetUser>; logout(): void; private log; diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js index ddaa899d..7a72709a 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js @@ -1,19 +1,21 @@ -"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; -Object.defineProperty(exports, "__esModule", { value: true }); -const core_1 = require("@angular/core"); -const http_1 = require("@angular/common/http"); -const rxjs_1 = require("rxjs"); -const operators_1 = require("rxjs/operators"); -class AuthConfig { +import { Injectable, Inject } from '@angular/core'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { throwError } from 'rxjs'; +import { Observable } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; +export class AuthConfig { constructor(environment) { this.BASE_URL = ""; this.OAUTH_DOMAIN = ""; @@ -29,7 +31,6 @@ class AuthConfig { } } } -exports.AuthConfig = AuthConfig; /* Generated class for the AuthService provider. @@ -43,7 +44,7 @@ let AuthService = class AuthService { this.refreshToken = ""; this.tokenType = ""; this.httpOptions = { - headers: new http_1.HttpHeaders({ + headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Accept': 'application/json' }) @@ -60,7 +61,7 @@ let AuthService = class AuthService { this.httpOptions.headers = this.httpOptions.headers.set("Authorization", "Bearer " + data.access_token); } else { - this.httpOptions.headers = new http_1.HttpHeaders({ + this.httpOptions.headers = new HttpHeaders({ 'Content-Type': 'application/json', 'Accept': 'application/json' }); @@ -68,11 +69,22 @@ let AuthService = class AuthService { } getAccessToken(username, password) { var url = this.environment.BASE_URL + this.environment.OAUTH_DOMAIN + "?client_id=" + this.environment.OAUTH_CLIENT_ID + "&client_secret=" + this.environment.OAUTH_CLIENT_SECRET + "&grant_type=password&username=" + username + "&password=" + password; - return this.http.get(url).pipe(operators_1.map(data => { + return this.http.get(url).pipe(map(data => { this.setAuthorizationToken(data); return data; - }), operators_1.catchError((error) => { - return this.handleError(error); + }), catchError((error) => { + return throwError(error); + })); + } + getRefreshToken() { + var url = this.environment.BASE_URL + this.environment.OAUTH_DOMAIN + "?client_id=" + this.environment.OAUTH_CLIENT_ID + "&client_secret=" + this.environment.OAUTH_CLIENT_SECRET + "&grant_type=refresh_token&refresh_token=" + this.refreshToken; + return new Observable((observer => { + this.http.get(url).subscribe(data => { + this.setAuthorizationToken(data); + observer.next(data); + }, error => { + this.logout(); + }); })); } getAuthorizationToken() { @@ -108,14 +120,16 @@ let AuthService = class AuthService { } console.error(msg); // return an observable with a user-facing error message - return rxjs_1.throwError(msg); + return throwError(msg); } ; }; AuthService = __decorate([ - core_1.Injectable({ + Injectable({ providedIn: 'root' }), - __param(0, core_1.Inject(AuthConfig)), __param(1, core_1.Inject(http_1.HttpClient)) + __param(0, Inject(AuthConfig)), __param(1, Inject(HttpClient)), + __metadata("design:paramtypes", [AuthConfig, HttpClient]) ], AuthService); -exports.AuthService = AuthService; +export { AuthService }; +//# sourceMappingURL=auth.service.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js.map new file mode 100644 index 00000000..765f9774 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/auth.service.js.map @@ -0,0 +1 @@ +{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/providers/auth/auth.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.d.ts b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.d.ts index 2ff5c25c..7042e327 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.d.ts +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.d.ts @@ -1,8 +1,14 @@ -import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http'; -import { Observable } from 'rxjs'; -import { AuthService } from './auth.service'; +import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from "@angular/common/http"; +import { Observable } from "rxjs"; +import { AuthService } from "./auth.service"; export declare class TokenInterceptorService implements HttpInterceptor { auth: AuthService; + private AUTH_HEADER; + private token; + private refreshTokenInProgress; + private refreshTokenSubject; constructor(auth: AuthService); - intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>; + intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>; + private refreshAccessToken; + private addAuthenticationToken; } diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js index 0adf247b..1f8205dd 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js @@ -1,34 +1,82 @@ -"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; -Object.defineProperty(exports, "__esModule", { value: true }); -const core_1 = require("@angular/core"); -const auth_service_1 = require("./auth.service"); +import { Inject, Injectable } from "@angular/core"; +import { throwError, BehaviorSubject } from "rxjs"; +import { catchError, filter, take, switchMap, finalize } from "rxjs/operators"; +import { AuthService } from "./auth.service"; let TokenInterceptorService = class TokenInterceptorService { constructor(auth) { this.auth = auth; + this.AUTH_HEADER = "Authorization"; + this.token = "secrettoken"; + this.refreshTokenInProgress = false; + this.refreshTokenSubject = new BehaviorSubject(null); } - intercept(request, next) { - const token = this.auth.getAuthorizationToken(); - if (token != null) { - request = request.clone({ - setHeaders: { - Authorization: token - } + intercept(req, next) { + if (!req.headers.has('Content-Type')) { + req = req.clone({ + headers: req.headers.set('Content-Type', 'application/json') }); } - return next.handle(request); + req = this.addAuthenticationToken(req); + return next.handle(req).pipe(catchError((error) => { + if (error && error.status === 401) { + // 401 errors are most likely going to be because we have an expired token that we need to refresh. + if (this.refreshTokenInProgress) { + // If refreshTokenInProgress is true, we will wait until refreshTokenSubject has a non-null value + // which means the new token is ready and we can retry the request again + return this.refreshTokenSubject.pipe(filter(result => result !== null), take(1), switchMap(() => next.handle(this.addAuthenticationToken(req)))); + } + else { + this.refreshTokenInProgress = true; + // Set the refreshTokenSubject to null so that subsequent API calls will wait until the new token has been retrieved + this.refreshTokenSubject.next(null); + return this.refreshAccessToken().pipe(switchMap((success) => { + this.refreshTokenSubject.next(success); + this.refreshTokenInProgress = false; + return next.handle(this.addAuthenticationToken(req)); + }), + // When the call to refreshToken completes we reset the refreshTokenInProgress to false + // for the next time the token needs to be refreshed + finalize(() => { + this.refreshTokenInProgress = false; + })); + } + } + else { + return throwError(error); + } + })); + } + refreshAccessToken() { + return this.auth.getRefreshToken(); + } + addAuthenticationToken(request) { + // If we do not have a token yet then we should not set the header. + // Here we could first retrieve the token from where we store it. + this.token = this.auth.getAuthorizationToken(); + if (!this.token) { + return request; + } + return request.clone({ + headers: request.headers.set(this.AUTH_HEADER, this.token) + }); } }; TokenInterceptorService = __decorate([ - core_1.Injectable(), - __param(0, core_1.Inject(auth_service_1.AuthService)) + Injectable(), + __param(0, Inject(AuthService)), + __metadata("design:paramtypes", [AuthService]) ], TokenInterceptorService); -exports.TokenInterceptorService = TokenInterceptorService; +export { TokenInterceptorService }; +//# sourceMappingURL=token-interceptor.service.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js.map new file mode 100644 index 00000000..0dff6cb4 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/auth/token-interceptor.service.js.map @@ -0,0 +1 @@ +{"version":3,"file":"token-interceptor.service.js","sourceRoot":"","sources":["../../../src/providers/auth/token-interceptor.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js index a51331bc..fa7d2947 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js @@ -1,4 +1,2 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var translate_extract_1 = require("./i18n/translate-extract"); -exports.tr = translate_extract_1.tr; +export { tr } from "./i18n/translate-extract"; +//# sourceMappingURL=i18n.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js.map new file mode 100644 index 00000000..b42c8d0d --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n.js.map @@ -0,0 +1 @@ +{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/providers/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js index d54d7582..a2e34902 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js @@ -1,6 +1,4 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -function tr(str) { +export function tr(str) { return str; } -exports.tr = tr; +//# sourceMappingURL=translate-extract.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js.map new file mode 100644 index 00000000..75b7b7d3 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/i18n/translate-extract.js.map @@ -0,0 +1 @@ +{"version":3,"file":"translate-extract.js","sourceRoot":"","sources":["../../../src/providers/i18n/translate-extract.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAW;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC"}
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js index b2540f70..82908de0 100644 --- a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js @@ -1,8 +1,4 @@ -"use strict"; -function __export(m) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} -Object.defineProperty(exports, "__esModule", { value: true }); -__export(require("./api")); -__export(require("./auth")); -__export(require("./i18n")); +export * from "./api"; +export * from "./auth"; +export * from "./i18n"; +//# sourceMappingURL=providers.js.map
\ No newline at end of file diff --git a/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js.map b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js.map new file mode 100644 index 00000000..6abe67b2 --- /dev/null +++ b/admin/WebConsole3/frontend/library/globunet-angular/core/providers/providers.js.map @@ -0,0 +1 @@ +{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/providers/providers.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC"}
\ No newline at end of file |