Revert "feat: Add hosted domain hint when signing in through Google SSO from subdomain (#2458)" (#2467)

This reverts commit e613ec732b.
This commit is contained in:
Tom Moor
2021-08-21 11:11:01 -07:00
committed by GitHub
parent e613ec732b
commit 72da0653cc
3 changed files with 11 additions and 38 deletions

View File

@@ -10,7 +10,6 @@ import {
GoogleWorkspaceInvalidError,
} from "../../errors";
import passportMiddleware from "../../middlewares/passport";
import { AuthenticationProvider } from "../../models";
import { getAllowedDomains } from "../../utils/authentication";
import { StateStore } from "../../utils/passport";
@@ -87,28 +86,13 @@ if (GOOGLE_CLIENT_ID) {
)
);
router.get("google", async (ctx) => {
const { authProviderId } = ctx.request.query;
if (authProviderId) {
ctx.assertUuid(authProviderId, "authProviderId must be a UUID");
}
const authProvider = authProviderId
? await AuthenticationProvider.findOne({
where: {
id: authProviderId,
name: providerName,
},
})
: undefined;
return passport.authenticate(providerName, {
router.get(
"google",
passport.authenticate(providerName, {
accessType: "offline",
prompt: "select_account consent",
hd: authProvider?.providerId,
})(ctx);
});
})
);
router.get("google.callback", passportMiddleware(providerName));
}