Merge pull request #1 from neroniaky/master

Update to current version

Author: diegoh

.npmignore

@@ -1,4 +1,3 @@
-src
 node_modules
 
 # Testing

CHANGELOG.md

@@ -1,8 +1,26 @@
 # Change Log
 
-## v0.1.4
+## v0.1.8 & v0.1.9
+**Features:**
+- Updated Dependencies to Angular2 Final
+
+## v0.1.7
+**Features:**
+- Added .head() and .options() HTTP-wrapper
+- Added general HTTP-wrapper .sendHttpRequest()
+
+## v0.1.6
 **Bugfixes:**
+- Added route guard support for CanActivate
+
+## v0.1.5
+**Bugfixes:**
+- Fix broken sourcemap paths in npm package
+
+## v0.1.4
+**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:**

README.md

@@ -1,3 +1,5 @@
+![Angular2-Token](assets/angular2-token-logo.png)
+
 # Angular2-Token
 [![Join the chat at https://gitter.im/lynndylanhurley/devise_token_auth](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular2-token/Lobby)
 [![npm version](https://badge.fury.io/js/angular2-token.svg)](https://badge.fury.io/js/angular2-token)
@@ -28,15 +30,18 @@ The repository can be found [here](https://github.com/neroniaky/angular2-token-e
     - [`.updatePassword()`](#updatepassword)
     - [`.resetPassword()`](#resetpassword)
 - [HTTP Service Wrapper](#http-service-wrapper)
+    - [`.sendHttpRequest()`](#sendhttprequest)
 - [Multiple User Types](#multiple-user-types)
+- [Route Guards](#route-guards)
 - [Testing](#testing)
+- [Development](#development)
 - [Credits](#credits)
 - [License](#license)
 
 ## Installation
 1. Install Angular2-Token via NPM with
     ```bash
-    npm install angular2-token --save
+    npm install angular2-token
     ```
 
 2. Import and add `Angular2TokenService` to your main module. `Angular2TokenService` depends on `HttpModule` and `RouterModule`, so make sure you imported them too.
@@ -97,18 +102,19 @@ constructor(private _tokenService: Angular2TokenService) {
 }
 ```
 
-### Configuration Options
-- `apiPath?: string` - Sets base path all operations are based on
-- `signInPath?: string` - Sets path for sign in
-- `signOutPath?: string` - Sets path for sign out
-- `validateTokenPath?: string` - Sets path for token validation
-- `registerAccountPath?: string` - Sets path for account registration
-- `deleteAccountPath?: string` - Sets path for account deletion
-- `registerAccountCallback?: string` - Sets the path user are redirected to after email confirmation for registration
-- `updatePasswordPath?: string` - Sets path for password update
-- `resetPasswordPath?: string` - Sets path for password reset
-- `resetPasswordCallback?: string` - Sets the path user are redirected to after email confirmation for password reset
-- `userTypes?: UserTypes[]` - Allows the configuration of multiple user types (see [Multiple User Types](#multiple-user-types))
+| Options                             | Description                                     |
+| ----------------------------------- | ----------------------------------------------- |
+| `apiPath?: string`                  | Sets base path all operations are based on      |
+| `signInPath?: string`               | Sets path for sign in                           |
+| `signOutPath?: string`              | Sets path for sign out                          |
+| `validateTokenPath?: string`        | Sets path for token validation                  |
+| `registerAccountPath?: string`      | Sets path for account registration              |
+| `deleteAccountPath?: string`        | Sets path for account deletion                  |
+| `registerAccountCallback?: string`  | Sets the path user are redirected to after email confirmation for registration |
+| `updatePasswordPath?: string`       | Sets path for password update                   |
+| `resetPasswordPath?: string`        | Sets path for password reset                    |
+| `resetPasswordCallback?: string`    | Sets the path user are redirected to after email confirmation for password reset |
+| `userTypes?: UserTypes[]`           | Allows the configuration of multiple user types (see [Multiple User Types](#multiple-user-types)) |
 
 Further information on paths/routes can be found at
 [devise token auth](https://github.com/lynndylanhurley/devise_token_auth#usage-tldr)
@@ -222,12 +228,14 @@ this._tokenService.updatePassword(
 ```
 
 ## HTTP Service Wrapper
-`Angular2TokenService` wraps all standard Angular2 Http Service calls for authentication and token processing.
+`Angular2TokenService` wraps all standard Angular2 Http Service calls for authentication and token processing. 
 - `get(path: string, requestOptions?: RequestOptions): Observable<Response>`
 - `post(path: string, data: any, requestOptions?: RequestOptions): Observable<Response>`
 - `put(path: string, data: any, requestOptions?: RequestOptions): Observable<Response>`
 - `delete(path: string, requestOptions?: RequestOptions): Observable<Response>`
 - `patch(path: string, data: any, requestOptions?: RequestOptions): Observable<Response>`
+- `head(path: string, requestOptions?: RequestOptions): Observable<Response>`
+- `options(path: string, requestOptions?: RequestOptions): Observable<Response>`
 
 #### Example:
 ```javascript
@@ -237,6 +245,21 @@ this._tokenService.get('my-resource/1').map(res => res.json()).subscribe(
 );
 ```
 
+### .sendHttpRequest()
+More customized requests can be send with the `.sendHttpRequest()`-function. It is used by all Http wrappers.
+
+`sendHttpRequest(options: HttpRequestOptions): Observable<Response>`
+
+#### Example:
+```javascript
+this.sendHttpRequest({
+    requestMethod:  RequestMethod.Post,
+    path:           'my-resource/1',
+    data:           mydata
+    requestOptions: myRequestOptions
+});
+```
+
 ## Multiple User Types
 An array of `UserType` can be passed in `Angular2TokenOptions` during `init()`.
 The user type is selected during sign in and persists until sign out.
@@ -260,13 +283,40 @@ this._tokenService.signIn(
 this._tokenService.currentUser; // ADMIN
 ```
 
+## Route Guards
+Angular2-Token implements the `CanActivate` interface, so it can directly be used
+as a route guard. It currently does not distinguish between user types.
+
+#### Example:
+```javascript
+const routerConfig: Routes = [
+    { 
+        path: '', 
+        component: PublicComponent 
+    }, {
+        path: 'restricted', 
+        component: RestrictedComponent, 
+        canActivate: [Angular2TokenService] 
+    }
+];
+```
+
 ## Testing
 ```bash
 npm test
 ```
 
+## Development
+If the package is installed from Github specified in the package.json, you need to build the package locally.
+
+```bash
+cd ./node_modules/angular2-token
+npm install
+npm run build
+```
+
 ## Credits
 Test config files based on [Angular2 Webpack Starter](https://github.com/AngularClass/angular2-webpack-starter) by AngularClass
 
 ## License
-The MIT License (see the [LICENSE](https://github.com/neroniaky/angular2-token/blob/master/LICENSE) file for the full text)
+The MIT License (see the [LICENSE](https://github.com/neroniaky/angular2-token/blob/master/LICENSE) file for the full text)

angular2-token.d.ts

@@ -1 +1,2 @@
-export * from './lib';
+export * from './src/angular2-token.model';
+export * from './src/angular2-token.service';

angular2-token.js

@@ -1 +1,5 @@
-exports.Angular2TokenService = require('./lib/angular2-token.service').Angular2TokenService;
+"use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+__export(require('./lib/angular2-token.service'));

assets/angular2-token-logo.png

@@ -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/);

config/spec-bundle.js

@@ -1,6 +1,6 @@
 {
   "name": "angular2-token",
-  "version": "0.1.4",
+  "version": "0.1.9",
   "description": "Angular2 service for token based authentication",
   "main": "./angular2-token.js",
   "typings": "./angular2-token.d.ts",
@@ -14,55 +14,57 @@
     "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",
+    "@angular/http": "2.0.0",
+    "@angular/common": "2.0.0",
+    "@angular/router": "3.0.0",
+    "rxjs": "5.0.0-beta.12"
   },
   "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",
+    "@angular/http": "2.0.0",
+    "@angular/common": "2.0.0",
+    "@angular/router": "3.0.0",
+    "rxjs": "5.0.0-beta.12",
+
+    "@angular/compiler": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/platform-server": "2.0.0",
     "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.23",
 
     "@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",
+    "istanbul-instrumenter-loader": "^1.0.0",
 
-    "protractor": "^3.2.2",
+    "protractor": "4.0.7",
 
-    "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": "1.3.0",
+    "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",
-    "ts-node": "^0.9.1",
+    "ts-node": "1.3.0",
     "webpack": "^1.13.1"
   },
   "author": "Jan-Philipp Riethmacher <neroniaky@gmail.com>",

package.json

@@ -1,3 +1,8 @@
+import {
+    RequestMethod,
+    RequestOptions
+} from '@angular/http';
+
 export interface UserType {
     name: string;
     path: string;
@@ -11,20 +16,33 @@ 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;
 }
+
+export interface HttpRequestOptions {
+    requestMethod: RequestMethod,
+    path: string,
+    body?: any,
+    requestOptions?: RequestOptions
+}