mobicloud-core 1.0.244 → 1.0.246

package/api/mobicloud-data.service.d.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import * as signalR from "@aspnet/signalr";
+import * as signalR from "@microsoft/signalr";
 import { MobicloudCoreService } from "mobicloud-core";
 import { IODataResult } from "mobicloud-core";
 import * as i0 from "@angular/core";

package/bundles/mobicloud-core-api.umd.js

@@ -1,6 +1,6 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs/operators'), require('rxjs'), require('@aspnet/signalr'), require('mobicloud-core'), require('@angular/localize/init'), require('moment')) :
-    typeof define === 'function' && define.amd ? define('mobicloud-core/api', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs/operators', 'rxjs', '@aspnet/signalr', 'mobicloud-core', '@angular/localize/init', 'moment'], factory) :
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs/operators'), require('rxjs'), require('@microsoft/signalr'), require('mobicloud-core'), require('@angular/localize/init'), require('moment')) :
+    typeof define === 'function' && define.amd ? define('mobicloud-core/api', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs/operators', 'rxjs', '@microsoft/signalr', 'mobicloud-core', '@angular/localize/init', 'moment'], factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global["mobicloud-core"] = global["mobicloud-core"] || {}, global["mobicloud-core"].api = {}), global.ng.core, global.ng.common, global.ng.common.http, global.rxjs.operators, global.rxjs, global.signalR, global["mobicloud-core"], global.ng.localize.init, global.moment));
 })(this, (function (exports, i0, common, i1, operators, rxjs, signalR, i2, init, moment) { 'use strict';
 
@@ -456,7 +456,7 @@
                                 'Access-Control-Allow-Origin': '*',
                                 'Authorization': (_a = this.coreService.authorizationHeader) !== null && _a !== void 0 ? _a : ''
                             };
-                            if (this.coreService.isMasterUserAuthenticated()) {
+                            if (this.coreService.isMasterUserAuthenticated() || this.coreService.hasMasterOrganization()) {
                                 strMasterOrganizationId = this.coreService.getMasterOrganization();
                                 if (strMasterOrganizationId) {
                                     headerVal['OrganizationId'] = strMasterOrganizationId;
@@ -510,13 +510,16 @@
         MobiCloudDataService.prototype.createHubConnection = function (name) {
             var _this = this;
             var _a, _b;
-            var options = {
-                accessTokenFactory: function () {
-                    return _this.getAccessToken();
-                }
-            };
+            var managedOrgParm = '';
+            if ((_a = this.coreService) === null || _a === void 0 ? void 0 : _a.hasMasterOrganization()) {
+                var strMasterOrganizationId = (_b = this.coreService) === null || _b === void 0 ? void 0 : _b.getMasterOrganization();
+                managedOrgParm = "?managedOrg=" + strMasterOrganizationId;
+                console.log("SignalR Master organization", strMasterOrganizationId);
+            }
             var connection = new signalR__namespace.HubConnectionBuilder()
-                .withUrl("" + ((_b = (_a = this.coreService) === null || _a === void 0 ? void 0 : _a.configService) === null || _b === void 0 ? void 0 : _b.getApiSiteUrl()) + name, options)
+                .withUrl("" + (this === null || this === void 0 ? void 0 : this.coreService.configService.getApiSiteUrl()) + name + managedOrgParm, {
+                accessTokenFactory: function () { return _this.getAccessToken(); }
+            })
                 .withAutomaticReconnect()
                 .build();
             return connection;