commit

backend/src/routes/v1/sso.ts

@@ -26,7 +26,7 @@ router.get(
 );
 
 router.get("/redirect/github", authLimiter, (req, res, next) => {
-    passport.authenticate("github", {
+    passport.authenticate("oauth2", {
         session: false,
         ...(req.query.callback_port
         ? {
@@ -39,7 +39,7 @@ router.get("/redirect/github", authLimiter, (req, res, next) => {
 router.get(
     "/github",
     authLimiter,
-    passport.authenticate("github", {
+    passport.authenticate("oauth2", {
         failureRedirect: "/login/provider/error",
         session: false
     }),
@@ -50,7 +50,7 @@ router.get(
     "/redirect/gitlab",
     authLimiter,
     (req, res, next) => {
-        passport.authenticate("gitlab", {
+        passport.authenticate("oauth2", {
         session: false,
             ...(req.query.callback_port ? {
             state: req.query.callback_port as string
@@ -62,7 +62,7 @@ router.get(
 router.get(
     "/gitlab",
     authLimiter,
-    passport.authenticate("gitlab", {
+    passport.authenticate("oauth2", {
       failureRedirect: "/login/provider/error",
       session: false
     }),

backend/src/utils/auth.ts

@@ -32,9 +32,9 @@ import { standardRequest } from "../config/request";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const GoogleStrategy = require("passport-google-oauth20").Strategy;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const GitHubStrategy = require("passport-github").Strategy;
+const GitHubStrategy = require("passport-oauth2").Strategy;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const GitLabStrategy = require("passport-gitlab2").Strategy;
+const GitLabStrategy = require("passport-oauth2").Strategy;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { MultiSamlStrategy } = require("@node-saml/passport-saml");
 
@@ -158,10 +158,11 @@ const initializePassport = async () => {
 
   if (clientIdGitHubLogin && clientSecretGitHubLogin) {
     passport.use(new GitHubStrategy({
-      passReqToCallback: true,
-      clientID: clientIdGitHubLogin,
-      clientSecret: clientSecretGitHubLogin,
-      callbackURL: "/api/v1/sso/github",
+      authorizationURL: 'https://git.cereg.com/login/oauth/authorize',
+      tokenURL: 'https://git.cereg.com/login/oauth/access_token',
+      clientID: clientIdGitLabLogin,
+      clientSecret: clientSecretGitLabLogin,
+      callbackURL: "/api/v1/sso/gitlab",
       scope: ["user:email"]
     },
     async (req : express.Request, accessToken : any, refreshToken : any, profile : any, done : any) => {
@@ -231,6 +232,8 @@ const initializePassport = async () => {
   if (urlGitLab && clientIdGitLabLogin && clientSecretGitLabLogin) {
     passport.use(new GitLabStrategy({
       passReqToCallback: true,
+      authorizationURL: 'https://git.cereg.com/login/oauth/authorize',
+      tokenURL: 'https://git.cereg.com/login/oauth/access_token',
       clientID: clientIdGitLabLogin,
       clientSecret: clientSecretGitLabLogin,
       callbackURL: "/api/v1/sso/gitlab",