Merge pull request #3093 from makeplane/develop

promote: develop to preview

ENV_SETUP.md

@@ -49,24 +49,10 @@ NGINX_PORT=80
 ​
 
 ```
-# Enable/Disable OAUTH - default 0 for selfhosted instance
-NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```
 
-​
-
-## {PROJECT_FOLDER}/spaces/.env.example
-
-​
-
-```
-# Flag to toggle OAuth
-NEXT_PUBLIC_ENABLE_OAUTH=0
-```
-
-​
 
 ## {PROJECT_FOLDER}/apiserver/.env
 

apiserver/plane/app/views/authentication.py

@@ -343,13 +343,6 @@ def post(self, request):
 
             if str(token) == str(user_token):
                 user = User.objects.get(email=email)
-                if not user.is_active:
-                    return Response(
-                        {
-                            "error": "Your account has been deactivated. Please contact your site administrator."
-                        },
-                        status=status.HTTP_403_FORBIDDEN,
-                    )
                 # Send event
                 auth_events.delay(
                     user=user.id,

apiserver/plane/app/views/oauth.py

@@ -167,12 +167,6 @@ def post(self, request):
                 ]
             )
 
-            if not GOOGLE_CLIENT_ID or not GITHUB_CLIENT_ID:
-                return Response(
-                    {"error": "Github or Google login is not configured"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
             if not medium or not id_token:
                 return Response(
                     {
@@ -182,9 +176,19 @@ def post(self, request):
                 )
 
             if medium == "google":
+                if not GOOGLE_CLIENT_ID:
+                    return Response(
+                        {"error": "Google login is not configured"},
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
                 data = validate_google_token(id_token, client_id)
 
             if medium == "github":
+                if not GITHUB_CLIENT_ID:
+                    return Response(
+                        {"error": "Github login is not configured"},
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
                 access_token = get_access_token(id_token, client_id)
                 data = get_user_data(access_token)
 

apiserver/plane/license/utils/encryption.py

@@ -9,14 +9,20 @@ def derive_key(secret_key):
     dk = hashlib.pbkdf2_hmac('sha256', secret_key.encode(), b'salt', 100000)
     return base64.urlsafe_b64encode(dk)
 
-
+# Encrypt data
 def encrypt_data(data):
-    cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
-    encrypted_data = cipher_suite.encrypt(data.encode())
-    return encrypted_data.decode()  # Convert bytes to string
-
+    if data:
+        cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
+        encrypted_data = cipher_suite.encrypt(data.encode())
+        return encrypted_data.decode()  # Convert bytes to string
+    else:
+        return ""
 
+# Decrypt data 
 def decrypt_data(encrypted_data):
-    cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
-    decrypted_data = cipher_suite.decrypt(encrypted_data.encode())  # Convert string back to bytes
-    return decrypted_data.decode()
+    if encrypted_data:
+        cipher_suite = Fernet(derive_key(settings.SECRET_KEY))
+        decrypted_data = cipher_suite.decrypt(encrypted_data.encode())  # Convert string back to bytes
+        return decrypted_data.decode()
+    else:
+        return ""

apiserver/plane/urls.py

@@ -19,8 +19,11 @@
 
 
 if settings.DEBUG:
-    import debug_toolbar
-
-    urlpatterns = [
-        re_path(r"^__debug__/", include(debug_toolbar.urls)),
-    ] + urlpatterns
+    try:
+        import debug_toolbar
+
+        urlpatterns = [
+            re_path(r"^__debug__/", include(debug_toolbar.urls)),
+        ] + urlpatterns
+    except ImportError:
+        pass

deploy/coolify/coolify-docker-compose.yml

@@ -7,7 +7,6 @@ services:
     restart: always
     command: /usr/local/bin/start.sh web/server.js web
     environment:
-      - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
       - NEXT_PUBLIC_DEPLOY_URL=$SERVICE_FQDN_SPACE_8082
     depends_on:
       - api
@@ -21,7 +20,6 @@ services:
     command: /usr/local/bin/start.sh space/server.js space
     environment:
       - SERVICE_FQDN_SPACE_8082=/api
-      - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
     depends_on:
       - api
       - worker

deploy/selfhost/docker-compose.yml

@@ -6,7 +6,6 @@ x-app-env : &app-env
     - WEB_URL=${WEB_URL:-http://localhost}
     - DEBUG=${DEBUG:-0}
     - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.production} # deprecated
-    - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0} # deprecated
     - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces} # deprecated
     - SENTRY_DSN=${SENTRY_DSN:-""}
     - SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-"production"}

deploy/selfhost/variables.env

@@ -7,7 +7,6 @@ API_REPLICAS=1
 NGINX_PORT=80
 WEB_URL=http://localhost
 DEBUG=0
-NEXT_PUBLIC_ENABLE_OAUTH=0
 NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
 SENTRY_DSN=""
 SENTRY_ENVIRONMENT="production"

packages/editor/core/package.json

@@ -55,7 +55,7 @@
     "highlight.js": "^11.8.0",
     "jsx-dom-cjs": "^8.0.3",
     "lowlight": "^3.0.0",
-    "lucide-react": "^0.244.0",
+    "lucide-react": "^0.294.0",
     "react-moveable": "^0.54.2",
     "tailwind-merge": "^1.14.0",
     "tippy.js": "^6.3.7",

packages/editor/extensions/package.json

@@ -28,16 +28,16 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@tiptap/react": "^2.1.7",
+    "@plane/editor-core": "*",
+    "@plane/editor-types": "*",
     "@tiptap/core": "^2.1.7",
+    "@tiptap/pm": "^2.1.7",
+    "@tiptap/react": "^2.1.7",
     "@tiptap/suggestion": "^2.0.4",
-    "@plane/editor-types": "*",
-    "@plane/editor-core": "*",
     "eslint": "8.36.0",
     "eslint-config-next": "13.2.4",
-    "lucide-react": "^0.293.0",
-    "tippy.js": "^6.3.7",
-    "@tiptap/pm": "^2.1.7"
+    "lucide-react": "^0.294.0",
+    "tippy.js": "^6.3.7"
   },
   "devDependencies": {
     "@types/node": "18.15.3",

packages/editor/rich-text-editor/package.json

@@ -30,11 +30,11 @@
   },
   "dependencies": {
     "@plane/editor-core": "*",
-    "@tiptap/core": "^2.1.11",
-    "@plane/editor-types": "*",
     "@plane/editor-extensions": "*",
+    "@plane/editor-types": "*",
+    "@tiptap/core": "^2.1.11",
     "@tiptap/extension-placeholder": "^2.1.11",
-    "lucide-react": "^0.244.0"
+    "lucide-react": "^0.294.0"
   },
   "devDependencies": {
     "@types/node": "18.15.3",

space/components/accounts/github-login-button.tsx → space/components/accounts/github-sign-in.tsx

@@ -8,12 +8,12 @@ import { useTheme } from "next-themes";
 import githubBlackImage from "public/logos/github-black.svg";
 import githubWhiteImage from "public/logos/github-white.svg";
 
-export interface GithubLoginButtonProps {
+type Props = {
   handleSignIn: React.Dispatch<string>;
   clientId: string;
-}
+};
 
-export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {
+export const GitHubSignInButton: FC<Props> = (props) => {
   const { handleSignIn, clientId } = props;
   // states
   const [loginCallBackURL, setLoginCallBackURL] = useState(undefined);

space/components/accounts/google-login.tsx → space/components/accounts/google-sign-in.tsx

@@ -1,12 +1,12 @@
 import { FC, useEffect, useRef, useCallback, useState } from "react";
 import Script from "next/script";
 
-export interface IGoogleLoginButton {
+type Props = {
   clientId: string;
   handleSignIn: React.Dispatch<any>;
-}
+};
 
-export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
+export const GoogleSignInButton: FC<Props> = (props) => {
   const { handleSignIn, clientId } = props;
   // refs
   const googleSignInButton = useRef<HTMLDivElement>(null);
@@ -30,6 +30,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
           size: "large",
           logo_alignment: "center",
           text: "signin_with",
+          width: 384,
         } as GsiButtonConfiguration // customization attributes
       );
     } catch (err) {
@@ -53,7 +54,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
   return (
     <>
       <Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
-      <div className="w-full overflow-hidden rounded" id="googleSignInButton" ref={googleSignInButton} />
+      <div className="!w-full overflow-hidden rounded" id="googleSignInButton" ref={googleSignInButton} />
     </>
   );
 };

space/components/accounts/index.ts

@@ -1,5 +1,5 @@
-export * from "./github-login-button";
-export * from "./google-login";
+export * from "./github-sign-in";
+export * from "./google-sign-in";
 export * from "./onboarding-form";
 export * from "./user-logged-in";
 export * from "./sign-in-forms";

space/components/accounts/sign-in-forms/o-auth-options.tsx

@@ -7,7 +7,7 @@ import { AppConfigService } from "services/app-config.service";
 // hooks
 import useToast from "hooks/use-toast";
 // components
-import { GithubLoginButton, GoogleLoginButton } from "components/accounts";
+import { GitHubSignInButton, GoogleSignInButton } from "components/accounts";
 
 type Props = {
   handleSignInRedirection: () => Promise<void>;
@@ -73,12 +73,12 @@ export const OAuthOptions: React.FC<Props> = observer((props) => {
         <p className="mx-3 flex-shrink-0 text-center text-sm text-onboarding-text-400">Or continue with</p>
         <hr className="w-full border-onboarding-border-100" />
       </div>
-      <div className="mx-auto flex flex-col items-center gap-2 overflow-hidden pt-7 sm:w-96 sm:flex-row">
+      <div className="mx-auto space-y-4 overflow-hidden pt-7 sm:w-96">
         {envConfig?.google_client_id && (
-          <GoogleLoginButton clientId={envConfig?.google_client_id} handleSignIn={handleGoogleSignIn} />
+          <GoogleSignInButton clientId={envConfig?.google_client_id} handleSignIn={handleGoogleSignIn} />
         )}
         {envConfig?.github_client_id && (
-          <GithubLoginButton clientId={envConfig?.github_client_id} handleSignIn={handleGitHubSignIn} />
+          <GitHubSignInButton clientId={envConfig?.github_client_id} handleSignIn={handleGitHubSignIn} />
         )}
       </div>
     </>

space/components/common/latest-feature-block.tsx

@@ -20,7 +20,11 @@ export const LatestFeatureBlock = () => {
           </Link>
         </p>
       </div>
-      <div className="mx-auto mt-8 overflow-hidden rounded-md border border-onboarding-border-200 bg-onboarding-background-100 object-cover sm:h-52 sm:w-96">
+      <div
+        className={`mx-auto mt-8 overflow-hidden rounded-md border border-onboarding-border-200 object-cover sm:h-52 sm:w-96 ${
+          resolvedTheme === "dark" ? "bg-onboarding-background-100" : "bg-custom-primary-70"
+        }`}
+      >
         <div className="h-[90%]">
           <Image
             src={latestFeatures}

space/package.json

@@ -27,7 +27,7 @@
     "dotenv": "^16.3.1",
     "js-cookie": "^3.0.1",
     "lowlight": "^2.9.0",
-    "lucide-react": "^0.293.0",
+    "lucide-react": "^0.294.0",
     "mobx": "^6.10.0",
     "mobx-react-lite": "^4.0.3",
     "next": "^14.0.3",

turbo.json

@@ -7,7 +7,6 @@
     "NEXT_PUBLIC_SENTRY_DSN",
     "NEXT_PUBLIC_SENTRY_ENVIRONMENT",
     "NEXT_PUBLIC_ENABLE_SENTRY",
-    "NEXT_PUBLIC_ENABLE_OAUTH",
     "NEXT_PUBLIC_TRACK_EVENTS",
     "NEXT_PUBLIC_PLAUSIBLE_DOMAIN",
     "NEXT_PUBLIC_CRISP_ID",

web/.env.example

@@ -1,4 +1,2 @@
-# Enable/Disable OAUTH - default 0 for selfhosted instance
-NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"

web/components/account/github-login-button.tsx → web/components/account/github-sign-in.tsx

@@ -9,12 +9,12 @@ import { useTheme } from "next-themes";
 import githubLightModeImage from "/public/logos/github-black.png";
 import githubDarkModeImage from "/public/logos/github-dark.svg";
 
-export interface GithubLoginButtonProps {
+type Props = {
   handleSignIn: React.Dispatch<string>;
   clientId: string;
-}
+};
 
-export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {
+export const GitHubSignInButton: FC<Props> = (props) => {
   const { handleSignIn, clientId } = props;
   // states
   const [loginCallBackURL, setLoginCallBackURL] = useState(undefined);

web/components/account/google-login.tsx → web/components/account/google-sign-in.tsx

@@ -1,12 +1,12 @@
 import { FC, useEffect, useRef, useCallback, useState } from "react";
 import Script from "next/script";
 
-export interface IGoogleLoginButton {
+type Props = {
   handleSignIn: React.Dispatch<any>;
   clientId: string;
-}
+};
 
-export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
+export const GoogleSignInButton: FC<Props> = (props) => {
   const { handleSignIn, clientId } = props;
   // refs
   const googleSignInButton = useRef<HTMLDivElement>(null);
@@ -30,6 +30,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
           size: "large",
           logo_alignment: "center",
           text: "signin_with",
+          width: 384,
         } as GsiButtonConfiguration // customization attributes
       );
     } catch (err) {
@@ -53,7 +54,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
   return (
     <>
       <Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
-      <div className="w-full overflow-hidden rounded" id="googleSignInButton" ref={googleSignInButton} />
+      <div className="!w-full overflow-hidden rounded" id="googleSignInButton" ref={googleSignInButton} />
     </>
   );
 };

web/components/account/index.ts

@@ -1,5 +1,5 @@
 export * from "./sign-in-forms";
 export * from "./deactivate-account-modal";
-export * from "./github-login-button";
-export * from "./google-login";
+export * from "./github-sign-in";
+export * from "./google-sign-in";
 export * from "./email-signup-form";