Skip to content

Commit

Permalink
build(deps): migrate to firebase 8 (#2584)
Browse files Browse the repository at this point in the history
BREAKING CHANGE:
Requires `@angular/fire` 6.1.0+ and `firebase` 8.0.0+.
  • Loading branch information
n0mer committed Dec 12, 2020
1 parent 847bc99 commit b7a2c6e
Show file tree
Hide file tree
Showing 8 changed files with 535 additions and 234 deletions.
750 changes: 525 additions & 225 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"@angular/common": "^11.0.1",
"@angular/compiler": "^11.0.1",
"@angular/core": "^11.0.1",
"@angular/fire": "^6.0.0",
"@angular/fire": "^6.1.0",
"@angular/forms": "^11.0.1",
"@angular/localize": "^11.0.1",
"@angular/platform-browser": "^11.0.1",
Expand All @@ -103,7 +103,7 @@
"date-fns": "2",
"docsearch.js": "^2.5.2",
"eva-icons": "^1.1.2",
"firebase": "^7.14.5",
"firebase": "^8.0.0",
"gulp-bump": "2.7.0",
"highlight.js": "9.12.0",
"intersection-observer": "0.7.0",
Expand Down
4 changes: 2 additions & 2 deletions src/framework/firebase-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"@angular/core": "^11.0.0",
"@nebular/auth": "6.2.1",
"rxjs": "^6.5.1",
"firebase": "^7.14.5",
"@angular/fire": "^6.0.0"
"firebase": "^8.0.0",
"@angular/fire": "^6.1.0"
},
"sideEffects": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Observable, of as observableOf, from } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
import { NbAuthResult, NbAuthIllegalTokenError, NbAuthStrategy } from '@nebular/auth';

import firebase from 'firebase/app';
import UserCredential = firebase.auth.UserCredential;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { catchError, switchMap } from 'rxjs/operators';
import { NbFirebaseBaseStrategy } from '../base/firebase-base.strategy';
import { NbFirebaseIdentityProviderStrategyOptions } from '../base/firebase-identity-provider-strategy.options';

import * as firebase from 'firebase/app';
import firebase from 'firebase/app';
import 'firebase/auth';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { NbAuthStrategyClass, NbAuthResult, NbAuthStrategyOptions } from '@nebul
import { NbFirebaseBaseStrategy } from '../base/firebase-base.strategy';
import { NbFirebaseIdentityProviderStrategyOptions } from '../base/firebase-identity-provider-strategy.options';

import * as firebase from 'firebase/app';
import firebase from 'firebase/app';
import 'firebase/auth';

@Injectable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { Injectable } from '@angular/core';
import { User } from 'firebase';
import firebase from 'firebase/app';
import { Observable, of as observableOf, from } from 'rxjs';
import { catchError, map, switchMap, take } from 'rxjs/operators';
import { NbAuthStrategyOptions, NbAuthStrategyClass, NbAuthResult } from '@nebular/auth';
Expand Down Expand Up @@ -114,7 +114,7 @@ export class NbFirebasePasswordStrategy extends NbFirebaseBaseStrategy {
);
}

protected refreshIdToken(user: User, module): Observable<NbAuthResult> {
protected refreshIdToken(user: firebase.User, module): Observable<NbAuthResult> {
return from(user.getIdToken(true))
.pipe(
map(token => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { NbAuthStrategyClass, NbAuthResult, NbAuthStrategyOptions } from '@nebul
import { NbFirebaseBaseStrategy } from '../base/firebase-base.strategy';
import { NbFirebaseIdentityProviderStrategyOptions } from '../base/firebase-identity-provider-strategy.options';

import * as firebase from 'firebase/app';
import firebase from 'firebase/app';
import 'firebase/auth';

@Injectable()
Expand Down

0 comments on commit b7a2c6e

Please sign in to comment.