Skip to content

Commit 0af1006

Browse files
committed
Remove references to app-types from packages-exp
1 parent d31f27f commit 0af1006

File tree

5 files changed

+28
-24
lines changed

5 files changed

+28
-24
lines changed

common/api-review/auth-exp.api.md

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,10 @@ export class EmailAuthProvider implements AuthProvider {
216216
readonly providerId = ProviderId.PASSWORD;
217217
}
218218

219+
// Warning: (ae-forgotten-export) The symbol "BaseOAuthProvider" needs to be exported by the entry point index.d.ts
220+
//
219221
// @public
220-
export class FacebookAuthProvider extends OAuthProvider {
222+
export class FacebookAuthProvider extends BaseOAuthProvider {
221223
constructor();
222224
static credential(accessToken: string): OAuthCredential;
223225
static credentialFromError(error: FirebaseError): OAuthCredential | null;
@@ -255,7 +257,7 @@ export function getMultiFactorResolver(auth: Auth, error: MultiFactorError_2): M
255257
export function getRedirectResult(auth: Auth, resolver?: PopupRedirectResolver): Promise<UserCredential | null>;
256258

257259
// @public
258-
export class GithubAuthProvider extends OAuthProvider {
260+
export class GithubAuthProvider extends BaseOAuthProvider {
259261
constructor();
260262
static credential(accessToken: string): OAuthCredential;
261263
static credentialFromError(error: FirebaseError): OAuthCredential | null;
@@ -265,7 +267,7 @@ export class GithubAuthProvider extends OAuthProvider {
265267
}
266268

267269
// @public
268-
export class GoogleAuthProvider extends OAuthProvider {
270+
export class GoogleAuthProvider extends BaseOAuthProvider {
269271
constructor();
270272
static credential(idToken?: string | null, accessToken?: string | null): OAuthCredential;
271273
static credentialFromError(error: FirebaseError): OAuthCredential | null;
@@ -380,23 +382,13 @@ export interface OAuthCredentialOptions {
380382
}
381383

382384
// @public
383-
export class OAuthProvider implements AuthProvider {
384-
constructor(providerId: string);
385-
addScope(scope: string): AuthProvider;
385+
export class OAuthProvider extends BaseOAuthProvider {
386386
credential(params: OAuthCredentialOptions): OAuthCredential;
387387
static credentialFromError(error: FirebaseError): OAuthCredential | null;
388388
// (undocumented)
389389
static credentialFromJSON(json: object | string): OAuthCredential;
390390
static credentialFromResult(userCredential: UserCredential): OAuthCredential | null;
391-
// @internal (undocumented)
392-
defaultLanguageCode: string | null;
393-
getCustomParameters(): CustomParameters;
394-
getScopes(): string[];
395-
// (undocumented)
396-
readonly providerId: string;
397-
setCustomParameters(customOAuthParameters: CustomParameters): AuthProvider;
398-
setDefaultLanguage(languageCode: string | null): void;
399-
}
391+
}
400392

401393
// @public
402394
export function onAuthStateChanged(auth: Auth, nextOrObserver: NextOrObserver<User>, error?: ErrorFn, completed?: CompleteFn): Unsubscribe;
@@ -566,6 +558,19 @@ export class RecaptchaVerifier implements ApplicationVerifierInternal {
566558
// @public
567559
export function reload(user: User): Promise<void>;
568560

561+
// Warning: (ae-forgotten-export) The symbol "FederatedAuthProvider" needs to be exported by the entry point index.d.ts
562+
//
563+
// @public
564+
export class SAMLAuthProvider extends FederatedAuthProvider {
565+
constructor(providerId: string);
566+
// (undocumented)
567+
static credentialFromError(error: FirebaseError): AuthCredential | null;
568+
// (undocumented)
569+
static credentialFromJSON(json: string | object): AuthCredential;
570+
// (undocumented)
571+
static credentialFromResult(userCredential: UserCredential): AuthCredential | null;
572+
}
573+
569574
// @public
570575
export function sendEmailVerification(user: User, actionCodeSettings?: ActionCodeSettings | null): Promise<void>;
571576

@@ -626,7 +631,7 @@ export function signInWithRedirect(auth: Auth, provider: AuthProvider, resolver?
626631
export function signOut(auth: Auth): Promise<void>;
627632

628633
// @public
629-
export class TwitterAuthProvider extends OAuthProvider {
634+
export class TwitterAuthProvider extends BaseOAuthProvider {
630635
constructor();
631636
static credential(token: string, secret: string): OAuthCredential;
632637
static credentialFromError(error: FirebaseError): OAuthCredential | null;

packages-exp/analytics-compat/src/service.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
import { expect, use } from 'chai';
1818
import { AnalyticsService } from './service';
19-
import { firebase } from '@firebase/app-compat';
20-
import { FirebaseApp } from '@firebase/app-types';
19+
import { firebase, FirebaseApp } from '@firebase/app-compat';
2120
import * as analyticsExp from '@firebase/analytics-exp';
2221
import { stub, match, SinonStub } from 'sinon';
2322
import * as sinonChai from 'sinon-chai';

packages-exp/performance-compat/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
},
2828
"license": "Apache-2.0",
2929
"peerDependencies": {
30-
"@firebase/app-compat": "0.x",
31-
"@firebase/app-types": "0.x"
30+
"@firebase/app-compat": "0.x"
3231
},
3332
"dependencies": {
3433
"@firebase/performance-exp": "0.0.900",

packages-exp/performance-compat/src/performance.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { FirebaseApp } from '@firebase/app-types';
1918
import {
2019
trace,
2120
FirebasePerformance,
2221
// The PerformanceTrace type has not changed between modular and non-modular packages.
2322
PerformanceTrace
2423
} from '@firebase/performance-exp';
2524
import { FirebasePerformance as FirebasePerformanceCompat } from '@firebase/performance-types';
26-
import { _FirebaseService } from '@firebase/app-compat';
25+
import { FirebaseApp, _FirebaseService } from '@firebase/app-compat';
2726

2827
export class PerformanceCompatImpl
2928
implements FirebasePerformanceCompat, _FirebaseService {

packages-exp/performance-compat/test/util.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { FirebaseApp } from '@firebase/app-types';
18+
import { FirebaseApp } from '@firebase/app-compat';
19+
import { _FirebaseAppInternal } from '@firebase/app-exp';
1920
import {
2021
FirebasePerformance,
2122
PerformanceTrace
@@ -34,7 +35,8 @@ export function getFakeApp(): FirebaseApp {
3435
appId: '1:777777777777:web:d93b5ca1475efe57'
3536
},
3637
automaticDataCollectionEnabled: true,
37-
delete: async () => {}
38+
delete: async () => {},
39+
_delegate: {} as _FirebaseAppInternal
3840
};
3941
}
4042

0 commit comments

Comments
 (0)