Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit d9ed6147cb5a1b34408342193896d9153a90898c
Author: Maneesh Tewani <mtewani@google.com>
Date:   Thu May 9 10:09:49 2024 -0700

    Fixed issue where transport is undefined
  • Loading branch information
maneesht committed May 9, 2024
1 parent 42eb5e5 commit 323fdc1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 17 deletions.
8 changes: 2 additions & 6 deletions packages/data-connect/src/api/DataConnect.ts
Expand Up @@ -60,8 +60,8 @@ export const FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR =
'FIREBASE_DATA_CONNECT_EMULATOR_HOST';

/**
*
* @param fullHost
*
* @param fullHost
* @returns TransportOptions
* @internal
*/
Expand Down Expand Up @@ -131,10 +131,6 @@ export class DataConnect {
this.app.options,
this.authProvider
);
this.authTokenProvider.addTokenChangeListener(token => {
logDebug(`New Token Available: ${token}`);
this._transport.onTokenChanged(token);
});
}

this.initialized = true;
Expand Down
12 changes: 4 additions & 8 deletions packages/data-connect/src/logger.ts
Expand Up @@ -14,21 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Logger, LogLevel, LogLevelString } from "@firebase/logger";
import { SDK_VERSION } from "./core/version";
import { Logger, LogLevel, LogLevelString } from '@firebase/logger';
import { SDK_VERSION } from './core/version';

const logger = new Logger('@firebase/data-connect');
export function setLogLevel(logLevel: LogLevelString) {
logger.setLogLevel(logLevel);
}
export function logDebug(msg: string): void {
// if (logger.logLevel <= LogLevel.DEBUG) {
logger.debug(`DataConnect (${SDK_VERSION}): ${msg}`);
// }
logger.debug(`DataConnect (${SDK_VERSION}): ${msg}`);
}

export function logError(msg: string): void {
// if (logger.logLevel <= LogLevel.ERROR) {
logger.error(`DataConnect (${SDK_VERSION}): ${msg}`);
// }
logger.error(`DataConnect (${SDK_VERSION}): ${msg}`);
}
4 changes: 1 addition & 3 deletions packages/data-connect/src/network/fetch.ts
Expand Up @@ -63,9 +63,7 @@ export function dcFetch<T, U>(
.then(res => {
if (res.errors && res.errors.length) {
const stringified = JSON.stringify(res.errors);
logError(
'DataConnect error while performing request: ' + stringified
);
logError('DataConnect error while performing request: ' + stringified);
throw new DataConnectError(Code.OTHER, stringified);
}
return res as { data: T; errors: Error[] };
Expand Down
5 changes: 5 additions & 0 deletions packages/data-connect/src/network/transport/rest.ts
Expand Up @@ -19,6 +19,7 @@ import { DataConnectTransport } from '.';
import { DataConnectOptions, TransportOptions } from '../../api/DataConnect';
import { DataConnectError, Code } from '../../core/error';
import { AuthTokenProvider } from '../../core/FirebaseAuthProvider';
import { logDebug } from '../../logger';
import { addToken, urlBuilder } from '../../util/url';
import { dcFetch } from '../fetch';

Expand Down Expand Up @@ -62,6 +63,10 @@ export class RESTTransport implements DataConnectTransport {
);
}
this.connectorName = connector;
this.authProvider?.addTokenChangeListener(token => {
logDebug(`New Token Available: ${token}`);
this.accessToken = token;
});
}
get endpointUrl(): string {
return urlBuilder(
Expand Down

0 comments on commit 323fdc1

Please sign in to comment.