Merge pull request #1 from reddimohan/dev

returning extra fields

Author: justmohan

src/controllers/user.controller.ts

@@ -29,7 +29,8 @@ import { BcryptHasher } from '../services/hash.password.bcrypt';
 import { PermissionKeys } from '../authorization/permission-keys';
 import { validateCredentials } from '../services/validator';
 import * as _ from 'lodash';
-import { authenticate } from '@loopback/authentication';
+import { authenticate, AuthenticationBindings } from '@loopback/authentication';
+import { UserProfile, securityId } from '@loopback/security';
 
 export class UserController {
   constructor(
@@ -190,4 +191,17 @@ export class UserController {
   async deleteById(@param.path.number('id') id: number): Promise<void> {
     await this.userRepository.deleteById(id);
   }
+
+  @get('/users/me')
+  @authenticate('jwt', { required: [PermissionKeys.AuthFeatures] })
+  async me(
+    @inject(AuthenticationBindings.CURRENT_USER)
+    currentUser: UserProfile
+  ): Promise<UserProfile> {
+    // console.log(currentUser);
+    currentUser.id = currentUser[securityId];
+    delete currentUser[securityId];
+    return Promise.resolve(currentUser);
+  }
+
 }

src/interceptors/authorize.interceptor.ts

@@ -52,7 +52,7 @@ export class AuthorizeInterceptor implements Provider<Interceptor> {
       const result = await next();
 
       const requiredPermissions = this.metadata.options as RequiredPermissions;
-      console.log(requiredPermissions)
+      console.log("Required Permissions: ", requiredPermissions)
       const user = await this.getCurrentUser();
       console.log("User Permissions: ", user.permissions)
       const results = intersection(user.permissions, requiredPermissions.required).length;

src/services/jwt-service.ts

@@ -1,8 +1,8 @@
-import {UserProfile, securityId} from '@loopback/security';
-import {promisify} from 'util';
-import {HttpErrors} from '@loopback/rest';
-import {inject} from '@loopback/core';
-import {TokenServiceBindings} from '../keys';
+import { UserProfile, securityId } from '@loopback/security';
+import { promisify } from 'util';
+import { HttpErrors } from '@loopback/rest';
+import { inject } from '@loopback/core';
+import { TokenServiceBindings } from '../keys';
 const jwt = require('jsonwebtoken');
 const signAsync = promisify(jwt.sign);
 const verifyAsync = promisify(jwt.verify);
@@ -41,11 +41,12 @@ export class JWTService {
       const decryptedToken = await verifyAsync(token, this.jwtSecret);
       // don't copy over  token field 'iat' and 'exp', nor 'email' to user profile
       userProfile = Object.assign(
-        {[securityId]: '', name: '', permissions: []},
+        { [securityId]: '', name: '', permissions: [] },
         {
-          id: decryptedToken.id, 
-          name: decryptedToken.name, 
-          permissions: decryptedToken.permissions
+          id: decryptedToken.id,
+          name: decryptedToken.name,
+          permissions: decryptedToken.permissions,
+          email: decryptedToken.email
         },
       );
     } catch (error) {

src/services/user.service.ts

@@ -46,6 +46,6 @@ export class MyUserService implements UserService<User, Credentials> {
         ? `${user.firstName} ${user.lastName}`
         : user.lastName;
     }
-    return { [securityId]: `${user.id}`, name: userName }
+    return { [securityId]: `${user.id}`, name: userName, email: user.email }
   }
 }