diff --git a/internal/httpapi/dingtalk_register_dws_test.go b/internal/httpapi/dingtalk_register_dws_test.go new file mode 100644 index 0000000..553bf5a --- /dev/null +++ b/internal/httpapi/dingtalk_register_dws_test.go @@ -0,0 +1,45 @@ +package httpapi + +import ( + "context" + "testing" + + "knowledge-governance/internal/dingtalkdiscovery" +) + +// 登记走 dws 不是侧车:解析出来的键、名称、根节点直接决定新来源的确定性 id。 +func TestResolveSpaceViaDWSUsesTheSpaceCredentialsAlreadyHeld(t *testing.T) { + lister := fakeDingtalkSources{result: dingtalkdiscovery.Result{ + KnowledgeBases: []dingtalkdiscovery.KnowledgeBase{ + {Name: "国内技术支持管理", SpaceID: "9JOGOLBQndOyaz4Q"}, + {Name: "视觉文档", SpaceID: "9JOGO9EEOMLMWX4Q"}, + }, + DriveSpaces: []dingtalkdiscovery.DriveSpace{ + {Name: "全员文件夹", SpaceID: "102571304", RootFolderID: "g1YGl6Pm2Db8Dr3OayClVxLq0Ee4p79a"}, + }, + }} + rootKey, name, rootID, spaceID, ok := resolveSpaceViaDWS( + context.Background(), lister, dingtalkdiscovery.SpaceURL("9JOGOLBQndOyaz4Q")) + if !ok || rootKey != "space-9JOGOLBQndOyaz4Q" || name != "国内技术支持管理" || rootID != "9JOGOLBQndOyaz4Q" || spaceID != "9JOGOLBQndOyaz4Q" { + t.Fatalf("knowledge base resolved as key=%q name=%q root=%q space=%q ok=%v", rootKey, name, rootID, spaceID, ok) + } + + // 钉盘的根是 rootFolderId,不是空间 id:抓取侧按它遍历。 + rootKey, _, rootID, _, ok = resolveSpaceViaDWS(context.Background(), lister, dingtalkdiscovery.SpaceURL("102571304")) + if !ok || rootID != "g1YGl6Pm2Db8Dr3OayClVxLq0Ee4p79a" || rootKey != "space-102571304" { + t.Fatalf("drive space resolved as key=%q root=%q ok=%v", rootKey, rootID, ok) + } +} + +func TestResolveSpaceViaDWSLeavesUnknownSpacesToTheFallback(t *testing.T) { + lister := fakeDingtalkSources{result: dingtalkdiscovery.Result{}} + if _, _, _, _, ok := resolveSpaceViaDWS(context.Background(), lister, dingtalkdiscovery.SpaceURL("unknownspace1")); ok { + t.Fatal("an unknown space must not resolve") + } + if _, _, _, _, ok := resolveSpaceViaDWS(context.Background(), nil, dingtalkdiscovery.SpaceURL("9JOGOLBQndOyaz4Q")); ok { + t.Fatal("without a lister nothing can resolve") + } + if _, _, _, _, ok := resolveSpaceViaDWS(context.Background(), lister, "not-a-space-url"); ok { + t.Fatal("a URL without a space id must not resolve") + } +} \ No newline at end of file diff --git a/internal/httpapi/dingtalk_session.go b/internal/httpapi/dingtalk_session.go index d141ccb..f809db0 100644 --- a/internal/httpapi/dingtalk_session.go +++ b/internal/httpapi/dingtalk_session.go @@ -102,6 +102,11 @@ func registerDingtalkSpace(w http.ResponseWriter, r *http.Request, config Config writeJSON(w, http.StatusBadRequest, map[string]string{"error": "url is required"}) return } + // dws 已经持有有效凭据(access 自动续期、refresh 一个月),登记也该走它: + // 只有 dws 解析不出这个空间时,才回落到老的扫码侧车。 + if registered, ok := registerSpaceThroughDWS(w, r, config, strings.TrimSpace(input.URL), operationID); ok || registered { + return + } payload, _ := json.Marshal(map[string]string{"url": strings.TrimSpace(input.URL)}) status, data := proxyDingtalk(http.MethodPost, "/spaces/add", payload) if status != http.StatusOK { @@ -239,3 +244,76 @@ func proxyDingtalk(method, path string, body []byte) (int, []byte) { } return resp.StatusCode, data } + +// resolveSpaceViaDWS 用 dws 列举结果定位一个空间:返回确定性登记键、名称与根节点。 +// 认不出就 ok=false,调用方回落到老的扫码侧车(历史空间仍能被登记)。 +func resolveSpaceViaDWS(ctx context.Context, lister dingtalkSourcesLister, rawURL string) (rootKey, name, rootID, spaceID string, ok bool) { + spaceID = extractDingtalkSpaceID(rawURL) + if lister == nil || spaceID == "" { + return "", "", "", "", false + } + discovered, err := lister.ListAvailableDingtalkSources(ctx) + if err != nil { + return "", "", "", "", false + } + for _, base := range discovered.KnowledgeBases { + if base.SpaceID == spaceID { + // 知识库:URL 里的 id 就是空间 id,抓取侧按 spaces/ 匹配。 + return "space-" + spaceID, base.Name, spaceID, spaceID, true + } + } + for _, space := range discovered.DriveSpaces { + if space.SpaceID == spaceID && space.RootFolderID != "" { + return "space-" + spaceID, space.Name, space.RootFolderID, spaceID, true + } + } + return "", "", "", "", false +} + +// registerSpaceThroughDWS 用 dws 凭据直接登记来源,不再要求扫码会话。 +func registerSpaceThroughDWS(w http.ResponseWriter, r *http.Request, config Config, rawURL, operationID string) (bool, bool) { + ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second) + defer cancel() + rootKey, name, rootID, spaceID, ok := resolveSpaceViaDWS(ctx, config.DingtalkSources, rawURL) + if !ok { + return false, false + } + store, wired := config.Store.(interface { + RegisterDingtalkSpace(context.Context, postgresstore.RegisterDingtalkSpaceInput) (string, error) + }) + if !wired { + writeJSON(w, http.StatusServiceUnavailable, map[string]string{"error": "registration_unavailable"}) + return true, false + } + connectionID, err := store.RegisterDingtalkSpace(ctx, postgresstore.RegisterDingtalkSpaceInput{ + RootKey: rootKey, Name: name, SpaceID: spaceID, RootID: rootID, Now: config.Now(), + }) + switch { + case errors.Is(err, postgresstore.ErrDingtalkSpaceNameTaken): + writeJSON(w, http.StatusOK, map[string]any{"data": map[string]string{"name": name, "already_present": "true"}}) + return true, true + case errors.Is(err, postgresstore.ErrDingtalkSpaceIdentityConflict): + writeJSON(w, http.StatusConflict, map[string]string{ + "error": "space_identity_conflict", + "hint": "这个登记键已指向另一个知识库空间:请刷新列表后重试。", + }) + return true, false + case err != nil: + writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "space_registration_failed"}) + return true, false + } + if enqueuer, wired := config.Store.(interface { + EnqueueCatalogRefreshWithOperation(context.Context, governance.CatalogSource, string, time.Time) (jobs.Job, bool, error) + }); wired { + if _, _, enqueueErr := enqueuer.EnqueueCatalogRefreshWithOperation(ctx, governance.CatalogSource{ + ConnectionID: connectionID, SourceType: governance.SourceTypeDingTalk, Name: name, + }, operationID+":first", config.Now().UTC()); enqueueErr != nil { + log.Printf("dingtalk space %s registered but first refresh enqueue failed: %v", connectionID, enqueueErr) + } + } + log.Printf("dingtalk space %q registered as connection %s by %s (dws)", name, connectionID, actorFor(r)) + writeJSON(w, http.StatusCreated, map[string]any{"data": map[string]string{ + "connection_id": connectionID, "name": name, + }}) + return true, true +}