Merge pull request #45 from sgruhier/redirectto

add signInStoredUrlStorageKey option

Author: neroniaky

README.md

@@ -93,6 +93,7 @@ constructor(private _tokenService: Angular2TokenService) {
 
         signInPath:                 'auth/sign_in',
         signInRedirect:             null,
+        signInStoredUrlStorageKey:  null,
 
         signOutPath:                'auth/sign_out',
         validateTokenPath:          'auth/validate_token',
@@ -117,21 +118,22 @@ constructor(private _tokenService: Angular2TokenService) {
 }
 ```
 
-| Options                             | Description                                     |
-| ----------------------------------- | ----------------------------------------------- |
-| `apiPath?: string`                  | Sets base path all operations are based on      |
-| `signInPath?: string`               | Sets path for sign in                           |
-| `signInRedirect?: string`           | Sets redirect path for failed CanActivate       |
-| `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)) |
-| `globalOptions?: GlobalOptions`     | Allows the configuration of global options (see below) |
+| Options                                 | Description                              |
+| --------------------------------------- | ---------------------------------------- |
+| `apiPath?: string`                      | Sets base path all operations are based on |
+| `signInPath?: string`                   | Sets path for sign in                    |
+| `signInRedirect?: string`               | Sets redirect path for failed CanActivate |
+| `signInStoredUrlStorageKey?: string`    | Sets locale storage key to store URL before displaying signIn page |
+| `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)) |
+| `globalOptions?: GlobalOptions`         | Allows the configuration of global options (see below) |
 
 ### Global Options
 | Options                               | Description                                     |
@@ -349,6 +351,22 @@ Returns current authentication data which are used to set auth headers.
 
 `get currentAuthData(): AuthData`
 
+### Redirect original requested URL
+If you want to redirect to the protected URL after signing in, you need to set `signInStoredUrlStorageKey` and in your code you can do something like this
+
+```js
+this._tokenService.signIn(
+    '[email protected]',
+    'secretPassword'
+).subscribe(
+    res => {
+        // You have to add Router DI in your component
+        this.router.navigateByUrl(localStorage.getItem('redirectTo'));
+    },
+    error =>    console.log(error)
+);
+```
+
 ## Development
 If the package is installed from Github specified in the package.json, you need to build the package locally.
 

src/angular2-token.model.ts

@@ -36,6 +36,7 @@ export interface Angular2TokenOptions {
 
     signInPath?:                string;
     signInRedirect?:            string;
+    signInStoredUrlStorageKey?: string;
 
     signOutPath?:               string;
     validateTokenPath?:         string;

src/angular2-token.service.ts

@@ -56,6 +56,13 @@ export class Angular2TokenService implements CanActivate {
         if (this.userSignedIn())
             return true;
         else {
+            // Store current location in storage (usefull for redirection after signing in)
+            if (this._options.signInStoredUrlStorageKey) {
+                localStorage.setItem(
+                    this._options.signInStoredUrlStorageKey,
+                    window.location.pathname + window.location.search
+                );
+            }
 
             // Redirect user to sign in if signInRedirect is set
             if(this._options.signInRedirect)
@@ -73,6 +80,7 @@ export class Angular2TokenService implements CanActivate {
 
             signInPath:                 'auth/sign_in',
             signInRedirect:             null,
+            signInStoredUrlStorageKey:  null,
 
             signOutPath:                'auth/sign_out',
             validateTokenPath:          'auth/validate_token',