Merge pull request #137 from delphi-hub/feature/newUserMgmt

Feature/new user mgmt

Author: janniclas

app/actors/ClientSocketActor.scala

@@ -24,7 +24,7 @@ class ClientSocketActor(out: ActorRef, publisher: ActorRef) extends Actor with E
 
   override def preStart() {
     Logger.debug("pre start called in client" + self)
-    out ! "successfully registered"
+    out ! Json.obj("msg" -> "successfully registered").toString()
   }
 
   override def postStop() {

app/controllers/ApiRouter.scala

@@ -37,6 +37,7 @@ class ApiRouter @Inject()(irController: InstanceRegistryController, sysControlle
     case GET(p"/instances" ? q"componentType=$componentType") => irController.instances(componentType)
     case GET(p"/systemInfo") => sysController.getInfo()
     case GET(p"/network") => irController.getNetwork()
+    case GET(p"/users") => irController.users()
     case POST(p"/postInstance" ? q"componentType=$componentType"& q"name=$name") => irController.postInstance(componentType, name)
     case POST(p"/startInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/start", instanceID)
     case POST(p"/stopInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/stop", instanceID)
@@ -46,5 +47,7 @@ class ApiRouter @Inject()(irController: InstanceRegistryController, sysControlle
     case POST(p"/reconnectInstance" ? q"from=$from"& q"to=$to") => irController.reconnect(from.toInt, to.toInt)
     case POST(p"/authenticate") => irController.authentication()
     case POST(p"/labelInstance" ? q"instanceID=$instanceID"& q"label=$label") => irController.labelInstance(instanceID, label)
+    case POST(p"/postUser") => irController.postUser()
+    case POST(p"/deleteUser" ? q"userID=$userID") => irController.deleteUser(userID)
   }
 }

app/controllers/InstanceRegistryController.scala

@@ -87,6 +87,22 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
     }
   }
 
+  /** This method lists all Users.
+    * @return
+    */
+
+  def users(): Action[AnyContent] = authAction.async{
+    ws.url(instanceRegistryUri + "/users").withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+      .get().map { response =>
+  Logger.debug(response.body)
+      if (response.status == 200) {
+        Ok(response.body)
+      } else {
+        new Status(response.status)
+      }
+    }(myExecutionContext)
+  }
+
   /** Called to fetch network graph of current registry. Contains a list of all instances and all links
     * currently registered.
     *
@@ -252,4 +268,57 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
         }
       }(myExecutionContext)
   }
+
+  /**
+    * This function is used to add a User.
+    * Username, Secret and UserType are sent in the body post
+    * Instance registry returns a valid userID
+    * @return
+    */
+
+   def postUser(): Action[AnyContent] = authAction.async {
+    request =>
+      val jsonBody: Option[JsValue] = request.body.asJson
+       jsonBody.map { json =>
+        val userName = (json \ "userName").as[String]
+        val secret = (json \ "secret").as[String]
+        val userType = (json \ "userType").as[String]
+        ws.url(instanceRegistryUri + "/users" + "/add")
+        .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+        .post(json)
+        .map { response =>
+           if (response.status == 200) {
+              Ok(Json.obj("token" -> response.body, "refreshToken" -> ""))
+            } else {
+              Logger.info(s"$ws")
+              Logger.debug(s"$ws")
+              new Status(response.status)
+            }
+        }
+    }.getOrElse{ Future(BadRequest("Invalid body"))}
+  }
+
+/**
+    * This function is used to delete a user.
+    * @param userID ID of the user that is to be deleted
+    * @return
+    */
+  def deleteUser( userID: String): Action[AnyContent] = authAction.async {
+    request =>
+    ws.url(instanceRegistryUri + "/users/" + userID + "/remove")
+      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+      .post("")
+      .map { response =>
+      response.status match {
+          // scalastyle:off magic.number
+          case 202 =>
+          // scalastyle:on magic.number
+            Ok(Json.obj("msg" -> response.body))
+          case x: Any =>
+            new Status(x)
+        }
+      }(myExecutionContext)
+  }
+
 }
