From a54ceae413fe1ad912da7f0b11dd38491d1034be Mon Sep 17 00:00:00 2001
From: David East <deast@google.com>
Date: Fri, 12 Aug 2016 15:42:28 -0700
Subject: [PATCH 1/2] fix(auth): Auth config for initializeApp
---
package.json | 6 +++---
src/angularfire2.ts | 3 ++-
src/auth/auth_backend.ts | 2 --
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 098dc3413..a95d2de56 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "angularfire2",
- "version": "2.0.0-beta.2",
+ "version": "2.0.0-beta.3-pre",
"description": "",
"main": "./dist/angularfire2.js",
"jsnext:main": "./dist/esm/angularfire2.js",
@@ -9,8 +9,8 @@
"test:watch": "karma start",
"build": "rm -rf dist; tsc",
"build:watch": "rm -rf dist && tsc -w",
- "build_npm": "rm -rf dist && ngc -p tsconfig.publish.es5.json && ngc -p tsconfig.publish.es6.json",
- "postbuild_npm": "cp manual_typings/firebase3/firebase3.d.ts package.json README.md .npmignore dist/ && npm run rewrite_npm_package",
+ "build_npm": "rm -rf dist && ngc -p tsconfig.publish.es5.json && ngc -p tsconfig.publish.es6.json && npm run postbuild_npm",
+ "postbuild_npm": "cp package.json README.md .npmignore dist/ && npm run rewrite_npm_package",
"rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js",
"e2e_test": "webdriver-manager update && npm run build_e2e && protractor",
"build_e2e": "rm -rf dist-test && npm run build && tsc -p test/ && cp test/e2e/firebase_object/index.html dist-test/e2e/firebase_object/ && cp test/e2e/firebase_list/index.html dist-test/e2e/firebase_list/ && cp test/e2e/auth/index.html dist-test/e2e/auth/",
diff --git a/src/angularfire2.ts b/src/angularfire2.ts
index a84759658..3747748ac 100644
--- a/src/angularfire2.ts
+++ b/src/angularfire2.ts
@@ -1,6 +1,7 @@
import { initializeApp } from 'firebase';
import * as utils from './utils';
import { FirebaseAppConfig } from './interfaces';
+import { AuthConfiguration } from './auth';
import {
FirebaseListFactoryOpts,
FirebaseObjectFactoryOpts,
@@ -109,7 +110,7 @@ export const defaultFirebase = (config: FirebaseAppConfig): any => {
providers: FIREBASE_PROVIDERS
})
export class AngularFireModule {
- static initializeApp(config: FirebaseAppConfig, authConfig?:FirebaseAppConfig): ModuleWithProviders {
+ static initializeApp(config: FirebaseAppConfig, authConfig?:AuthConfiguration): ModuleWithProviders {
return {
ngModule: AngularFireModule,
providers: [
diff --git a/src/auth/auth_backend.ts b/src/auth/auth_backend.ts
index e8a29f41c..60489cf48 100644
--- a/src/auth/auth_backend.ts
+++ b/src/auth/auth_backend.ts
@@ -37,8 +37,6 @@ export enum AuthMethods {
export interface AuthConfiguration {
method?: AuthMethods;
provider?: AuthProviders;
- remember?: string;
- scope?: string[];
}
export interface FirebaseAuthState {
From 5039a4b14a851322344b8badd9c2d54c4e8a2117 Mon Sep 17 00:00:00 2001
From: David East <deast@google.com>
Date: Fri, 12 Aug 2016 16:04:07 -0700
Subject: [PATCH 2/2] mend
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a95d2de56..99c451750 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "angularfire2",
- "version": "2.0.0-beta.3-pre",
+ "version": "2.0.0-beta.2",
"description": "",
"main": "./dist/angularfire2.js",
"jsnext:main": "./dist/esm/angularfire2.js",