CodeCow/stack
1
0
Fork 0
mirror of https://github.com/stack-auth/stack.git synced 2026-06-04 21:04:37 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove shared Facebook (#238)

Browse Source 
* removed facebook shared

* updated test

* added migration file

* facebook enabled var

* fixed migration file

* fixed connected account migration file
This commit is contained in:
Zai Shi 2024-09-11 02:25:18 +02:00 committed by GitHub
parent a9ebbccecd
commit 84e30eead0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 87 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/backend/.env
View File

@ -11,8 +11,6 @@ STACK_GITHUB_CLIENT_ID=# client
STACK_GITHUB_CLIENT_SECRET=# client secret
STACK_GOOGLE_CLIENT_ID=# client id
STACK_GOOGLE_CLIENT_SECRET=# client secret
STACK_FACEBOOK_CLIENT_ID=# client id
STACK_FACEBOOK_CLIENT_SECRET=# client secret
STACK_MICROSOFT_CLIENT_ID=# client id
STACK_MICROSOFT_CLIENT_SECRET=# client secret
STACK_SPOTIFY_CLIENT_ID=# client id

2
apps/backend/.env.development
View File

@ -7,8 +7,6 @@ STACK_GITHUB_CLIENT_ID=MOCK
STACK_GITHUB_CLIENT_SECRET=MOCK
STACK_GOOGLE_CLIENT_ID=MOCK
STACK_GOOGLE_CLIENT_SECRET=MOCK
STACK_FACEBOOK_CLIENT_ID=MOCK
STACK_FACEBOOK_CLIENT_SECRET=MOCK
STACK_MICROSOFT_CLIENT_ID=MOCK
STACK_MICROSOFT_CLIENT_SECRET=MOCK
STACK_SPOTIFY_CLIENT_ID=MOCK

2
apps/backend/prisma/migrations/20240901224341_connected_account/migration.sql
View File

