@abtnode/schema 1.7.26 → 1.8.1

package/README.md

@@ -5,13 +5,44 @@ Defines data structure for ABT Node backend API, and maintains schema for GQL en
 ## Development
 
 You can choose one of the following two ways to build schema.
+It is recommended to build with Docker.
 
-### Option 1. Build schema with Go
+### Option 1. Build schema with Docker
 
-#### Install gnu-sed
+Requirements:
 
-- Mac: brew install gnu-sed
-- Other platform: https://www.gnu.org/software/sed/
+- Docker
+
+```bash
+docker pull arcblock/blocklet-server-proto
+docker run --rm -v {absolute path of core/schema}:/home/root/schema arcblock/blocklet-server-proto
+```
+
+### Option 2. Build schema with Go
+
+Requirements:
+
+- go 1.8+
+
+#### Install go
+
+- Mac: brew install go
+- Other platform: https://go.dev/doc/install
+
+```shell
+# you can use `go env` to check the go environment
+go env
+
+```
+
+#### Install gnu-sed(MacOS)
+
+```bash
+# Install(Mac OS), other platform: https://www.gnu.org/software/sed/
+brew install gnu-sed
+# Make `sed` command work, only for homebrew:
+PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
+```
 
 #### Install protobuf
 
@@ -21,18 +52,27 @@ You can choose one of the following two ways to build schema.
 #### Add to `~/.profile`
 
 ```shell
+
+vim ~/.profile
+
+# add the profile to the end of the file
+# ----------------------------------------------------------
+
 export GO111MODULE=on
 export GOPROXY=https://goproxy.cn
 
-export GOROOT=/usr/local/Cellar/go/1.15.5/libexec // you local go path
+# you can query the GOROOT/GOPATH/GOBIN by `go env`
+export GOROOT=/usr/local/Cellar/go/1.15.5/libexec // replace to your local go path
 export GOPATH=$HOME/.golang
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOROOT:$GOPATH:$GOBIN
-PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
-```
+
+# ----------------------------------------------------------
 
 source ~/.profile
 
+```
+
 #### Install other dependencies
 
 Run `make init`
@@ -43,15 +83,6 @@ Run `make init`
 
 Run `make build`
 
-### Option 2. Build schema with Docker
-
-If you don't want to install Go-related dependencies, you can build them via the docker:
-
-```bash
-docker pull arcblock/blocklet-server-proto
-docker run --rm -v {absolute path of core/schema}:/home/root/schema arcblock/blocklet-server-proto
-```
-
 ## How To Update Schema
 
 ### 1. update core/schema proto
@@ -68,7 +99,7 @@ just run：
 node tools/start-upgrade-server.js
 ```
 
-> should make sure the DB Proxy is running
+> should make sure the DB Proxy is running, if not, run `yarn start` in a new terminal
 
 ### 3. go to core/client do finally update
 

package/lib/index.js

@@ -59,23 +59,6 @@ input IssuerInput {
 	pk: String  
 }
 
