sso

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/SyncServiceImpl.java

@@ -158,7 +158,7 @@ public class SyncServiceImpl implements SyncService {
         directorySync.setStatus(syncStatusEnum.value());
         directorySync.setSyncTime(new Date());
         directorySync.setDirectorySyncId(syncId);
-        directorySyncService.create(directorySync);
+        directorySyncService.update(directorySync);
     }
 
     private String startLog(Directory directory) {
@@ -167,7 +167,7 @@ public class SyncServiceImpl implements SyncService {
         directorySync.setDirectoryId(directory.getDirectoryId());
         directorySync.setStatus(SyncStatusEnum.SYNC_ING.value());
         directorySync.setSyncTime(new Date());
-        directorySync.setDirectorySyncId(CommonUtils.generateId());
+        directorySync.setDirectorySyncId(syncId);
         directorySyncService.create(directorySync);
         return syncId;
     }
@@ -211,9 +211,13 @@ public class SyncServiceImpl implements SyncService {
         if(CollectionUtils.isEmpty(list)){
             throw new BackendRuntimeException(SSOConstant.DOMAIN_NOT_EXIST);
         }
-        DomainCollectionResponse domainCollectionResponse =  graphClient.domains().get();
-        List<String> domainList = domainCollectionResponse.getValue().stream().map(com.microsoft.graph.models.Domain::getId).collect(Collectors.toList());
-        if(!domainList.contains(list.get(0).getDomain())){
+        try {
+            DomainCollectionResponse domainCollectionResponse =  graphClient.domains().get();
+            List<String> domainList = domainCollectionResponse.getValue().stream().map(com.microsoft.graph.models.Domain::getId).collect(Collectors.toList());
+            if(!domainList.contains(list.get(0).getDomain())){
+                throw new BackendRuntimeException(SSOConstant.DOMAIN_NOT_EXIST);
+            }
+        }catch (Exception e){
             throw new BackendRuntimeException(SSOConstant.DOMAIN_NOT_EXIST);
         }
     }
@@ -233,7 +237,7 @@ public class SyncServiceImpl implements SyncService {
             String name = user.getDisplayName();
             String id = user.getId();
 
-            VppMember member = vppMemberService.getByAccount(email);
+            VppMember member = vppMemberService.getByAccountSSO(email);
 
             if (ObjectUtils.isEmpty(member)) {
                 VppMember newMember = new VppMember().withId(id)

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppMemberServiceImpl.java

@@ -109,7 +109,7 @@ public class VppMemberServiceImpl implements VppMemberService {
     @Override
     public VppMember getByAccountSSO(String account) {
         VppMemberExample example = new VppMemberExample();
-        example.createCriteria().andEmailEqualTo(account).andValidFlagEqualTo(ValidStatusEnum.VALID.value()).andIsSsoEqualTo(ValidStatusEnum.VALID.value());
+        example.createCriteria().andEmailEqualTo(account).andIsSsoEqualTo(ValidStatusEnum.VALID.value());
         List<VppMember> users = vppMemberMapper.selectByExample(example);
         return CollectionUtils.isEmpty(users) ? null : users.get(0);
     }