Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(SSO): JWTやSAMLでのSingle Sign-Onの実装 (MisskeyIO#519)

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-03-15 01:30:56 +09:00 • committed by GitHub
parent d300a6829f
commit 8c1db331e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 4094 additions and 1725 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/server/oauth/OAuth2ProviderService.ts
View file

@ -36,7 +36,7 @@ import type {
AccessTokensRepository,
IndieAuthClientsRepository,
UserProfilesRepository,
UsersRepository
UsersRepository,
} from '@/models/_.js';
import { IdService } from '@/core/IdService.js';
import { CacheService } from '@/core/CacheService.js';
@ -474,7 +474,7 @@ export class OAuth2ProviderService {
fastify.use('/decision', this.#server.decision((req, done) => {
const { body } = req as OAuth2DecisionRequest;
this.#logger.info(`Received the decision. Cancel: ${!!body.cancel}`);
req.user = body.login_token;
if (!body.cancel) req.user = body.login_token;
done(null, undefined);
}));
fastify.use('/decision', this.#server.errorHandler());
@ -508,7 +508,7 @@ export class OAuth2ProviderService {
return;
}
const accessToken = await this.accessTokensRepository.findOneBy({ token });
const accessToken = await this.accessTokensRepository.findOne({ where: { token }, relations: ['user'] });
if (!accessToken) {
reply.code(401);
return;
@ -525,7 +525,8 @@ export class OAuth2ProviderService {
picture: accessToken.user?.avatarUrl,
email: user?.email,
email_verified: user?.emailVerified,
updated_at: (accessToken.lastUsedAt?.getTime() ?? 0) / 1000,
mfa_enabled: user?.twoFactorEnabled,
updated_at: (accessToken.user?.updatedAt?.getTime() ?? accessToken.user?.createdAt.getTime() ?? 0) / 1000,
};
});
}
@ -543,7 +544,7 @@ export class OAuth2ProviderService {
return;
}
const accessToken = await this.accessTokensRepository.findOneBy({ token });
const accessToken = await this.accessTokensRepository.findOne({ where: { token }, relations: ['user'] });
reply.code(200);
if (!accessToken) return { active: false };