소스 검색

feature: add permissions for default boards

Diego Steiner 1 년 전
부모
커밋
3e469c5a44
1개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 6
      packages/wekan-oidc/oidc_server.js

+ 6 - 6
packages/wekan-oidc/oidc_server.js

@@ -313,17 +313,17 @@ Meteor.methods({
     check(oidcUserId, String);
     check(oidcUserId, String);
 
 
     const defaultBoardParams = (process.env.DEFAULT_BOARD_ID || '').split(':');
     const defaultBoardParams = (process.env.DEFAULT_BOARD_ID || '').split(':');
-    const defaultBoardId = defaultBoardParams.pop()
+    const defaultBoardId = defaultBoardParams.shift()
     if (!defaultBoardId) return
     if (!defaultBoardId) return
 
 
     const board = Boards.findOne(defaultBoardId)
     const board = Boards.findOne(defaultBoardId)
-    const user = Users.findOne({ 'services.oidc.id': oidcUserId })
-    const memberIndex = _.pluck(board.members, 'userId').indexOf(user._id);
-    if(!board || memberIndex > -1) return
+    const userId = Users.findOne({ 'services.oidc.id': oidcUserId })?._id
+    const memberIndex = _.pluck(board?.members, 'userId').indexOf(userId);
+    if(!board || !userId || memberIndex > -1) return
 
 
-    board.addMember(user._id)
+    board.addMember(userId)
     board.setMemberPermission(
     board.setMemberPermission(
-      user._id,
+      userId,
       defaultBoardParams.contains("isAdmin"),
       defaultBoardParams.contains("isAdmin"),
       defaultBoardParams.contains("isNoComments"),
       defaultBoardParams.contains("isNoComments"),
       defaultBoardParams.contains("isCommentsOnly"),
       defaultBoardParams.contains("isCommentsOnly"),