+

client/src/app/api/api/api.service.ts

@@ -17,9 +17,10 @@
  */
 
 
-import {CustomHttpUrlEncodingCodec} from '../encoder';
-import {Instance} from '../../model/models/instance';
-import {SysInfo} from '../../model/models/sysInfo';
+import { CustomHttpUrlEncodingCodec } from '../encoder';
+import { Instance } from '../../model/models/instance';
+import { SysInfo } from '../../model/models/sysInfo';
+import { User } from '../../model/models/user';
 import { Inject, Injectable, Optional } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
@@ -28,6 +29,8 @@ import {
   BASE_PATH,
   INSTANCES,
   NUMBER_OF_INSTANCES,
+  USERS,
+  NEW_USER,
   SYS_INFO,
   NEW_INSTANCE,
   START_INSTANCE,
@@ -37,6 +40,7 @@ import {
   DELETE_INSTANCE,
   NEW_LABEL_INSTANCE,
   INSTANCE_NETWORK,
+  DELETE_USER,
   RECONNECT,
   AUTH
 } from '../variables';
@@ -92,7 +96,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public getNumberOfInstances(componentType: string, observe: any = 'body', reportProgress: boolean = false ): Observable<number> {
+  public getNumberOfInstances(componentType: string, observe: any = 'body', reportProgress: boolean = false): Observable<number> {
     return this.get(NUMBER_OF_INSTANCES, componentType);
   }
 
@@ -169,7 +173,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public pauseInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false)  {
+  public pauseInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false) {
     return this.postAction(PAUSE_INSTANCE, instanceId);
   }
 
@@ -200,10 +204,71 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public labelInstance( instanceId: string, labelName: string, observe: any = 'body', reportProgress: boolean = false) {
+  public labelInstance(instanceId: string, labelName: string, observe: any = 'body', reportProgress: boolean = false) {
     return this.postLabel(NEW_LABEL_INSTANCE, instanceId, labelName);
   }
 
+  /**
+   * Create a User
+   * @param userName
+   * @param secret
+   * @param userType
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+
+  public postUser(userName: string, secret: string, userType: string, observe: any = 'body', reportProgress: boolean = false)
+  : Observable<User> {
+    return this.userAdd(userName, secret, userType);
+  }
+
+  private userAdd(username: string, secret: string, userType: string): Observable<User> {
+    let headers = this.defaultHeaders;
+    // to determine the Accept header
+    const httpHeaderAccepts: string[] = [
+      'application/json'
+    ];
+    const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+    if (httpHeaderAcceptSelected !== undefined) {
+      headers = headers.set('Accept', httpHeaderAcceptSelected);
+    }
+
+    return this.httpClient.post<User>(`${this.basePath}${NEW_USER}`, {
+      userName: username,
+      secret: secret,
+      userType: userType
+    },
+      {
+        withCredentials: this.configuration.withCredentials,
+        headers: headers
+      }
+    );
+  }
+
+  public deleteUser(userId: string) {
+    return this.deleteAction(DELETE_USER, userId);
+  }
+
+  /**
+  * Delete a User
+  * @param idUser
+  * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+  * @param reportProgress flag to report request and response progress.
+  */
+
+  private deleteAction(endpoint: string, idUser: string, observe: any = 'body', reportProgress: boolean = false) {
+    let queryParam = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
+
+    if (idUser === null || idUser === undefined) {
+      throw new Error('Required ID User parameter');
+    } else {
+      queryParam = queryParam.set('userID', <any>idUser);
+    }
+
+    return this.commonConf(endpoint, queryParam, observe, reportProgress);
+  }
+
+
   private get<T>(endpoint: string, componentType?: string) {
 
     let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -301,6 +366,31 @@ export class ApiService {
     return this.commonConf(endpoint, queryParam, observe, reportProgress);
   }
 
+  public getUsers(observe: any = 'body', reportProgress: boolean = false): Observable<Array<User>> {
+    return this.getList(USERS);
+  }
+
+  private getList<T>(endpoint: string) {
+
+    let headers = this.defaultHeaders;
+
+    // to determine the Accept header
+    const httpHeaderAccepts: string[] = [
+      'application/json'
+    ];
+    const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+    if (httpHeaderAcceptSelected !== undefined) {
+      headers = headers.set('Accept', httpHeaderAcceptSelected);
+    }
+
+    return this.httpClient.get<T>(`${this.basePath}${endpoint}`,
+      {
+        withCredentials: this.configuration.withCredentials,
+        headers: headers
+      }
+    );
+  }
+
 
   private commonConf(endpoint: string, queryParameters: HttpParams, observe: any = 'body', reportProgress: boolean = false) {
     let headers = this.defaultHeaders;

client/src/app/api/variables.ts

@@ -29,12 +29,17 @@ export const STOP_INSTANCE = 'api/stopInstance';
 export const PAUSE_INSTANCE = 'api/pauseInstance';
 export const RESUME_INSTANCE = 'api/resumeInstance';
 export const DELETE_INSTANCE = 'api/deleteInstance';
+export const USERS = '/api/users';
+export const NEW_USER = '/api/postUser';
 export const RECONNECT = 'api/reconnectInstance';
 export const AUTH = 'api/authenticate';
 export const NEW_LABEL_INSTANCE = 'api/labelInstance';
+export const DELETE_USER = 'api/deleteUser';
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',
     'ssv': ' ',
     'pipes': '|'
 };
+
+

client/src/app/dashboard/dashboard-overview/dashboard-overview.component.spec.ts

@@ -25,6 +25,7 @@ import { RouterModule } from '@angular/router';
 import { MaterialModule } from '../../material-module/material.module';
 import { InfoCenterComponent} from '../info-center/info-center.component';
 import { GraphViewModule} from '../graph-view/graph-view.module';
+import { MatSortModule } from '@angular/material';
 import { DashboardOverviewComponent } from './dashboard-overview.component';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
@@ -36,7 +37,7 @@ describe('DashboardOverviewComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ DashboardOverviewComponent, DashboardCardComponent, StatusCardComponent, InfoCenterComponent],
-      imports: [RouterModule, HttpClientModule, RouterTestingModule, MaterialModule, GraphViewModule, NoopAnimationsModule]
+      imports: [RouterModule, HttpClientModule, RouterTestingModule, MaterialModule, GraphViewModule, MatSortModule, NoopAnimationsModule]
     })
     .compileComponents();
   }));

