Update to Angular2 RC6

Author: neroniaky

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Change Log
 
 ## v0.1.4
-**Bugfixes:**
+**Features:**
 - Added packaged library to npm package for systemjs support (fixes [#6](https://github.com/neroniaky/angular2-token/issues/6))
+- Update Dependencies to Angular2 RC6
 
 ## v0.1.3
 **Bugfixes:**

config/spec-bundle.js

@@ -8,20 +8,21 @@ require('ts-helpers');
 
 require('zone.js/dist/zone');
 require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/jasmine-patch');
+require('zone.js/dist/proxy'); // since zone.js 0.6.15
+require('zone.js/dist/sync-test');
+require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14
 require('zone.js/dist/async-test');
 require('zone.js/dist/fake-async-test');
-require('zone.js/dist/sync-test');
 
 // RxJS
 require('rxjs/Rx');
 
 var testing = require('@angular/core/testing');
 var browser = require('@angular/platform-browser-dynamic/testing');
 
-testing.setBaseTestProviders(
-	browser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-	browser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
+testing.TestBed.initTestEnvironment(
+  browser.BrowserDynamicTestingModule,
+  browser.platformBrowserDynamicTesting()
 );
 
 var testContext = require.context('../src', true, /\.spec\.ts/);

package.json

@@ -14,51 +14,53 @@
     "token authentication"
   ],
   "peerDependencies": {
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/http": "2.0.0-rc.5",
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/router": "^3.0.0-rc.1",
-    "rxjs": "5.0.0-beta.6"
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/http": "2.0.0-rc.6",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/router": "^3.0.0-rc.2",
+    "rxjs": "5.0.0-beta.11"
   },
   "devDependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/http": "2.0.0-rc.5",
-    "@angular/router": "^3.0.0-rc.1",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
-    "@angular/platform-server": "2.0.0-rc.5",
+
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/http": "2.0.0-rc.6",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/router": "^3.0.0-rc.2",
+    "rxjs": "5.0.0-beta.11",
+
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
+    "@angular/platform-server": "2.0.0-rc.6",
     "ie-shim": "^0.1.0",
-    "rxjs": "5.0.0-beta.6",
-    "typescript": "^2.0.0-beta",
-    "zone.js": "0.6.13",
+    "typescript": "^2.0.0",
+    "zone.js": "0.6.17",
 
     "@types/core-js": "^0.9.28",
     "@types/hammerjs": "^2.0.28",
     "@types/jasmine": "^2.2.29",
-    "@types/node": "^4.0.29",
+    "@types/node": "^6.0.38",
     "@types/source-map": "^0.1.26",
     "@types/webpack": "^1.12.29",
     "@types/protractor": "^1.5.16",
 
-    "awesome-typescript-loader": "1.1.1",
+    "awesome-typescript-loader": "^2.2.1",
     "source-map-loader": "^0.1.5",
     "istanbul-instrumenter-loader": "^0.2.0",
 
     "protractor": "^3.2.2",
 
-    "core-js": "^2.4.0",
+    "core-js": "^2.4.1",
     "http-server": "^0.9.0",
 
     "jasmine-core": "^2.4.1",
     "karma": "^0.13.22",
-    "karma-chrome-launcher": "^1.0.1",
+    "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.0.0",
     "karma-jasmine": "^1.0.2",
     "karma-mocha-reporter": "^2.0.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "1.7.0",
+    "karma-webpack": "1.8.0",
     "remap-istanbul": "^0.6.3",
 
     "ts-helpers": "1.1.1",

src/angular2-token.model.ts

@@ -11,20 +11,26 @@ export interface AuthData {
     uid:            string;
 }
 
+export interface OAuthPaths {
+    github?:    string;
+}
+
 export interface Angular2TokenOptions {
-    apiPath?:                       string;
-    signInPath?:                    string;
-    signOutPath?:                   string;
-    validateTokenPath?:             string;
+    apiPath?:                   string;
+    signInPath?:                string;
+    signOutPath?:               string;
+    validateTokenPath?:         string;
 
-    deleteAccountPath?:             string;
-    registerAccountPath?:           string;
-    registerAccountCallback?:       string;
+    deleteAccountPath?:         string;
+    registerAccountPath?:       string;
+    registerAccountCallback?:   string;
 
-    updatePasswordPath?:            string;
+    updatePasswordPath?:        string;
 
-    resetPasswordPath?:             string;
-    resetPasswordCallback?:         string;
+    resetPasswordPath?:         string;
+    resetPasswordCallback?:     string;
 
-    userTypes?:                     UserType[];
-}
+    userTypes?:                 UserType[];
+
+    oAuthPaths?:                OAuthPaths;
+}

src/angular2-token.service.ts

@@ -59,7 +59,11 @@ export class Angular2TokenService {
             resetPasswordPath:          'auth/password',
             resetPasswordCallback:      window.location.href,
 
-            userTypes:                  null
+            userTypes:                  null,
+
+            oAuthPaths: {
+                github:                 'auth/github'
+            }
         };
 
         this._options = Object.assign(defaultOptions, options);
@@ -110,6 +114,17 @@ export class Angular2TokenService {
         return observ;
     }
 
+    signInOAuth(oAuthType: string) {
+
+        let oAuthPath: string;
+
+        if (oAuthType == 'github') {
+            oAuthPath = this._options.oAuthPaths.github
+        }
+
+        window.open(this._constructUserPath() + oAuthPath);
+    }
+
     // Sign out request and delete storage
     signOut(): Observable<Response> {
         let observ = this.delete(this._constructUserPath() + this._options.signOutPath);

src/angular2-token.spec.ts

@@ -1,7 +1,6 @@
 import { Http, BaseRequestOptions, Response, ResponseOptions, Headers, RequestMethod } from '@angular/http';
 import { MockBackend } from '@angular/http/testing';
-import { provide } from '@angular/core';
-import { inject, addProviders } from '@angular/core/testing';
+import { inject, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, RouterOutletMap, RouterState } from '@angular/router';
 
 import { Angular2TokenService } from './';
@@ -43,17 +42,19 @@ describe('Angular2TokenService', () => {
 
 	beforeEach(() => {
 		// Inject HTTP and Angular2TokenService
-		addProviders([
-			BaseRequestOptions,
-			MockBackend,
-			{ provide: ActivatedRoute, useClass: Mock },
-			{
-				provide: Http,
-				useFactory: (backend, defaultOptions) => { return new Http(backend, defaultOptions) },
-				deps: [MockBackend, BaseRequestOptions]
-			},
-			Angular2TokenService
-		]);
+		TestBed.configureTestingModule({
+			providers: [
+				BaseRequestOptions,
+				MockBackend,
+				{ provide: ActivatedRoute, useClass: Mock },
+				{
+					provide: Http,
+					useFactory: (backend, defaultOptions) => { return new Http(backend, defaultOptions) },
+					deps: [MockBackend, BaseRequestOptions]
+				},
+				Angular2TokenService
+			]
+		});
 
 		// Fake Local Storage
 		var store = {};