Skip to content

Commit 872420f

Browse files
Merge pull request #70 from angular/master
Create a new pull request by comparing changes across two branches
2 parents 367cb3b + ca43c8b commit 872420f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/auth/router-guards.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const routes: Routes = [
6161
6262
### Compose your own pipes
6363
64-
`AngularFireAuthGuard` pipes are RXJS operators which transform an optional User to a boolean or Array (for redirects). You can build easily build your own to customize behavior further:
64+
`AngularFireAuthGuard` pipes are RXJS operators which transform an optional User to a boolean or Array (for redirects). You can easily build your own to customize behavior further:
6565
6666
```ts
6767
import { map } from 'rxjs/operators';
@@ -99,4 +99,4 @@ const onlyAllowSelf = (next) => map(user => !!user && next.params.userId === use
9999
// Only allow navigation to the route if the user has a custom claim matching :accountId
100100
// { path: 'accounts/:accountId/billing', component: BillingDetailsComponent, ...canActivate(accountAdmin) }
101101
const accountAdmin = (next) => pipe(customClaims, map(claims => claims[`account-${next.params.accountId}-role`] === "admin"));
102-
```
102+
```

src/database/interfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export interface AngularFireList<T> {
99
snapshotChanges(events?: ChildEvent[]): Observable<SnapshotAction<T>[]>;
1010
stateChanges(events?: ChildEvent[]): Observable<SnapshotAction<T>>;
1111
auditTrail(events?: ChildEvent[]): Observable<SnapshotAction<T>[]>;
12-
update(item: FirebaseOperation, data: T): Promise<void>;
12+
update(item: FirebaseOperation, data: Partial<T>): Promise<void>;
1313
set(item: FirebaseOperation, data: T): Promise<void>;
1414
push(data: T): database.ThenableReference;
1515
remove(item?: FirebaseOperation): Promise<void>;

0 commit comments

Comments
 (0)