client/src/app/dashboard/dashboard.component.spec.ts

@@ -44,6 +44,8 @@ import { TableOverviewComponent } from './table-overview/table-overview.componen
 import { InfoCenterComponent } from './info-center/info-center.component';
 import {MatTableModule, MatPaginatorModule, MatSortModule, MatIconModule} from '@angular/material';
 import { LabelDialogComponent } from './label-dialog/label-dialog.component';
+import { UserAddComponent } from './user-add/user-add.component';
+import { DeleteUserComponent } from './delete-user/delete-user.component';
 
 @NgModule({
   imports: [
@@ -80,10 +82,12 @@ import { LabelDialogComponent } from './label-dialog/label-dialog.component';
     InstanceDetailsComponent,
     InfoCenterComponent,
     TableOverviewComponent,
-    LabelDialogComponent
+    LabelDialogComponent,
+    UserAddComponent,
+    DeleteUserComponent
   ],
   entryComponents: [
-    DeleteDialogComponent, AddDialogComponent, LabelDialogComponent
+    DeleteDialogComponent, AddDialogComponent, LabelDialogComponent, UserAddComponent, DeleteUserComponent
   ],
   providers: [],
 })

client/src/app/dashboard/dashboard.module.ts

@@ -9,7 +9,6 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatDialogModule } from '@angular/material/dialog';
 import { ApiService } from '../../api/api/api.service';
-
 import { DeleteDialogComponent } from './delete-dialog.component';
 
 describe('DeleteDialogComponent', () => {