diff --git a/packages/importer/src/huly/huly.ts b/packages/importer/src/huly/huly.ts index a940364adf..893267f64b 100644 --- a/packages/importer/src/huly/huly.ts +++ b/packages/importer/src/huly/huly.ts @@ -643,6 +643,7 @@ export class HulyFormatImporter { class: documents.class.OrgSpace, title: data.title, private: data.private ?? false, + autoJoin: data.autoJoin ?? false, archived: data.archived ?? false, description: data.description, owners: data.owners?.map((name) => this.findAccountByName(name)) ?? [], diff --git a/services/github/pod-github/Readme.md b/services/github/pod-github/Readme.md index a3dfd17950..427d85fe08 100644 --- a/services/github/pod-github/Readme.md +++ b/services/github/pod-github/Readme.md @@ -99,3 +99,5 @@ _Note: PK value format: "-----BEGIN RSA PRIVATE KEY-----\n {ACTUAL_KEY_WO_LINE_B * On the first tab authorise your GitHub * On the second tab of the dialog install the application, select a GH repo and connect to an existing/create a new connected repo in the tracker. * Enjoy! + +_Note: If the application is already installed in GitHub, make any change e.g. switch between "All repositories" and "Only select repositories" and click "Save"._ \ No newline at end of file diff --git a/services/github/pod-github/src/worker.ts b/services/github/pod-github/src/worker.ts index d38d28ac3b..ace10fd165 100644 --- a/services/github/pod-github/src/worker.ts +++ b/services/github/pod-github/src/worker.ts @@ -329,10 +329,12 @@ export class GithubWorker implements IntegrationManager { .reverse() .join(',') // TODO: Convert first, last name - const infos = await this.liveQuery.findOne(github.class.GithubUserInfo, { login: userInfo.login }) + const normalizedLogin = userInfo.login.toLowerCase() + const infos = await this.liveQuery.findOne(github.class.GithubUserInfo, { login: normalizedLogin }) if (infos === undefined) { await this._client.createDoc(github.class.GithubUserInfo, contact.space.Contacts, { - ...userInfo + ...userInfo, + login: normalizedLogin }) } @@ -542,15 +544,15 @@ export class GithubWorker implements IntegrationManager { } ) const infoData = response.user + const normalizedInfoData: Data = { + ...infoData, + login: infoData.login?.toLowerCase() + } if (info == null) { - await this._client.createDoc( - github.class.GithubUserInfo, - contact.space.Contacts, - infoData as Data - ) + await this._client.createDoc(github.class.GithubUserInfo, contact.space.Contacts, normalizedInfoData) } else { await this._client.diffUpdate(info, { - ...infoData + ...normalizedInfoData }) } }