-input MemberInfoInput {
-	did: String  
-	pk: String  
-	role: String  
-	avatar: String  
-	fullName: String  
-	email: String  
-	approved: Boolean  
-	createdAt: String  
-	updatedAt: String  
-	locale: String  
-	passports: [PassportInput!]  
-	firstLoginAt: String  
-	lastLoginAt: String  
-	remark: String  
-}
-
 input NodeInfoInput {
 	name: String  
 	description: String  
@@ -174,6 +157,11 @@ input RequestConfigPassportIssuanceInput {
 	enable: Boolean  
 }
 
+input RequestConfigPublicToStoreInput {
+	did: String  
+	publicToStore: Boolean  
+}
+
 input RequestConfigTrustedPassportsInput {
 	teamDid: String  
 	trustedPassports: [TrustedPassportInput!]  
@@ -336,6 +324,8 @@ input RequestInstallComponentInput {
 	deleteSet: [String!]  
 	name: String  
 	title: String  
+	configs: [ConfigEntryInput!]  
+	downloadToken: String  
 }
 
 input RequestInstallFromVcInput {
@@ -418,7 +408,7 @@ input RequestTeamRoleInput {
 
 input RequestTeamUserInput {
 	teamDid: String  
-	user: MemberInfoInput  
+	user: UserInfoInput  
 }
 
 input RequestUpdateAccessKeyInput {
@@ -463,6 +453,13 @@ input RequestUpgradeBlockletInput {
 	registryUrl: String  
 }
 
+input RequestUsersInput {
+	teamDid: String  
+	query: UserQueryInput  
+	sort: UserSortInput  
+	paging: PagingInput  
+}
+
 input RequestVersionedBlockletInput {
 	did: String  
 	url: String  
@@ -472,6 +469,7 @@ input RequestVersionedBlockletInput {
 	title: String  
 	description: String  
 	startImmediately: Boolean  
+	downloadToken: String  
 }
 
 input RequsetCreateInvitationInput {
@@ -551,6 +549,35 @@ input TrustedPassportMappingToInput {
 	role: String  
 }
 
+input UserInfoInput {
+	did: String  
+	pk: String  
+	role: String  
+	avatar: String  
+	fullName: String  
+	email: String  
+	approved: Boolean  
+	createdAt: String  
+	updatedAt: String  
+	locale: String  
+	passports: [PassportInput!]  
+	firstLoginAt: String  
+	lastLoginAt: String  
+	remark: String  
+}
+
+input UserQueryInput {
+	role: String  
+	approved: Boolean  
+	search: String  
+}
+
+input UserSortInput {
+	updatedAt: Int32  
+	createdAt: Int32  
+	lastLoginAt: Int32  
+}
+
 input WebHookParamInput {
 	name: String  
 	description: String  
@@ -735,6 +762,7 @@ type BlockletSettings {
 	whoCanAccess: String 
 	owner: WalletInfo 
 	children: [DeletedBlockletState!] 
+	publicToStore: Boolean 
 }
 
 type BlockletState {
@@ -906,7 +934,7 @@ type InviteInfo {
 	role: String 
 	remark: String 
 	expireDate: String 
-	inviter: MemberInfo 
+	inviter: UserInfo 
 	teamDid: String 
 	interfaceName: String 
 }
@@ -917,6 +945,11 @@ type Issuer {
 	pk: String 
 }
 
+type KeyValue {
+	key: String 
+	value: Any 
+}
+
 type LatestBlockletVersion {
 	did: String 
 	version: String 
@@ -937,23 +970,6 @@ type MatchedSites {
 	domain: String 
 }
 
-type MemberInfo {
-	did: String 
-	pk: String 
-	role: String 
-	avatar: String 
-	fullName: String 
-	email: String 
-	approved: Boolean 
-	createdAt: String 
-	updatedAt: String 
-	locale: String 
-	passports: [Passport!] 
-	firstLoginAt: String 
-	lastLoginAt: String 
-	remark: String 
-}
-
 type NodeEnvInfo {
 	ip: IPInfo 
 	os: String 
@@ -986,7 +1002,6 @@ type NodeState {
 	initializedAt: String 
 	mode: String 
 	routing: NodeRouting 
-	members: [MemberInfo!] 
 	environments: [ConfigEntry!] 
 	uptime: Float32 
 	autoUpgrade: Boolean 
@@ -1107,6 +1122,8 @@ type ResponseBlockletMetaFromUrl {
 	isFree: Boolean 
 	isInstalled: Boolean 
 	isRunning: Boolean 
+	inStore: Boolean 
+	registryUrl: String 
 }
 
 type ResponseCheckChildBlockletsForUpdates {
@@ -1252,6 +1269,11 @@ type ResponseGetSnapshotSites {
 	sites: [RoutingSite!] 
 }
 
+type ResponseGetUsersCountPerRole {
+	code: StatusCode 
+	counts: [KeyValue!] 
+}
+
 type ResponseInstallFromVc {
 	code: StatusCode 
 	blocklet: BlockletState 
@@ -1331,12 +1353,13 @@ type ResponseUpgradeNodeVersion {
 
 type ResponseUser {
 	code: StatusCode 
-	user: MemberInfo 
+	user: UserInfo 
 }
 
 type ResponseUsers {
 	code: StatusCode 
-	users: [MemberInfo!] 
+	users: [UserInfo!] 
+	paging: Paging 
 }
 
 type ResponseWebHooks {
@@ -1439,6 +1462,23 @@ type UpdateList {
 	meta: BlockletMeta 
 }
 
+type UserInfo {
+	did: String 
+	pk: String 
+	role: String 
+	avatar: String 
+	fullName: String 
+	email: String 
+	approved: Boolean 
+	createdAt: String 
+	updatedAt: String 
+	locale: String 
+	passports: [Passport!] 
+	firstLoginAt: String 
+	lastLoginAt: String 
+	remark: String 
+}
+
 type WalletInfo {
 	did: String 
 	pk: String 
@@ -1540,6 +1580,7 @@ type Mutation {
 	configBlocklet(input: RequestConfigBlockletInput): ResponseConfigBlocklet
 	checkChildBlockletsForUpdates(input: RequestBlockletInput): ResponseCheckChildBlockletsForUpdates
 	updateChildBlocklets(input: RequestUpdateChildBlockletsInput): ResponseBlocklet
+	configPublicToStore(input: RequestConfigPublicToStoreInput): ResponseBlocklet
 	updateNodeInfo(input: NodeInfoInput): ResponseGetNodeInfo
 	updateNodeRouting(input: RequestNodeRoutingInput): ResponseGetNodeInfo
 	upgradeNodeVersion: ResponseUpgradeNodeVersion
@@ -1624,8 +1665,9 @@ type Query {
 	getRoles(input: TeamInput): ResponseRoles
 	getPermissions(input: TeamInput): ResponsePermissions
 	getInvitations(input: TeamInput): ResponseGetInvitations
-	getUsers(input: TeamInput): ResponseUsers
+	getUsers(input: RequestUsersInput): ResponseUsers
 	getUser(input: RequestTeamUserInput): ResponseUser
+	getUsersCountPerRole(input: TeamInput): ResponseGetUsersCountPerRole
 	getOwner(input: TeamInput): ResponseUser
 	getPermissionsByRole(input: RequestTeamRoleInput): ResponsePermissions
 	getPassportIssuances(input: RequestGetPassportIssuancesInput): ResponseGetPassportIssuances

package/lib/schema.graphqls

@@ -59,23 +59,6 @@ input IssuerInput {
 	pk: String  
 }
 
-input MemberInfoInput {
-	did: String  
-	pk: String  
-	role: String  
-	avatar: String  
-	fullName: String  
-	email: String  
-	approved: Boolean  
-	createdAt: String  
-	updatedAt: String  
-	locale: String  
-	passports: [PassportInput!]  
-	firstLoginAt: String  
-	lastLoginAt: String  
-	remark: String  
-}
-
 input NodeInfoInput {
 	name: String  
 	description: String  
@@ -174,6 +157,11 @@ input RequestConfigPassportIssuanceInput {
 	enable: Boolean  
 }
 
+input RequestConfigPublicToStoreInput {
+	did: String  
+	publicToStore: Boolean  
+}
+
 input RequestConfigTrustedPassportsInput {
 	teamDid: String  
 	trustedPassports: [TrustedPassportInput!]  
@@ -336,6 +324,8 @@ input RequestInstallComponentInput {
 	deleteSet: [String!]  
 	name: String  
 	title: String  
+	configs: [ConfigEntryInput!]  
+	downloadToken: String  
 }
 
 input RequestInstallFromVcInput {
@@ -418,7 +408,7 @@ input RequestTeamRoleInput {
 
 input RequestTeamUserInput {
 	teamDid: String  
-	user: MemberInfoInput  
+	user: UserInfoInput  
 }
 
 input RequestUpdateAccessKeyInput {
@@ -463,6 +453,13 @@ input RequestUpgradeBlockletInput {
 	registryUrl: String  
 }
 
+input RequestUsersInput {
+	teamDid: String  
+	query: UserQueryInput  
+	sort: UserSortInput  
+	paging: PagingInput  
+}
+
 input RequestVersionedBlockletInput {
 	did: String  
 	url: String  
@@ -472,6 +469,7 @@ input RequestVersionedBlockletInput {
 	title: String  
 	description: String  
 	startImmediately: Boolean  
+	downloadToken: String  
 }
 
 input RequsetCreateInvitationInput {
@@ -551,6 +549,35 @@ input TrustedPassportMappingToInput {
 	role: String  
 }
 
+input UserInfoInput {
+	did: String  
+	pk: String  
+	role: String  
+	avatar: String  
+	fullName: String  
+	email: String  
+	approved: Boolean  
+	createdAt: String  
+	updatedAt: String  
+	locale: String  
+	passports: [PassportInput!]  
+	firstLoginAt: String  
+	lastLoginAt: String  
+	remark: String  
+}
+
+input UserQueryInput {
+	role: String  
+	approved: Boolean  
+	search: String  
+}
+
+input UserSortInput {
+	updatedAt: Int32  
+	createdAt: Int32  
+	lastLoginAt: Int32  
+}
+
 input WebHookParamInput {
 	name: String  
 	description: String  
@@ -735,6 +762,7 @@ type BlockletSettings {
 	whoCanAccess: String 
 	owner: WalletInfo 
 	children: [DeletedBlockletState!] 
+	publicToStore: Boolean 
 }
 
 type BlockletState {
@@ -906,7 +934,7 @@ type InviteInfo {
 	role: String 
 	remark: String 
 	expireDate: String 
-	inviter: MemberInfo 
+	inviter: UserInfo 
 	teamDid: String 
 	interfaceName: String 
 }
@@ -917,6 +945,11 @@ type Issuer {
 	pk: String 
 }
 
+type KeyValue {
+	key: String 
+	value: Any 
+}
+
 type LatestBlockletVersion {
 	did: String 
 	version: String 
@@ -937,23 +970,6 @@ type MatchedSites {
 	domain: String 
 }
 
-type MemberInfo {
-	did: String 
-	pk: String 
-	role: String 
-	avatar: String 
-	fullName: String 
-	email: String 
-	approved: Boolean 
-	createdAt: String 
-	updatedAt: String 
-	locale: String 
-	passports: [Passport!] 
-	firstLoginAt: String 
-	lastLoginAt: String 
-	remark: String 
-}
-
 type NodeEnvInfo {
 	ip: IPInfo 
 	os: String 
@@ -986,7 +1002,6 @@ type NodeState {
 	initializedAt: String 
 	mode: String 
 	routing: NodeRouting 
-	members: [MemberInfo!] 
 	environments: [ConfigEntry!] 
 	uptime: Float32 
 	autoUpgrade: Boolean 
@@ -1107,6 +1122,8 @@ type ResponseBlockletMetaFromUrl {
 	isFree: Boolean 
 	isInstalled: Boolean 
 	isRunning: Boolean 
+	inStore: Boolean 
+	registryUrl: String 
 }
 
 type ResponseCheckChildBlockletsForUpdates {
@@ -1252,6 +1269,11 @@ type ResponseGetSnapshotSites {
 	sites: [RoutingSite!] 
 }
 
+type ResponseGetUsersCountPerRole {
+	code: StatusCode 
+	counts: [KeyValue!] 
+}
+
 type ResponseInstallFromVc {
 	code: StatusCode 
 	blocklet: BlockletState 
@@ -1331,12 +1353,13 @@ type ResponseUpgradeNodeVersion {
 
 type ResponseUser {
 	code: StatusCode 
-	user: MemberInfo 
+	user: UserInfo 
 }
 
 type ResponseUsers {
 	code: StatusCode 
-	users: [MemberInfo!] 
+	users: [UserInfo!] 
+	paging: Paging 
 }
 
 type ResponseWebHooks {
@@ -1439,6 +1462,23 @@ type UpdateList {
 	meta: BlockletMeta 
 }
 
+type UserInfo {
+	did: String 
+	pk: String 
+	role: String 
+	avatar: String 
+	fullName: String 
+	email: String 
+	approved: Boolean 
+	createdAt: String 
+	updatedAt: String 
+	locale: String 
+	passports: [Passport!] 
+	firstLoginAt: String 
+	lastLoginAt: String 
+	remark: String 
+}
+
 type WalletInfo {
 	did: String 
 	pk: String 
@@ -1542,6 +1582,7 @@ type Mutation {
 	configBlocklet(input: RequestConfigBlockletInput): ResponseConfigBlocklet
 	checkChildBlockletsForUpdates(input: RequestBlockletInput): ResponseCheckChildBlockletsForUpdates
 	updateChildBlocklets(input: RequestUpdateChildBlockletsInput): ResponseBlocklet
+	configPublicToStore(input: RequestConfigPublicToStoreInput): ResponseBlocklet
 	updateNodeInfo(input: NodeInfoInput): ResponseGetNodeInfo
 	updateNodeRouting(input: RequestNodeRoutingInput): ResponseGetNodeInfo
 	upgradeNodeVersion: ResponseUpgradeNodeVersion
@@ -1626,8 +1667,9 @@ type Query {
 	getRoles(input: TeamInput): ResponseRoles
 	getPermissions(input: TeamInput): ResponsePermissions
 	getInvitations(input: TeamInput): ResponseGetInvitations
-	getUsers(input: TeamInput): ResponseUsers
+	getUsers(input: RequestUsersInput): ResponseUsers
 	getUser(input: RequestTeamUserInput): ResponseUser
+	getUsersCountPerRole(input: TeamInput): ResponseGetUsersCountPerRole
 	getOwner(input: TeamInput): ResponseUser
 	getPermissionsByRole(input: RequestTeamRoleInput): ResponsePermissions
 	getPassportIssuances(input: RequestGetPassportIssuancesInput): ResponseGetPassportIssuances

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.26",
+  "version": "1.8.1",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -13,5 +13,5 @@
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
-  "gitHead": "b7ef9b4ddb18f7a0c3898177fe06d9cefe966566"
+  "gitHead": "c970b8a386bebd7fe6dbc8b8eedf8bd8328b4bb5"
 }