moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Fix external service authentication (#4846)

Browse Source
This commit is contained in:
Satsuki Yanagi 2019-05-03 18:38:19 +09:00 committed by syuilo
parent 9d1ed1eb0d
commit 0e764a2b3e
5 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
migration/1556746559567-UserProfile.ts Normal file
View File

@ -0,0 +1,23 @@
import {MigrationInterface, QueryRunner} from "typeorm";
export class UserProfile1556746559567 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" VARCHAR(64)`);
await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" VARCHAR(64)`);
}
public async down(queryRunner: QueryRunner): Promise<any> {
await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" INTEGER`);
await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" INTEGER`);
}
}

12
src/models/entities/user-profile.ts
View File

@ -144,10 +144,10 @@ export class UserProfile {
})
public githubAccessToken: string | null;
@Column('integer', {
nullable: true, default: null,
@Column('varchar', {
length: 64, nullable: true, default: null,
})
public githubId: number | null;
public githubId: string | null;
@Column('varchar', {
length: 64, nullable: true, default: null,
@ -169,10 +169,10 @@ export class UserProfile {
})
public discordRefreshToken: string | null;
@Column('integer', {
nullable: true, default: null,
@Column('varchar', {
length: 64, nullable: true, default: null,
})
public discordExpiresDate: number | null;
public discordExpiresDate: string | null;
@Column('varchar', {
length: 64, nullable: true, default: null,

8
src/server/api/service/discord.ts
View File

@ -203,12 +203,8 @@ router.get('/dc/cb', async ctx => {
}
const profile = await UserProfiles.createQueryBuilder()
.where('discord @> :discord', {
discord: {
id: id,
},
})
.andWhere('userHost IS NULL')
.where('"discordId" = :id', { id: id })
.andWhere('"userHost" IS NULL')
.getOne();
if (profile == null) {

8
src/server/api/service/github.ts
View File

@ -193,12 +193,8 @@ router.get('/gh/cb', async ctx => {
}
const link = await UserProfiles.createQueryBuilder()
.where('github @> :github', {
github: {
id: id,
},
})
.andWhere('userHost IS NULL')
.where('"githubId" = :id', { id: id })
.andWhere('"userHost" IS NULL')
.getOne();
if (link == null) {

8
src/server/api/service/twitter.ts
View File

@ -141,12 +141,8 @@ router.get('/tw/cb', async ctx => {
const result = await twAuth!.done(JSON.parse(twCtx), ctx.query.oauth_verifier);
const link = await UserProfiles.createQueryBuilder()
.where('twitter @> :twitter', {
twitter: {
userId: result.userId,
},
})
.andWhere('userHost IS NULL')
.where('"twitterUserId" = :id', { id: result.userId })
.andWhere('"userHost" IS NULL')
.getOne();
if (link == null) {