Skip to content

πŸ“¨ The ultimate agentic social media scheduling tool πŸ€–

feat: apple login

Nevo David14c3a2f83df5
diff --git a/.env.example b/.env.example
index b6f600dda..488afc2fa 100644
--- a/.env.example
+++ b/.env.example
@@ -49,6 +49,11 @@ REDDIT_CLIENT_ID=""
REDDIT_CLIENT_SECRET=""
GITHUB_CLIENT_ID=""
GITHUB_CLIENT_SECRET=""
+# Sign in with Apple, client id is the Services ID identifier
+APPLE_CLIENT_ID=""
+APPLE_TEAM_ID=""
+APPLE_KEY_ID=""
+APPLE_PRIVATE_KEY=""
BEEHIIVE_API_KEY=""
BEEHIIVE_PUBLICATION_ID=""
LISTMONK_DOMAIN=""
diff --git a/.gitignore b/.gitignore
index 5cb60826d..197119333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ dist
tmp
/out-tsc
.env
+.apple
# dependencies
node_modules
diff --git a/apps/backend/src/api/api.module.ts b/apps/backend/src/api/api.module.ts
index 5c35e60dc..285b89f86 100644
--- a/apps/backend/src/api/api.module.ts
+++ b/apps/backend/src/api/api.module.ts
@@ -40,6 +40,7 @@ import { AdminController } from '@gitroom/backend/api/routes/admin.controller';
import { AuthProviderManager } from '@gitroom/backend/services/auth/providers/providers.manager';
import { GithubProvider } from '@gitroom/backend/services/auth/providers/github.provider';
import { GoogleProvider } from '@gitroom/backend/services/auth/providers/google.provider';
+import { AppleProvider } from '@gitroom/backend/services/auth/providers/apple.provider';
import { FarcasterProvider } from '@gitroom/backend/services/auth/providers/farcaster.provider';
import { WalletProvider } from '@gitroom/backend/services/auth/providers/wallet.provider';
import { OauthProvider } from '@gitroom/backend/services/auth/providers/oauth.provider';
@@ -93,6 +94,7 @@ const authenticatedController = [
AuthProviderManager,
GithubProvider,
GoogleProvider,
+ AppleProvider,
FarcasterProvider,
WalletProvider,
OauthProvider,
diff --git a/apps/backend/src/api/routes/auth.controller.ts b/apps/backend/src/api/routes/auth.controller.ts
index 14bc25f94..2ed448244 100644
--- a/apps/backend/src/api/routes/auth.controller.ts
+++ b/apps/backend/src/api/routes/auth.controller.ts
@@ -22,6 +22,7 @@ import { EmailService } from '@gitroom/nestjs-libraries/services/email.service';
import { RealIP } from 'nestjs-real-ip';
import { UserAgent } from '@gitroom/nestjs-libraries/user/user.agent';
import { Provider } from '@prisma/client';
+import { makeId } from '@gitroom/nestjs-libraries/services/make.is';
import * as Sentry from '@sentry/nestjs';
@ApiTags('Auth')
@@ -213,8 +214,25 @@ export class AuthController {
}
@Get('/oauth/:provider')
- async oauthLink(@Param('provider') provider: string, @Query() query: any) {
- return this._authService.oauthLink(provider, query);
+ async oauthLink(
+ @Param('provider') provider: string,
+ @Query() query: any,
+ @Res({ passthrough: true }) response: Response
+ ) {
+ const state = `login-${makeId(16)}`;
+ response.cookie('oauth_state', state, {
+ domain: getCookieUrlFromDomain(process.env.FRONTEND_URL!),
+ ...(!process.env.NOT_SECURED
+ ? {
+ secure: true,
+ httpOnly: true,
+ sameSite: 'none',
+ }
+ : {}),
+ expires: new Date(Date.now() + 1000 * 60 * 10),
+ });
+
+ return this._authService.oauthLink(provider, { ...query, state });
}
@Post('/activate')
@@ -267,17 +285,47 @@ export class AuthController {
}
}
+ @Post('/oauth/:provider/redirect')
+ oauthRedirect(
+ @Param('provider') provider: string,
+ @Body('code') code: string,
+ @Body('state') state: string,
+ @Res({ passthrough: false }) response: Response
+ ) {
+ if (!code) {
+ return response.redirect(303, `${process.env.FRONTEND_URL}/auth/login`);
+ }
+
+ const params = new URLSearchParams();
+ params.set('code', code);
+ if (state) params.set('state', state);
+ params.set('provider', provider.toUpperCase());
+ return response.redirect(
+ 303,
+ `${process.env.FRONTEND_URL}/auth?${params.toString()}`
+ );
+ }
+
@Post('/oauth/:provider/exists')
async oauthExists(
+ @Req() req: Request,
@Body('code') code: string,
@Body('redirect_uri') redirect_uri: string,
+ @Body('state') state: string,
@Param('provider') provider: string,
@Res({ passthrough: false }) response: Response
) {
+ // a cross-site form post can spoof any body field, a json body cannot
+ if (!req.headers['content-type']?.includes('application/json')) {
+ return response.status(400).send('Invalid request');
+ }
+
const { jwt, token } = await this._authService.checkExists(
provider,
code,
- redirect_uri
+ redirect_uri,
+ state,
+ req?.cookies?.oauth_state
);
if (token) {
diff --git a/apps/backend/src/services/auth/auth.service.ts b/apps/backend/src/services/auth/auth.service.ts
index 187c08ed5..eceac92ef 100644
--- a/apps/backend/src/services/auth/auth.service.ts
+++ b/apps/backend/src/services/auth/auth.service.ts
@@ -293,7 +293,23 @@ export class AuthService {
return providerInstance.generateLink(query);
}
- async checkExists(provider: string, code: string, redirectUri?: string) {
+ async checkExists(
+ provider: string,
+ code: string,
+ redirectUri?: string,
+ state?: string,
+ stateCookie?: string
+ ) {
+ // the mobile app passes redirect_uri and keeps no cookies, the web flow
+ // never passes it, so the state nonce is only enforced for the web flow
+ if (
+ !process.env.NOT_SECURED &&
+ !redirectUri &&
+ (!state || state !== stateCookie)
+ ) {
+ throw new Error('Invalid state');
+ }
+
const providerInstance = this._providerManager.getProvider(provider);
const token = await providerInstance.getToken(code, redirectUri);
const user = await providerInstance.getUser(token);
diff --git a/apps/backend/src/services/auth/providers/apple.provider.ts b/apps/backend/src/services/auth/providers/apple.provider.ts
new file mode 100644
index 000000000..f1ff052d4
--- /dev/null
+++ b/apps/backend/src/services/auth/providers/apple.provider.ts
@@ -0,0 +1,125 @@
+import { decode, sign, verify } from 'jsonwebtoken';
+import { createPublicKey } from 'crypto';
+import {
+ AuthProvider,
+ AuthProviderAbstract,
+} from '@gitroom/backend/services/auth/providers.interface';
+
+const getConfig = () => {
+ const { APPLE_CLIENT_ID, APPLE_TEAM_ID, APPLE_KEY_ID, APPLE_PRIVATE_KEY } =
+ process.env;
+
+ if (
+ !APPLE_CLIENT_ID ||
+ !APPLE_TEAM_ID ||
+ !APPLE_KEY_ID ||
+ !APPLE_PRIVATE_KEY
+ ) {
+ throw new Error('APPLE environment variables are not set');
+ }
+
+ return {
+ clientId: APPLE_CLIENT_ID,
+ teamId: APPLE_TEAM_ID,
+ keyId: APPLE_KEY_ID,
+ privateKey: APPLE_PRIVATE_KEY.replace(/\\n/g, '\n'),
+ };
+};
+
+const defaultRedirect = () =>
+ `${
+ process?.env?.NEXT_PUBLIC_BACKEND_URL?.indexOf('https') === -1
+ ? 'https://redirectmeto.com/'
+ : ''
+ }${process.env.NEXT_PUBLIC_BACKEND_URL}/auth/oauth/apple/redirect`;
+
+const clientSecret = () => {
+ const { clientId, teamId, keyId, privateKey } = getConfig();
+ return sign({}, privateKey, {
+ algorithm: 'ES256',
+ expiresIn: '5m',
+ audience: 'https://appleid.apple.com',
+ issuer: teamId,
+ subject: clientId,
+ keyid: keyId,
+ });
+};
+
+@AuthProvider({ provider: 'APPLE' })
+export class AppleProvider extends AuthProviderAbstract {
+ generateLink(query?: { redirect_uri?: string; state?: string }) {
+ const { clientId } = getConfig();
+ const url = new URL('https://appleid.apple.com/auth/authorize');
+ url.searchParams.set('client_id', clientId);
+ url.searchParams.set(
+ 'redirect_uri',
+ query?.redirect_uri || defaultRedirect()
+ );
+ url.searchParams.set('response_type', 'code');
+ url.searchParams.set('response_mode', 'form_post');
+ url.searchParams.set('scope', 'name email');
+ url.searchParams.set('state', query?.state || 'login');
+ return url.toString();
+ }
+
+ async getToken(code: string, redirectUri?: string): Promise<string> {
+ const { clientId } = getConfig();
+ const response = await fetch('https://appleid.apple.com/auth/token', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ },
+ body: new URLSearchParams({
+ grant_type: 'authorization_code',
+ code,
+ redirect_uri: redirectUri || defaultRedirect(),
+ client_id: clientId,
+ client_secret: clientSecret(),
+ }).toString(),
+ });
+
+ if (!response.ok) {
+ const error = await response.text();
+ throw new Error(`Token request failed: ${error}`);
+ }
+
+ const { id_token } = await response.json();
+ if (!id_token) {
+ throw new Error('Invalid provider token');
+ }
+
+ return id_token;
+ }
+
+ async getUser(providerToken: string) {
+ const { clientId } = getConfig();
+ const decoded = decode(providerToken, { complete: true });
+ const { keys } = await (
+ await fetch('https://appleid.apple.com/auth/keys')
+ ).json();
+
+ const key = keys.find(
+ (k: { kid: string }) => k.kid === decoded?.header?.kid
+ );
+ if (!key) {
+ throw new Error('Invalid provider token');
+ }
+
+ // the id_token must be verified against Apple's public keys because it is
+ // sent back from the client as the providerToken during registration
+ const payload = verify(
+ providerToken,
+ createPublicKey({ key, format: 'jwk' }),
+ {
+ algorithms: ['RS256'],
+ audience: clientId,
+ issuer: 'https://appleid.apple.com',
+ }
+ ) as { sub: string; email: string };
+
+ return {
+ id: payload.sub,
+ email: payload.email,
+ };
+ }
+}
diff --git a/apps/backend/src/services/auth/providers/github.provider.ts b/apps/backend/src/services/auth/providers/github.provider.ts
index 0fc05011c..5e7798843 100644
--- a/apps/backend/src/services/auth/providers/github.provider.ts
+++ b/apps/backend/src/services/auth/providers/github.provider.ts
@@ -5,10 +5,12 @@ import {
@AuthProvider({ provider: 'GITHUB' })
export class GithubProvider extends AuthProviderAbstract {
- generateLink(): string {
+ generateLink(query?: { state?: string }): string {
return `https://github.com/login/oauth/authorize?client_id=${
process.env.GITHUB_CLIENT_ID
- }&scope=user:email&redirect_uri=${encodeURIComponent(
+ }&scope=user:email&state=${
+ query?.state || 'login'
+ }&redirect_uri=${encodeURIComponent(
`${process.env.FRONTEND_URL}/settings`
)}`;
}
diff --git a/apps/backend/src/services/auth/providers/google.provider.ts b/apps/backend/src/services/auth/providers/google.provider.ts
index 425723f8c..47204573e 100644
--- a/apps/backend/src/services/auth/providers/google.provider.ts
+++ b/apps/backend/src/services/auth/providers/google.provider.ts
@@ -16,12 +16,12 @@ const makeClient = (redirectUri: string) =>
@AuthProvider({ provider: 'GOOGLE' })
export class GoogleProvider extends AuthProviderAbstract {
- generateLink(query?: { redirect_uri?: string }) {
+ generateLink(query?: { redirect_uri?: string; state?: string }) {
const redirectUri = query?.redirect_uri || defaultRedirect();
return makeClient(redirectUri).generateAuthUrl({
access_type: 'online',
prompt: 'consent',
- state: 'login',
+ state: query?.state || 'login',
redirect_uri: redirectUri,
scope: [
'https://www.googleapis.com/auth/userinfo.profile',
diff --git a/apps/backend/src/services/auth/providers/oauth.provider.ts b/apps/backend/src/services/auth/providers/oauth.provider.ts
index ade792e3d..f78883f2a 100644
--- a/apps/backend/src/services/auth/providers/oauth.provider.ts
+++ b/apps/backend/src/services/auth/providers/oauth.provider.ts
@@ -36,12 +36,13 @@ export class OauthProvider extends AuthProviderAbstract {
};
}
- generateLink(): string {
+ generateLink(query?: { state?: string }): string {
const { authUrl, clientId, frontendUrl } = this.getConfig();
const params = new URLSearchParams({
client_id: clientId,
scope: 'openid profile email',
response_type: 'code',
+ state: query?.state || 'login',
redirect_uri: `${frontendUrl}/settings`,
});
diff --git a/apps/frontend/src/app/(app)/layout.tsx b/apps/frontend/src/app/(app)/layout.tsx
index 3a46e8d6f..ae83325be 100644
--- a/apps/frontend/src/app/(app)/layout.tsx
+++ b/apps/frontend/src/app/(app)/layout.tsx
@@ -78,6 +78,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
facebookPixel={process.env.NEXT_PUBLIC_FACEBOOK_PIXEL!}
telegramBotName={process.env.TELEGRAM_BOT_NAME!}
neynarClientId={process.env.NEYNAR_CLIENT_ID!}
+ appleClientId={process.env.APPLE_CLIENT_ID!}
isSecured={!process.env.NOT_SECURED}
disableImageCompression={!!process.env.DISABLE_IMAGE_COMPRESSION}
disableXAnalytics={!!process.env.DISABLE_X_ANALYTICS}
diff --git a/apps/frontend/src/app/(extension)/layout.tsx b/apps/frontend/src/app/(extension)/layout.tsx
index 61db27158..b5990cb47 100644
--- a/apps/frontend/src/app/(extension)/layout.tsx
+++ b/apps/frontend/src/app/(extension)/layout.tsx
@@ -48,6 +48,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
facebookPixel={process.env.NEXT_PUBLIC_FACEBOOK_PIXEL!}
telegramBotName={process.env.TELEGRAM_BOT_NAME!}
neynarClientId={process.env.NEYNAR_CLIENT_ID!}
+ appleClientId={process.env.APPLE_CLIENT_ID!}
isSecured={!process.env.NOT_SECURED}
isChatBase={false}
disableImageCompression={!!process.env.DISABLE_IMAGE_COMPRESSION}
diff --git a/apps/frontend/src/app/(provider)/layout.tsx b/apps/frontend/src/app/(provider)/layout.tsx
index a7cf39e27..80f161f8a 100644
--- a/apps/frontend/src/app/(provider)/layout.tsx
+++ b/apps/frontend/src/app/(provider)/layout.tsx
@@ -50,6 +50,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
facebookPixel={process.env.NEXT_PUBLIC_FACEBOOK_PIXEL!}
telegramBotName={process.env.TELEGRAM_BOT_NAME!}
neynarClientId={process.env.NEYNAR_CLIENT_ID!}
+ appleClientId={process.env.APPLE_CLIENT_ID!}
isSecured={!process.env.NOT_SECURED}
isChatBase={false}
disableImageCompression={!!process.env.DISABLE_IMAGE_COMPRESSION}
diff --git a/apps/frontend/src/components/auth/login.tsx b/apps/frontend/src/components/auth/login.tsx
index 793fc92e6..2acd57815 100644
--- a/apps/frontend/src/components/auth/login.tsx
+++ b/apps/frontend/src/components/auth/login.tsx
@@ -11,6 +11,7 @@ import { LoginUserDto } from '@gitroom/nestjs-libraries/dtos/auth/login.user.dto
import { GithubProvider } from '@gitroom/frontend/components/auth/providers/github.provider';
import { OauthProvider } from '@gitroom/frontend/components/auth/providers/oauth.provider';
import { GoogleProvider } from '@gitroom/frontend/components/auth/providers/google.provider';
+import { AppleProvider } from '@gitroom/frontend/components/auth/providers/apple.provider';
import { useVariables } from '@gitroom/react/helpers/variable.context';
import { FarcasterProvider } from '@gitroom/frontend/components/auth/providers/farcaster.provider';
import WalletProvider from '@gitroom/frontend/components/auth/providers/wallet.provider';
@@ -25,8 +26,13 @@ export function Login() {
const t = useT();
const [loading, setLoading] = useState(false);
const [notActivated, setNotActivated] = useState(false);
- const { isGeneral, neynarClientId, billingEnabled, genericOauth } =
- useVariables();
+ const {
+ isGeneral,
+ neynarClientId,
+ appleClientId,
+ billingEnabled,
+ genericOauth,
+ } = useVariables();
const resolver = useMemo(() => {
return classValidatorResolver(LoginUserDto);
}, []);
@@ -80,6 +86,7 @@ export function Login() {
) : (
<div className="gap-[8px] flex">
<GoogleProvider />
+ {!!appleClientId && <AppleProvider />}
{!!neynarClientId && <FarcasterProvider />}
{billingEnabled && <WalletProvider />}
</div>
diff --git a/apps/frontend/src/components/auth/providers/apple.provider.tsx b/apps/frontend/src/components/auth/providers/apple.provider.tsx
new file mode 100644
index 000000000..8580d5fb8
--- /dev/null
+++ b/apps/frontend/src/components/auth/providers/apple.provider.tsx
@@ -0,0 +1,34 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
+import { useT } from '@gitroom/react/translation/get.transation.service.client';
+export const AppleProvider = () => {
+ const fetch = useFetch();
+ const t = useT();
+ const gotoLogin = useCallback(async () => {
+ const link = await (await fetch('/auth/oauth/APPLE')).text();
+ window.location.href = link;
+ }, []);
+ return (
+ <div
+ onClick={gotoLogin}
+ className={`cursor-pointer flex-1 bg-white h-[52px] rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[5px]`}
+ >
+ <div>
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 24 24"
+ width="21px"
+ height="21px"
+ >
+ <path
+ fill="#000000"
+ d="M17.05 20.28c-.98.95-2.05.8-3.08.35-1.09-.46-2.09-.48-3.24 0-1.44.62-2.2.44-3.06-.35C2.79 15.25 3.51 7.59 9.05 7.31c1.35.07 2.29.74 3.08.8 1.18-.24 2.31-.93 3.57-.84 1.51.12 2.65.72 3.4 1.8-3.12 1.87-2.38 5.98.48 7.13-.57 1.5-1.31 2.99-2.54 4.09zM12.03 7.25c-.15-2.23 1.66-4.07 3.74-4.25.29 2.58-2.34 4.5-3.74 4.25z"
+ />
+ </svg>
+ </div>
+ <div className="block xs:hidden">{t('apple', 'Apple')}</div>
+ </div>
+ );
+};
diff --git a/apps/frontend/src/components/auth/providers/farcaster.provider.tsx b/apps/frontend/src/components/auth/providers/farcaster.provider.tsx
index d3ae3399f..683b67e22 100644
--- a/apps/frontend/src/components/auth/providers/farcaster.provider.tsx
+++ b/apps/frontend/src/components/auth/providers/farcaster.provider.tsx
@@ -26,7 +26,7 @@ export const ButtonCaster: FC<{
>
<NeynarAuthButton onLogin={login}>
<div
- className={`cursor-pointer bg-white h-[52px] flex-1 rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[10px]`}
+ className={`cursor-pointer bg-white h-[52px] flex-1 rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[5px]`}
>
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/frontend/src/components/auth/providers/google.provider.tsx b/apps/frontend/src/components/auth/providers/google.provider.tsx
index afa406668..3db206b51 100644
--- a/apps/frontend/src/components/auth/providers/google.provider.tsx
+++ b/apps/frontend/src/components/auth/providers/google.provider.tsx
@@ -13,7 +13,7 @@ export const GoogleProvider = () => {
return (
<div
onClick={gotoLogin}
- className={`cursor-pointer flex-1 bg-white h-[52px] rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[10px]`}
+ className={`cursor-pointer flex-1 bg-white h-[52px] rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[5px]`}
>
<div>
<svg
diff --git a/apps/frontend/src/components/auth/providers/placeholder/wallet.ui.provider.tsx b/apps/frontend/src/components/auth/providers/placeholder/wallet.ui.provider.tsx
index 94bfe0504..c32accc14 100644
--- a/apps/frontend/src/components/auth/providers/placeholder/wallet.ui.provider.tsx
+++ b/apps/frontend/src/components/auth/providers/placeholder/wallet.ui.provider.tsx
@@ -5,7 +5,7 @@ export const WalletUiProvider: FC = () => {
const t = useT();
return (
<div
- className={`cursor-pointer bg-white flex-1 h-[52px] rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[10px]`}
+ className={`cursor-pointer bg-white flex-1 h-[52px] rounded-[10px] flex justify-center items-center text-[#0E0E0E] gap-[5px]`}
>
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/frontend/src/components/auth/register.tsx b/apps/frontend/src/components/auth/register.tsx
index 3557bcb4d..24ae862a6 100644
--- a/apps/frontend/src/components/auth/register.tsx
+++ b/apps/frontend/src/components/auth/register.tsx
@@ -13,6 +13,7 @@ import { useRouter, useSearchParams } from 'next/navigation';
import { LoadingComponent } from '@gitroom/frontend/components/layout/loading';
import clsx from 'clsx';
import { GoogleProvider } from '@gitroom/frontend/components/auth/providers/google.provider';
+import { AppleProvider } from '@gitroom/frontend/components/auth/providers/apple.provider';
import { OauthProvider } from '@gitroom/frontend/components/auth/providers/oauth.provider';
import { useFireEvents } from '@gitroom/helpers/utils/use.fire.events';
import { useVariables } from '@gitroom/react/helpers/variable.context';
@@ -42,6 +43,7 @@ export function Register() {
const fetch = useFetch();
const [provider] = useState(getQuery?.get('provider')?.toUpperCase());
const [code, setCode] = useState(getQuery?.get('code') || '');
+ const [state] = useState(getQuery?.get('state') || '');
const [show, setShow] = useState(false);
useEffect(() => {
if (provider && code) {
@@ -54,6 +56,7 @@ export function Register() {
method: 'POST',
body: JSON.stringify({
code,
+ state,
}),
})
).json();
@@ -89,8 +92,13 @@ export function RegisterAfter({
provider: string;
}) {
const t = useT();
- const { isGeneral, genericOauth, neynarClientId, billingEnabled } =
- useVariables();
+ const {
+ isGeneral,
+ genericOauth,
+ neynarClientId,
+ appleClientId,
+ billingEnabled,
+ } = useVariables();
const [loading, setLoading] = useState(false);
const router = useRouter();
const fireEvents = useFireEvents();
@@ -157,7 +165,7 @@ export function RegisterAfter({
<div className="text-[14px] mt-[32px] mb-[12px]">
{t('continue_with', 'Continue With')}
</div>
- <div className="flex flex-col">
+ <div className="flex flex-col text-[14px]">
{!isAfterProvider &&
(!isGeneral ? (
<GithubProvider />
@@ -168,6 +176,7 @@ export function RegisterAfter({
) : (
<GoogleProvider />
)}
+ {!!appleClientId && <AppleProvider />}
{!!neynarClientId && <FarcasterProvider />}
{billingEnabled && <WalletProvider />}
</div>
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6d7d57e6f..cc4d0a2db 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -40,6 +40,10 @@ services:
REDDIT_CLIENT_SECRET: ''
GITHUB_CLIENT_ID: ''
GITHUB_CLIENT_SECRET: ''
+ APPLE_CLIENT_ID: ''
+ APPLE_TEAM_ID: ''
+ APPLE_KEY_ID: ''
+ APPLE_PRIVATE_KEY: ''
BEEHIIVE_API_KEY: ''
BEEHIIVE_PUBLICATION_ID: ''
THREADS_APP_ID: ''
diff --git a/libraries/nestjs-libraries/src/database/prisma/schema.prisma b/libraries/nestjs-libraries/src/database/prisma/schema.prisma
index 7f48b7bf0..1c1f21d8e 100644
--- a/libraries/nestjs-libraries/src/database/prisma/schema.prisma
+++ b/libraries/nestjs-libraries/src/database/prisma/schema.prisma
@@ -923,6 +923,7 @@ enum Provider {
LOCAL
GITHUB
GOOGLE
+ APPLE
FARCASTER
WALLET
GENERIC
diff --git a/libraries/react-shared-libraries/src/helpers/variable.context.tsx b/libraries/react-shared-libraries/src/helpers/variable.context.tsx
index 3243cf245..67e3b4007 100644
--- a/libraries/react-shared-libraries/src/helpers/variable.context.tsx
+++ b/libraries/react-shared-libraries/src/helpers/variable.context.tsx
@@ -22,6 +22,7 @@ interface VariableContextInterface {
facebookPixel: string;
telegramBotName: string;
neynarClientId: string;
+ appleClientId: string;
isSecured: boolean;
disableImageCompression: boolean;
disableXAnalytics: boolean;
@@ -56,6 +57,7 @@ const VariableContext = createContext({
telegramBotName: '',
facebookPixel: '',
neynarClientId: '',
+ appleClientId: '',
disableImageCompression: false,
disableXAnalytics: false,
language: '',
diff --git a/libraries/react-shared-libraries/src/translation/locales/en/translation.json b/libraries/react-shared-libraries/src/translation/locales/en/translation.json
index fe758adb3..41d74ef25 100644
--- a/libraries/react-shared-libraries/src/translation/locales/en/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/en/translation.json
@@ -576,6 +576,7 @@
"label_company": "Company",
"email_already_exists": "Email already exists",
"google": "Google",
+ "apple": "Apple",
"farcaster": "Farcaster",
"edit_autopost": "Edit Autopost",
"add_autopost_title": "Add Autopost",