@adempiere/grpc-api - npm Package Compare versions

Comparing version 1.0.0 to 1.0.1

index.js

@@ -27,4 +27,5 @@ /*************************************************************************************
     if(config) {
-      const adempiereConfig = config.adempiere.api
+      const adempiereConfig = config.adempiereApi.api
       this.accessHost = adempiereConfig.accessHost
+      this.businessHost = adempiereConfig.businessHost
       this.version = adempiereConfig.version
@@ -36,2 +37,3 @@ this.language = adempiereConfig.language
     this.initAccessService()
+    this.initBusinessService()
   }
@@ -56,3 +58,3 @@
         current.setClientContext(client)
-        console.log('ADempiere Client Started')
+        console.log('ADempiere Api Client Started')
       } else if(err) {
@@ -80,2 +82,9 @@ console.log(err)
 
+  // Init connection
+  initBusinessService() {
+    var grpc = require('grpc');
+    var services = require('./src/grpc/proto/business_grpc_pb');
+    this.business = new services.UserInterfaceClient(this.businessHost, grpc.credentials.createInsecure());
+  }
+
   //  Get Access Service
@@ -86,2 +95,7 @@ getAccessService() {
 
+  //  Get Business Service
+  getBusinessService() {
+    return this.business
+  }
+
   //  Get Client Context
@@ -106,11 +120,71 @@ getClientContext() {
     const request = new LoginRequest()
-    request.setUsername(user)
-    request.setUserpass(password)
-    request.setRoleuuid(roleUuid)
-    request.setOrganizationuuid(organizationUuid)
+    request.setUserName(user)
+    request.setUserPass(password)
+    request.setRoleUuid(roleUuid)
+    request.setOrganizationUuid(organizationUuid)
     request.setLanguage(this.language)
-    request.setClientversion(this.version)
-    this.getAccessService().runLoginDefault(request, callback)
+    request.setClientVersion(this.version)
+    this.getAccessService().runLogin(request, callback)
   }
 
+  //  Get User Information
+  getUserInfo({
+    token
+  }, callback) {
+    const { UserInfoRequest } = require('./src/grpc/proto/access_pb.js')
+    const request = new UserInfoRequest()
+    request.setSessionUuid(token)
+    request.setLanguage(this.language)
+    request.setClientVersion(this.version)
+    this.getAccessService().getUserInfo(request, callback)
+  }
+
+  //  Get User Information
+  getUserRoles({
+    token
+  }, callback) {
+    const { ListRolesRequest } = require('./src/grpc/proto/access_pb.js')
+    const request = new ListRolesRequest()
+    request.setSessionUuid(token)
+    request.setLanguage(this.language)
+    request.setClientVersion(this.version)
+    this.getAccessService().listRoles(request, callback)
+  }
+
+  //  Get User Menu
+  getMenu({
+    token
+  }, callback) {
+    const { MenuRequest } = require('./src/grpc/proto/access_pb.js')
+    const request = new MenuRequest()
+    request.setSessionUuid(token)
+    request.setLanguage(this.language)
+    request.setClientVersion(this.version)
+    this.getAccessService().getMenu(request, callback)
+  }
+
+  //  Get User Menu
+  getSessionInfo({
+    token
+  }, callback) {
+    const { SessionRequest } = require('./src/grpc/proto/access_pb.js')
+    const request = new SessionRequest()
+    request.setSessionUuid(token)
+    request.setLanguage(this.language)
+    request.setClientVersion(this.version)
+    this.getAccessService().getSession(request, callback)
+  }
+
+  //  Login with a user
+  logout({
+    token
+  }, callback) {
+    const { LogoutRequest } = require('./src/grpc/proto/access_pb.js')
+    const request = new LogoutRequest()
+    request.setSessionUuid(token)
+    request.setLanguage(this.language)
+    request.setClientVersion(this.version)
+    this.getAccessService().runLogout(request, callback)
+  }
+
   //  Get Resource Image from name
@@ -126,3 +200,3 @@ getResource({
     request.setResourceUuid(resourceUuid)
-    const stream = this.getStoreService().getResource(request)//, callback)
+    const stream = this.getBusinessService().getResource(request)//, callback)
     let result = new Uint8Array()
@@ -158,3 +232,35 @@ stream.on('data', (response) => {
   }
+
+  //  Convert value from gRPC
+  convertValueFromGRPC(value) {
+    const { ContextValue } = require('./src/grpc/proto/access_pb.js')
+    const { ValueType } = ContextValue
+
+    if (!value) {
+      return undefined
+    }
+    let returnValue
+    switch (value.getValueType()) {
+      case ValueType.INTEGER:
+        returnValue = value.getIntValue()
+        break
+      // data type Boolean
+      case ValueType.BOOLEAN:
+        returnValue = value.getBooleanValue()
+        break
+      // data type Boolean
+      case ValueType.DATE:
+        returnValue = new Date(value.getLongValue())
+        break
+      // data type String
+      case ValueType.STRING:
+        returnValue = value.getStringValue()
+        break
+      case ValueType.UNKNOWN:
+        returnValue = undefined;
+        break
+    }
+    return returnValue
+  }
 }
-module.exports = WebStore;
+module.exports = Api;

package.json

 {
   "name": "@adempiere/grpc-api",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "ADempiere Web Store write in Javascript for a node service",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -109,3 +109,3 @@ # ADempiere Web Store backend API for gRPC
 yarn global add grpc-tools
-grpc_tools_node_protoc --js_out=import_style=commonjs,binary:src/grpc --grpc_out=src/grpc --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` proto/access.proto proto/client.proto proto/base_data_type.proto proto/business.proto proto/core_functionality.proto
+grpc_tools_node_protoc --js_out=import_style=commonjs,binary:src/grpc --grpc_out=src/grpc --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` proto/access.proto proto/client.proto proto/base_data_type.proto proto/core_functionality.proto
 ```
@@ -112,0 +112,0 @@

src/grpc/proto/access_grpc_pb.js

@@ -22,2 +22,35 @@ // GENERATED CODE -- DO NOT EDIT!
 
+function serialize_access_ChangeRoleRequest(arg) {
+  if (!(arg instanceof proto_access_pb.ChangeRoleRequest)) {
+    throw new Error('Expected argument of type access.ChangeRoleRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_access_ChangeRoleRequest(buffer_arg) {
+  return proto_access_pb.ChangeRoleRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_access_ListRolesRequest(arg) {
+  if (!(arg instanceof proto_access_pb.ListRolesRequest)) {
+    throw new Error('Expected argument of type access.ListRolesRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_access_ListRolesRequest(buffer_arg) {
+  return proto_access_pb.ListRolesRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_access_ListRolesResponse(arg) {
+  if (!(arg instanceof proto_access_pb.ListRolesResponse)) {
+    throw new Error('Expected argument of type access.ListRolesResponse');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_access_ListRolesResponse(buffer_arg) {
+  return proto_access_pb.ListRolesResponse.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_access_LoginRequest(arg) {
@@ -56,2 +89,13 @@ if (!(arg instanceof proto_access_pb.LoginRequest)) {
 
+function serialize_access_MenuRequest(arg) {
+  if (!(arg instanceof proto_access_pb.MenuRequest)) {
+    throw new Error('Expected argument of type access.MenuRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_access_MenuRequest(buffer_arg) {
+  return proto_access_pb.MenuRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_access_Session(arg) {
@@ -79,5 +123,5 @@ if (!(arg instanceof proto_access_pb.Session)) {
 
-function serialize_access_UserInfoRequest(arg) {
-  if (!(arg instanceof proto_access_pb.UserInfoRequest)) {
-    throw new Error('Expected argument of type access.UserInfoRequest');
+function serialize_access_UserInfo(arg) {
+  if (!(arg instanceof proto_access_pb.UserInfo)) {
+    throw new Error('Expected argument of type access.UserInfo');
   }
@@ -87,9 +131,9 @@ return Buffer.from(arg.serializeBinary());
 
-function deserialize_access_UserInfoRequest(buffer_arg) {
-  return proto_access_pb.UserInfoRequest.deserializeBinary(new Uint8Array(buffer_arg));
+function deserialize_access_UserInfo(buffer_arg) {
+  return proto_access_pb.UserInfo.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
-function serialize_access_UserInfoValue(arg) {
-  if (!(arg instanceof proto_access_pb.UserInfoValue)) {
-    throw new Error('Expected argument of type access.UserInfoValue');
+function serialize_access_UserInfoRequest(arg) {
+  if (!(arg instanceof proto_access_pb.UserInfoRequest)) {
+    throw new Error('Expected argument of type access.UserInfoRequest');
   }
@@ -99,4 +143,4 @@ return Buffer.from(arg.serializeBinary());
 
-function deserialize_access_UserInfoValue(buffer_arg) {
-  return proto_access_pb.UserInfoValue.deserializeBinary(new Uint8Array(buffer_arg));
+function deserialize_access_UserInfoRequest(buffer_arg) {
+  return proto_access_pb.UserInfoRequest.deserializeBinary(new Uint8Array(buffer_arg));
 }
@@ -107,14 +151,2 @@
 var SecurityService = exports.SecurityService = {
-  // Request user roles
-getUserInfo: {
-    path: '/access.Security/GetUserInfo',
-    requestStream: false,
-    responseStream: false,
-    requestType: proto_access_pb.LoginRequest,
-    responseType: proto_access_pb.UserInfoValue,
-    requestSerialize: serialize_access_LoginRequest,
-    requestDeserialize: deserialize_access_LoginRequest,
-    responseSerialize: serialize_access_UserInfoValue,
-    responseDeserialize: deserialize_access_UserInfoValue,
-  },
   // Request login from user
@@ -132,14 +164,2 @@ runLogin: {
   },
-  // Request login and role
-runLoginDefault: {
-    path: '/access.Security/RunLoginDefault',
-    requestStream: false,
-    responseStream: false,
-    requestType: proto_access_pb.LoginRequest,
-    responseType: proto_access_pb.Session,
-    requestSerialize: serialize_access_LoginRequest,
-    requestDeserialize: deserialize_access_LoginRequest,
-    responseSerialize: serialize_access_Session,
-    responseDeserialize: deserialize_access_Session,
-  },
   // Request a Role from uuid
@@ -158,22 +178,22 @@ runLogout: {
   // Request user roles from Session
-getUserInfoFromSession: {
-    path: '/access.Security/GetUserInfoFromSession',
+getUserInfo: {
+    path: '/access.Security/GetUserInfo',
     requestStream: false,
     responseStream: false,
     requestType: proto_access_pb.UserInfoRequest,
-    responseType: proto_access_pb.UserInfoValue,
+    responseType: proto_access_pb.UserInfo,
     requestSerialize: serialize_access_UserInfoRequest,
     requestDeserialize: deserialize_access_UserInfoRequest,
-    responseSerialize: serialize_access_UserInfoValue,
-    responseDeserialize: deserialize_access_UserInfoValue,
+    responseSerialize: serialize_access_UserInfo,
+    responseDeserialize: deserialize_access_UserInfo,
   },
   // Request Menu from Parent UUID
-getMenuAndChild: {
-    path: '/access.Security/GetMenuAndChild',
+getMenu: {
+    path: '/access.Security/GetMenu',
     requestStream: false,
     responseStream: false,
-    requestType: proto_access_pb.UserInfoRequest,
+    requestType: proto_access_pb.MenuRequest,
     responseType: proto_access_pb.Menu,
-    requestSerialize: serialize_access_UserInfoRequest,
-    requestDeserialize: deserialize_access_UserInfoRequest,
+    requestSerialize: serialize_access_MenuRequest,
+    requestDeserialize: deserialize_access_MenuRequest,
     responseSerialize: serialize_access_Menu,
@@ -187,6 +207,6 @@ responseDeserialize: deserialize_access_Menu,
     responseStream: false,
-    requestType: proto_access_pb.UserInfoRequest,
+    requestType: proto_access_pb.ChangeRoleRequest,
     responseType: proto_access_pb.Session,
-    requestSerialize: serialize_access_UserInfoRequest,
-    requestDeserialize: deserialize_access_UserInfoRequest,
+    requestSerialize: serialize_access_ChangeRoleRequest,
+    requestDeserialize: deserialize_access_ChangeRoleRequest,
     responseSerialize: serialize_access_Session,
@@ -207,4 +227,16 @@ responseDeserialize: deserialize_access_Session,
   },
+  // List Roles
+listRoles: {
+    path: '/access.Security/ListRoles',
+    requestStream: false,
+    responseStream: false,
+    requestType: proto_access_pb.ListRolesRequest,
+    responseType: proto_access_pb.ListRolesResponse,
+    requestSerialize: serialize_access_ListRolesRequest,
+    requestDeserialize: deserialize_access_ListRolesRequest,
+    responseSerialize: serialize_access_ListRolesResponse,
+    responseDeserialize: deserialize_access_ListRolesResponse,
+  },
 };
 
 exports.SecurityClient = grpc.makeGenericClientConstructor(SecurityService);

No alert changes

Worsened metrics

Total package byte prevSize

1411488

decreased by-3.11%

Number of package files

18

decreased by-5.26%

Lines of code

41250

decreased by-1.64%

No dependency changes