WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-08-24 13:22:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

UBERF-8488: Fix github re-auth (#7041)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev
2024-10-26 23:27:24 +07:00
committed by GitHub
parent e11a0a87cb
commit 88dd3ddd04
3 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/github/pod-github/src/platform.ts
+50 -7
View File
@@ -390,14 +390,57 @@ export class PlatformWorker {
}
const client = new TxOperations(platformClient, payload.accountId)
const personAuth = await client.findOne(github.class.GithubAuthentication, {
let personAuths = await client.findAll(github.class.GithubAuthentication, {
attachedTo: payload.accountId
})
if (personAuth !== undefined) {
if (revoke) {
if (personAuths.length > 1) {
for (const auth of personAuths.slice(1)) {
await client.remove(auth)
}
personAuths.length = 1
}
if (revoke) {
for (const personAuth of personAuths) {
await client.remove(personAuth, Date.now(), payload.accountId)
} else {
await client.update<GithubAuthentication>(personAuth, update, false, Date.now(), payload.accountId)
}
} else {
if (personAuths.length > 0) {
await client.update<GithubAuthentication>(personAuths[0], update, false, Date.now(), payload.accountId)
} else if (dta !== undefined) {
const authId = await client.createDoc<GithubAuthentication>(
github.class.GithubAuthentication,
core.space.Workspace,
{
error: null,
authRequestTime: Date.now(),
createdAt: new Date(),
followers: 0,
following: 0,
nodeId: '',
updatedAt: new Date(),
url: '',
repositories: 0,
organizations: { totalCount: 0, nodes: [] },
closedIssues: 0,
openIssues: 0,
mergedPRs: 0,
openPRs: 0,
closedPRs: 0,
repositoryDiscussions: 0,
starredRepositories: 0,
...update,
attachedTo: payload.accountId,
login: dta._id
},
undefined,
undefined,
payload.accountId
)
personAuths = await client.findAll(github.class.GithubAuthentication, {
_id: authId
})
}
}
@@ -454,9 +497,9 @@ export class PlatformWorker {
}
}
if (dta !== undefined && personAuth !== undefined) {
if (dta !== undefined && personAuths.length === 1) {
try {
await syncUser(this.ctx, dta, personAuth, client, payload.accountId)
await syncUser(this.ctx, dta, personAuths[0], client, payload.accountId)
} catch (err: any) {
if (err.response?.data?.message === 'Bad credentials') {
await this.revokeUserAuth(dta)