Permission #1442

FinleyGe · 2024-05-10T10:47:12Z

No description provided.

cla-assistant · 2024-05-10T10:47:27Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ c121914yu
❌ FinleyGe
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

cla-assistant · 2024-05-10T10:47:29Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ c121914yu
❌ FinleyGe
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

c121914yu · 2024-05-10T12:30:42Z

packages/global/support/permission/type.d.ts

@@ -9,3 +9,17 @@ export type AuthResponseType = {
  appId?: string;
  apikey?: string;
 };
+
+export type MetaDataType = {


稍微完善下主语

c121914yu · 2024-05-10T12:31:12Z

packages/global/support/permission/type.d.ts

+
+export type ResourcePermissionType = {
+  metaData: MetaDataType;
+  userPermissionTable: Array<{


统一用［］

comment the defaultPermission

packages/service/support/permission/resourcePermission/permisson.ts

c121914yu · 2024-05-10T12:33:16Z

packages/service/support/permission/resourcePermission/schema.ts

+});
+
+export const MongoUserPermission: Model<SchemaType> =
+  models['user_permission'] || model('user_permission', UserPermissionSchema);


复用下面名。
这里是用户的还是团队的？
用 user.xxx 这类命名吧，和其他集合一样。

不用 schema

c121914yu · 2024-05-10T12:35:32Z

projects/app/src/components/support/user/team/TeamManageModal/TeamCard.tsx

+    },
+    {
+      label: '权限',
+      value: 'permission'


创个枚举

c121914yu · 2024-05-10T12:37:45Z

projects/app/src/components/support/user/team/TeamManageModal/index.tsx

@@ -128,7 +123,23 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
  });

  return !!userInfo?.team ? (
-    <>
+    <TeamContext.Provider
+      value={{


有些方法，只有一个地方用到，不需要都塞 context

FinleyGe · 2024-05-11T02:50:20Z

packages/global/support/permission/type.d.ts

+
+export type ResourcePermissionType = {
+  metaData: MetaDataType;
+  userPermissionTable: Array<{


comment the defaultPermission

FinleyGe · 2024-05-11T02:52:15Z

packages/global/support/permission/type.d.ts

+export type ResourcePermissionType = {
+  metaData: MetaDataType;
+  userPermissionTable: Array<{
+    user: UserModelSchema;


user should be string.
user -> memberId.

FinleyGe · 2024-05-11T02:55:57Z

packages/global/support/user/team/type.d.ts

  role: `${TeamMemberRoleEnum}`;
  status: `${TeamMemberStatusEnum}`;
+  permission: number;


type should be PermissionValueType

FinleyGe · 2024-05-11T03:10:33Z

packages/service/support/permission/resourcePermission/permisson.ts

+}
+
+// check the permission
+export function checkPermission(val: PermissionValueType, perm: PermissionType): boolean {


perm: PermissionValueType

FinleyGe · 2024-05-11T03:11:11Z

packages/service/support/permission/resourcePermission/permisson.ts

+export type PermissionValueType = number;
+export type PermissionType = [string, PermissionValueType];
+
+export const ReadPerm: PermissionType = ['Read', 0b100];


turn the 3 permissions list into a object, which is able to be extended.

FinleyGe · 2024-05-11T04:00:08Z

packages/global/support/user/team/controller.d.ts

+
+export type UpdateTeamMemberPermissionProps = {
+  teamId: string;
+  memberId: string[];


memberIdList

FinleyGe · 2024-05-11T04:14:35Z

packages/service/support/permission/resourcePermission/schema.ts

+});
+
+export const MongoUserPermission: Model<SchemaType> =
+  models['user_permission'] || model('user_permission', UserPermissionSchema);


不用 schema

FinleyGe · 2024-05-11T04:15:04Z

packages/service/support/user/team/teamSchema.ts

@@ -46,6 +47,9 @@ const TeamSchema = new Schema({
    pat: {
      type: String
    }
+  },
+  resourcePermission: {
+    type: ResourcePermissonSchema


写成对象

FinleyGe · 2024-05-11T04:15:51Z

projects/app/public/locales/en/common.json

delete this file

This reverts commit 83d85df.

- add a new icon

c121914yu · 2024-05-17T06:05:01Z

packages/service/support/permission/resourcePermission/controller.ts

+  return (await MongoResourcePermission.findOne({
+    tmbId,
+    resourceType
+  }).exec()) as ResourcePermissionType;


之前这个查询一直有问题，各种尝试的过程中加上去的 exec 。。功能上没有什么区别，可以删掉，参考：
https://stackoverflow.com/a/68469848/10794921

c121914yu · 2024-05-17T06:05:25Z

packages/service/support/permission/resourcePermission/constant.ts

@@ -0,0 +1 @@
+export const ResourcePermissionCollectionName = 'resource_permission';


这个直接放到schema文件里export就ok了

c121914yu · 2024-05-17T06:07:46Z

packages/service/support/permission/resourcePermission/permisson.ts

+}
+
+export function constructPermission(permList: PermissionValueType[]) {
+  return new Permission(0).add(...permList);


那就写一个新的 NullPermission = 0 语义化以下

packages/service/support/permission/resourcePermission/schema.ts

c121914yu · 2024-05-17T06:11:12Z

packages/service/support/user/team/teamSchema.ts

@@ -13,6 +13,10 @@ const TeamSchema = new Schema({
    type: Schema.Types.ObjectId,
    ref: userCollectionName
  },
+  defaultPermission: {
+    type: Number,
+    default: 0


0能不能找个变量替换，不好理解

* Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85df. * feat: add permission display in the team manager modal * feat: add permission i18n * feat: let team module acquire permission ablity * feat: add ownerPermission property into metaData * feat: team premission system * feat: extract the resourcePermission from resource schemas * fix: move enum definition to constant * feat: auth member permission handler, invite user * feat: permission manage * feat: adjust the style * feat: team card style - add a new icon * feat: team permission in guest mode * chore: change the type * chore: delete useless file * chore: delete useless code * feat: do not show owner in PermissionManage view * chore: fix style * fix: icon remove fill * feat: adjust the codes --------- Co-authored-by: Archer <545436317@qq.com>

* Permission (#1442) * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85df. * feat: add permission display in the team manager modal * feat: add permission i18n * feat: let team module acquire permission ablity * feat: add ownerPermission property into metaData * feat: team premission system * feat: extract the resourcePermission from resource schemas * fix: move enum definition to constant * feat: auth member permission handler, invite user * feat: permission manage * feat: adjust the style * feat: team card style - add a new icon * feat: team permission in guest mode * chore: change the type * chore: delete useless file * chore: delete useless code * feat: do not show owner in PermissionManage view * chore: fix style * fix: icon remove fill * feat: adjust the codes --------- Co-authored-by: Archer <545436317@qq.com> * perf: permission modal * lock --------- Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>

pull-request-size bot added the size/XXL label May 10, 2024

c121914yu reviewed May 11, 2024

View reviewed changes

FinleyGe commented May 11, 2024

View reviewed changes

FinleyGe force-pushed the permission branch 3 times, most recently from 29183bb to 050b981 Compare May 16, 2024 07:42

c121914yu and others added 13 commits May 16, 2024 15:54

Revert "lafAccount add pat & re request when token invalid (#76)" (#77)

824b771

This reverts commit 83d85df.

feat: add permission display in the team manager modal

3aa755c

feat: add permission i18n

20d4eab

feat: let team module acquire permission ablity

fa2a53d

feat: add ownerPermission property into metaData

f648ed2

feat: team premission system

f7627cd

feat: extract the resourcePermission from resource schemas

0cc3c60

fix: move enum definition to constant

1a24205

feat: auth member permission handler, invite user

e9657ca

feat: permission manage

be9bed2

feat: adjust the style

91e3474

feat: team card style

78f8be5

- add a new icon

feat: team permission in guest mode

f58874f

FinleyGe force-pushed the permission branch from 050b981 to f58874f Compare May 16, 2024 07:56

FinleyGe added 6 commits May 16, 2024 16:01

chore: change the type

1959bdb

chore: delete useless file

6fc08b9

chore: delete useless code

221abb2

feat: do not show owner in PermissionManage view

3f6f0bf

chore: fix style

ae5a1df

fix: icon remove fill

1bb0c2d

c121914yu reviewed May 17, 2024

View reviewed changes

packages/service/support/permission/resourcePermission/schema.ts Show resolved Hide resolved

c121914yu reviewed May 17, 2024

View reviewed changes

feat: adjust the codes

cde90ab

c121914yu approved these changes May 17, 2024

View reviewed changes

c121914yu merged commit e59696f into labring:permission May 17, 2024
1 check was pending

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Permission #1442

Permission #1442

FinleyGe commented May 10, 2024

cla-assistant bot commented May 10, 2024 •

edited

cla-assistant bot commented May 10, 2024

c121914yu May 10, 2024

c121914yu May 10, 2024

FinleyGe May 11, 2024

c121914yu May 10, 2024

FinleyGe May 11, 2024

c121914yu May 10, 2024

c121914yu May 10, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

FinleyGe May 11, 2024

c121914yu May 17, 2024

FinleyGe May 17, 2024

c121914yu May 17, 2024

c121914yu May 17, 2024

FinleyGe May 17, 2024

c121914yu May 17, 2024

		@@ -0,0 +1 @@
		export const ResourcePermissionCollectionName = 'resource_permission';

Permission #1442

Permission #1442

Conversation

FinleyGe commented May 10, 2024

cla-assistant bot commented May 10, 2024 • edited

cla-assistant bot commented May 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cla-assistant bot commented May 10, 2024 •

edited