@ -224,7 +224,7 @@ INSERT INTO "OtpAuthMethodConfig" ("projectConfigId", "authMethodConfigId", "cre
SELECT "id", gen_random_uuid(), "createdAt", "updatedAt", 'EMAIL'
FROM "ProjectConfig";
INSERT INTO "AuthMethodConfig" ("projectConfigId", "id", "createdAt", "updatedAt", "enabled")
SELECT "projectConfigId", "authMethodConfigId", "OtpAuthMethodConfig"."createdAt", "OtpAuthMethodConfig"."updatedAt", ("ProjectConfig"."credentialEnabled" = true)
SELECT "projectConfigId", "authMethodConfigId", "OtpAuthMethodConfig"."createdAt", "OtpAuthMethodConfig"."updatedAt", ("ProjectConfig"."magicLinkEnabled" = true)
FROM "OtpAuthMethodConfig"
LEFT JOIN "ProjectConfig" ON "OtpAuthMethodConfig"."projectConfigId" = "ProjectConfig"."id";

46
apps/backend/prisma/migrations/20240910211533_remove_shared_facebook/migration.sql Normal file
View File

@ -0,0 +1,46 @@
/*
Warnings:
- The values [FACEBOOK] on the enum `ProxiedOAuthProviderType` will be removed. If these variants are still used in the database, this will fail.
*/
-- Update shared facebook project to be a standard oauth provider
-- First, disable all the auth method configs that are shared facebook
UPDATE "AuthMethodConfig"
SET "enabled" = false
WHERE "id" IN (
SELECT "authMethodConfigId"
FROM "OAuthProviderConfig"
WHERE "id" IN (
SELECT "id"
FROM "ProxiedOAuthProviderConfig"
WHERE "type" = 'FACEBOOK'
)
);
-- Second, create StandardOAuthProviderConfig entries for Facebook providers
INSERT INTO "StandardOAuthProviderConfig" ("projectConfigId", "id", "type", "clientId", "clientSecret", "createdAt", "updatedAt")
SELECT
p."projectConfigId",
p."id",
'FACEBOOK',
'client id',
'client secret',
NOW(),
NOW()
FROM "ProxiedOAuthProviderConfig" p
WHERE p."type" = 'FACEBOOK';
-- Then, delete the corresponding ProxiedOAuthProviderConfig entries
DELETE FROM "ProxiedOAuthProviderConfig"
WHERE "type" = 'FACEBOOK';
-- AlterEnum
BEGIN;
CREATE TYPE "ProxiedOAuthProviderType_new" AS ENUM ('GITHUB', 'GOOGLE', 'MICROSOFT', 'SPOTIFY');
ALTER TABLE "ProxiedOAuthProviderConfig" ALTER COLUMN "type" TYPE "ProxiedOAuthProviderType_new" USING ("type"::text::"ProxiedOAuthProviderType_new");
ALTER TYPE "ProxiedOAuthProviderType" RENAME TO "ProxiedOAuthProviderType_old";
ALTER TYPE "ProxiedOAuthProviderType_new" RENAME TO "ProxiedOAuthProviderType";
DROP TYPE "ProxiedOAuthProviderType_old";
COMMIT;

1
apps/backend/prisma/schema.prisma
View File

@ -444,7 +444,6 @@ model ProxiedOAuthProviderConfig {
enum ProxiedOAuthProviderType {
GITHUB
FACEBOOK
GOOGLE
MICROSOFT
SPOTIFY

4
apps/backend/prisma/seed.ts
View File

@ -38,7 +38,7 @@ async function seed() {
create: {
allowLocalhost: true,
oauthProviderConfigs: {
create: (['github', 'facebook', 'google', 'microsoft'] as const).map((id) => ({
create: (['github', 'spotify', 'google', 'microsoft'] as const).map((id) => ({
id,
proxiedOAuthConfig: {
create: {
@ -86,7 +86,7 @@ async function seed() {
}
}
},
...(['github', 'facebook', 'google', 'microsoft'] as const).map((id) => ({
...(['github', 'spotify', 'google', 'microsoft'] as const).map((id) => ({
oauthProviderConfig: {
connect: {
projectConfigId_id: {

2
apps/dashboard/.env
View File

@ -12,8 +12,6 @@ STACK_GITHUB_CLIENT_ID=# client
STACK_GITHUB_CLIENT_SECRET=# client secret
STACK_GOOGLE_CLIENT_ID=# client id
STACK_GOOGLE_CLIENT_SECRET=# client secret
STACK_FACEBOOK_CLIENT_ID=# client id
STACK_FACEBOOK_CLIENT_SECRET=# client secret
STACK_MICROSOFT_CLIENT_ID=# client id
STACK_MICROSOFT_CLIENT_SECRET=# client secret
STACK_SPOTIFY_CLIENT_ID=# client id

4
apps/dashboard/src/app/(main)/(protected)/(outside-dashboard)/new-project/page-client.tsx
View File

@ -37,7 +37,7 @@ export default function PageClient () {
signUpEnabled: true,
credentialEnabled: form.watch("signInMethods").includes("credential"),
magicLinkEnabled: form.watch("signInMethods").includes("magicLink"),
oauthProviders: form.watch('signInMethods').filter((method) => ["google", "github", "microsoft", "facebook"].includes(method)).map(provider => ({ id: provider, type: 'shared' })),
oauthProviders: form.watch('signInMethods').filter((method) => ["google", "github", "microsoft", "spotify"].includes(method)).map(provider => ({ id: provider, type: 'shared' })),
}
};
@ -88,7 +88,7 @@ export default function PageClient () {
{ value: "google", label: "Google" },
{ value: "github", label: "GitHub" },
{ value: "microsoft", label: "Microsoft" },
{ value: "facebook", label: "Facebook" },
{ value: "spotify", label: "Spotify" },
]}
/>

4
apps/e2e/tests/backend/backend-helpers.ts
View File

@ -403,7 +403,7 @@ export namespace Auth {
}
export async function authorize(options?: { redirectUrl?: string, errorRedirectUrl?: string }) {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/facebook", {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/spotify", {
redirect: "manual",
query: {
...await Auth.OAuth.getAuthorizeQuery(),
@ -495,7 +495,7 @@ export namespace Auth {
});
const innerCallbackUrl = new URL(redirectResponse3.headers.get("location") ?? throwErr("missing redirect location", { redirectResponse3 }));
expect(innerCallbackUrl.origin).toBe("http://localhost:8102");
expect(innerCallbackUrl.pathname).toBe("/api/v1/auth/oauth/callback/facebook");
expect(innerCallbackUrl.pathname).toBe("/api/v1/auth/oauth/callback/spotify");
return {
...options,
innerCallbackUrl,

12
apps/e2e/tests/backend/endpoints/api/v1/auth/oauth/authorize.test.ts
View File

@ -11,11 +11,11 @@ it("should redirect the user to the OAuth provider with the right arguments", as
it("should be able to fetch the inner callback URL by following the OAuth provider redirects", async ({ expect }) => {
const { innerCallbackUrl } = await Auth.OAuth.getInnerCallbackUrl();
expect(innerCallbackUrl.origin).toBe("http://localhost:8102");
expect(innerCallbackUrl.pathname).toBe("/api/v1/auth/oauth/callback/facebook");
expect(innerCallbackUrl.pathname).toBe("/api/v1/auth/oauth/callback/spotify");
});
it("should fail if an invalid client_id is provided", async ({ expect }) => {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/facebook", {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/spotify", {
redirect: "manual",
query: {
...await Auth.OAuth.getAuthorizeQuery(),
@ -39,7 +39,7 @@ it("should fail if an invalid client_id is provided", async ({ expect }) => {
});
it("should fail if an invalid client_secret is provided", async ({ expect }) => {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/facebook", {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/spotify", {
redirect: "manual",
query: {
...await Auth.OAuth.getAuthorizeQuery(),
@ -63,7 +63,7 @@ it("should fail if an invalid client_secret is provided", async ({ expect }) =>
});
it("should fail if an invalid redirect URL is provided", async ({ expect }) => {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/facebook", {
const response = await niceBackendFetch("/api/v1/auth/oauth/authorize/spotify", {
redirect: "manual",
query: {
...await Auth.OAuth.getAuthorizeQuery(),
@ -75,8 +75,8 @@ it("should fail if an invalid redirect URL is provided", async ({ expect }) => {
"status": 400,
"body": {
"code": "SCHEMA_ERROR",
"details": { "message": "Request validation failed on GET /api/v1/auth/oauth/authorize/facebook:\\n - Invalid URL" },
"error": "Request validation failed on GET /api/v1/auth/oauth/authorize/facebook:\\n - Invalid URL",
"details": { "message": "Request validation failed on GET /api/v1/auth/oauth/authorize/spotify:\\n - Invalid URL" },
"error": "Request validation failed on GET /api/v1/auth/oauth/authorize/spotify:\\n - Invalid URL",
},
"headers": Headers {
"x-stack-known-error": "SCHEMA_ERROR",

2
apps/e2e/tests/backend/endpoints/api/v1/auth/oauth/callback.test.ts
View File

@ -42,7 +42,7 @@ it("should fail when inner callback has invalid provider ID", async ({ expect })
});
it("should fail when account is new and sign ups are disabled", async ({ expect }) => {
await Project.createAndSwitch({ config: { sign_up_enabled: false, oauth_providers: [ { id: "facebook", type: "shared", enabled: true } ] } });
await Project.createAndSwitch({ config: { sign_up_enabled: false, oauth_providers: [ { id: "spotify", type: "shared", enabled: true } ] } });
await ApiKey.createAndSetProjectKeys();
const getInnerCallbackUrlResponse = await Auth.OAuth.getInnerCallbackUrl();
const cookie = updateCookiesFromResponse("", getInnerCallbackUrlResponse.authorizeResponse);

6
apps/e2e/tests/backend/endpoints/api/v1/auth/oauth/token.test.ts
View File

@ -37,9 +37,9 @@ describe("with grant_type === 'authorization_code'", async () => {
"auth_methods": [
{
"provider": {
"id": "facebook",
"id": "spotify",
"provider_user_id": "<stripped UUID>@stack-generated.example.com",
"type": "facebook",
"type": "spotify",
},
"type": "oauth",
},
@ -55,7 +55,7 @@ describe("with grant_type === 'authorization_code'", async () => {
{
"account_id": "<stripped UUID>@stack-generated.example.com",
"email": "<stripped UUID>@stack-generated.example.com",
"id": "facebook",
"id": "spotify",
},
],
"primary_email": "<stripped UUID>@stack-generated.example.com",

16
apps/e2e/tests/backend/endpoints/api/v1/internal/projects.test.ts
View File

@ -146,7 +146,7 @@ it("creates a new project with different configurations", async ({ expect }) =>
enabled: true,
},
{
id: "facebook",
id: "spotify",
type: "standard",
enabled: false,
client_id: "client_id",
@ -170,18 +170,18 @@ it("creates a new project with different configurations", async ({ expect }) =>
"id": "<stripped UUID>",
"magic_link_enabled": false,
"oauth_providers": [
{
"client_id": "client_id",
"client_secret": "client_secret",
"enabled": false,
"id": "facebook",
"type": "standard",
},
{
"enabled": true,
"id": "google",
"type": "shared",
},
{
"client_id": "client_id",
"client_secret": "client_secret",
"enabled": false,
"id": "spotify",
"type": "standard",
},
],
"sign_up_enabled": true,
"team_creator_default_permissions": [{ "id": "admin" }],

26
apps/e2e/tests/backend/endpoints/api/v1/projects.test.ts
View File

@ -34,10 +34,10 @@ it("gets current project (internal)", async ({ expect }) => {
"client_team_creation_enabled": true,
"credential_enabled": true,
"enabled_oauth_providers": [
{ "id": "facebook" },
{ "id": "github" },
{ "id": "google" },
{ "id": "microsoft" },
{ "id": "spotify" },
],
"magic_link_enabled": true,
"sign_up_enabled": true,
@ -690,7 +690,7 @@ it("updates the project oauth configuration", async ({ expect }) => {
const { updateProjectResponse: response4 } = await Project.updateCurrent(adminAccessToken, {
config: {
oauth_providers: [{
id: "facebook",
id: "spotify",
type: "shared",
enabled: true,
}]
@ -709,7 +709,7 @@ it("updates the project oauth configuration", async ({ expect }) => {
config: {
oauth_providers: [
{
id: "facebook",
id: "spotify",
type: "shared",
enabled: true,
},
@ -733,20 +733,20 @@ it("updates the project oauth configuration", async ({ expect }) => {
"domains": [],
"email_config": { "type": "shared" },
"enabled_oauth_providers": [
{ "id": "facebook" },
{ "id": "google" },
{ "id": "spotify" },
],
"id": "<stripped UUID>",
"magic_link_enabled": false,
"oauth_providers": [
{
"enabled": true,
"id": "facebook",
"id": "google",
"type": "shared",
},
{
"enabled": true,
"id": "google",
"id": "spotify",
"type": "shared",
},
],
@ -770,7 +770,7 @@ it("updates the project oauth configuration", async ({ expect }) => {
config: {
oauth_providers: [
{
id: "facebook",
id: "spotify",
type: "shared",
enabled: true,
},
@ -793,18 +793,18 @@ it("updates the project oauth configuration", async ({ expect }) => {
"credential_enabled": true,
"domains": [],
"email_config": { "type": "shared" },
"enabled_oauth_providers": [{ "id": "facebook" }],
"enabled_oauth_providers": [{ "id": "spotify" }],
"id": "<stripped UUID>",
"magic_link_enabled": false,
"oauth_providers": [
{
"enabled": true,
"id": "facebook",
"enabled": false,
"id": "google",
"type": "shared",
},
{
"enabled": false,
"id": "google",
"enabled": true,
"id": "spotify",
"type": "shared",
},
],
@ -890,7 +890,7 @@ it("deletes a project with users, teams, and permissions", async ({ expect }) =>
enabled: true,
},
{
id: "facebook",
id: "spotify",
type: "standard",
enabled: true,
client_id: "client_id",

6
packages/stack-shared/src/utils/oauth.tsx
View File

@ -1,7 +1,7 @@
export const standardProviders = ["google", "github", "facebook", "microsoft", "spotify", "discord", "gitlab", "bitbucket"] as const;
export const standardProviders = ["google", "github", "microsoft", "spotify", "facebook", "discord", "gitlab", "bitbucket"] as const;
// No more shared providers should be added except for special cases
export const sharedProviders = ["google", "github", "facebook", "microsoft", "spotify"] as const;
export const allProviders = ["google", "github", "facebook", "microsoft", "spotify", "discord", "gitlab", "bitbucket"] as const;
export const sharedProviders = ["google", "github", "microsoft", "spotify"] as const;
export const allProviders = ["google", "github", "microsoft", "spotify", "facebook", "discord", "gitlab", "bitbucket"] as const;
export type ProviderType = typeof allProviders[number];
export type StandardProviderType = typeof standardProviders[number];