feat: v3.6.0-rc4 (#207)

* feat: oauth reform for potential improvements * fix: update avatars with new pfp * fix: remove redundant include * feat: v3.6.0-rc4 Co-authored-by: dicedtomato <[email protected]> * fix: remove console log Co-authored-by: dicedtomato <[email protected]>
diced · Oct 31, 2022 · 87fc9f2 · 87fc9f2
1 parent 8c9064f
commit 87fc9f2
Show file tree

Hide file tree

Showing 32 changed files with 683 additions and 300 deletions.
diff --git a/next.config.js b/next.config.js
@@ -17,8 +17,8 @@ module.exports = {
       'getsharex.com',
       // For flameshot icon, and maybe in the future other stuff from github
       'raw.githubusercontent.com',
-      // Discord Icon
-      'assets-global.website-files.com',
+      // Google Icon
+      'madeby.google.com',
     ],
   },
   poweredByHeader: false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zipline",
-  "version": "3.6.0-rc3",
+  "version": "3.6.0-rc4",
   "license": "MIT",
   "scripts": {
     "dev": "npm-run-all build:server dev:run",

diff --git a/prisma/migrations/20221030222208_oauth_reform/migration.sql b/prisma/migrations/20221030222208_oauth_reform/migration.sql
@@ -0,0 +1,31 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `oauth` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `oauthAccessToken` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `oauthProvider` on the `User` table. All the data in the column will be lost.
+
+*/
+-- CreateEnum
+CREATE TYPE "OauthProviders" AS ENUM ('DISCORD', 'GITHUB');
+
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "oauth",
+DROP COLUMN "oauthAccessToken",
+DROP COLUMN "oauthProvider";
+
+-- CreateTable
+CREATE TABLE "OAuth" (
+    "id" SERIAL NOT NULL,
+    "provider" "OauthProviders" NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "token" TEXT NOT NULL,
+
+    CONSTRAINT "OAuth_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OAuth_provider_key" ON "OAuth"("provider");
+
+-- AddForeignKey
+ALTER TABLE "OAuth" ADD CONSTRAINT "OAuth_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/20221030224830_oauth_fix_refresh/migration.sql b/prisma/migrations/20221030224830_oauth_fix_refresh/migration.sql
@@ -0,0 +1,5 @@
+-- DropIndex
+DROP INDEX "OAuth_provider_key";
+
+-- AlterTable
+ALTER TABLE "OAuth" ADD COLUMN     "refresh" TEXT;
diff --git a/prisma/migrations/20221030233448_fix_images/migration.sql b/prisma/migrations/20221030233448_fix_images/migration.sql
@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "Image" DROP CONSTRAINT "Image_userId_fkey";
+
+-- AlterTable
+ALTER TABLE "Image" ALTER COLUMN "userId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Image" ADD CONSTRAINT "Image_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/prisma/migrations/20221031011932_oauth_add_google/migration.sql b/prisma/migrations/20221031011932_oauth_add_google/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "OauthProviders" ADD VALUE 'GOOGLE';
diff --git a/prisma/migrations/20221031041758_oauth_username/migration.sql b/prisma/migrations/20221031041758_oauth_username/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `username` to the `OAuth` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "OAuth" ADD COLUMN     "username" TEXT NOT NULL;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -8,25 +8,23 @@ generator client {
 }
 
 model User {
-  id               Int       @id @default(autoincrement())
-  username         String
-  password         String?
-  oauth            Boolean   @default(false)
-  oauthProvider    String?
-  oauthAccessToken String?
-  avatar           String?
-  token            String
-  administrator    Boolean   @default(false)
-  superAdmin       Boolean   @default(false)
-  systemTheme      String    @default("system")
-  embedTitle       String?
-  embedColor       String    @default("#2f3136")
-  embedSiteName    String?   @default("{image.file} • {user.name}")
-  ratelimit        DateTime?
-  domains          String[]
-  images           Image[]
-  urls             Url[]
-  Invite           Invite[]
+  id            Int       @id @default(autoincrement())
+  username      String
+  password      String?
+  avatar        String?
+  token         String
+  administrator Boolean   @default(false)
+  superAdmin    Boolean   @default(false)
+  systemTheme   String    @default("system")
+  embedTitle    String?
+  embedColor    String    @default("#2f3136")
+  embedSiteName String?   @default("{image.file} • {user.name}")
+  ratelimit     DateTime?
+  domains       String[]
+  oauth         OAuth[]
+  images        Image[]
+  urls          Url[]
+  Invite        Invite[]
 }
 
 enum ImageFormat {
@@ -49,8 +47,8 @@ model Image {
   password   String?
   invisible  InvisibleImage?
   format     ImageFormat     @default(RANDOM)
-  user       User            @relation(fields: [userId], references: [id])
-  userId     Int
+  user       User?            @relation(fields: [userId], references: [id], onDelete: SetNull)
+  userId     Int?
 }
 
 model InvisibleImage {
@@ -86,12 +84,27 @@ model Stats {
 }
 
 model Invite {
-  id         Int       @id @default(autoincrement())
-  code       String    @unique
-  created_at DateTime  @default(now())
-  expires_at DateTime?
-  used       Boolean   @default(false)
-
-  createdBy   User @relation(fields: [createdById], references: [id])
+  id          Int       @id @default(autoincrement())
+  code        String    @unique
+  created_at  DateTime  @default(now())
+  expires_at  DateTime?
+  used        Boolean   @default(false)
+  createdBy   User      @relation(fields: [createdById], references: [id])
   createdById Int
 }
+
+model OAuth {
+  id       Int            @id @default(autoincrement())
+  provider OauthProviders
+  user     User           @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId   Int
+  username String
+  token    String
+  refresh  String?
+}
+
+enum OauthProviders {
+  DISCORD
+  GITHUB
+  GOOGLE
+}
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
@@ -29,6 +29,7 @@ import { showNotification } from '@mantine/notifications';
 import useFetch from 'hooks/useFetch';
 import { useVersion } from 'lib/queries/version';
 import { userSelector } from 'lib/recoil/user';
+import { capitalize } from 'lib/utils/client';
 import { useRecoilState } from 'recoil';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
@@ -52,6 +53,7 @@ import {
   UserIcon,
   DiscordIcon,
   GitHubIcon,
+  GoogleIcon,
 } from './icons';
 import { friendlyThemeName, themes } from './Theming';
 
@@ -161,7 +163,18 @@ const admin_items = [
 export default function Layout({ children, props }) {
   const [user, setUser] = useRecoilState(userSelector);
 
-  const { title } = props;
+  const { title, oauth_providers: unparsed } = props;
+  const oauth_providers = JSON.parse(unparsed);
+  const icons = {
+    GitHub: GitHubIcon,
+    Discord: DiscordIcon,
+    Google: GoogleIcon,
+  };
+
+  for (const provider of oauth_providers) {
+    provider.Icon = icons[provider.name];
+  }
+
   const external_links = JSON.parse(props.external_links ?? '[]');
 
   const [token, setToken] = useState(user?.token);
@@ -393,24 +406,34 @@ export default function Layout({ children, props }) {
                       Logout
                     </MenuItemLink>
                     <Menu.Divider />
-                    {user.oauth ? (
-                      <>
-                        <MenuItem
-                          icon={
-                            user.oauthProvider === 'discord' ? (
-                              <DiscordIcon size={18} />
-                            ) : (
-                              <GitHubIcon size={18} />
-                            )
-                          }
-                        >
-                          Logged in with{' '}
-                          <span style={{ textTransform: 'capitalize' }}>{user.oauthProvider}</span>
-                        </MenuItem>
-
+                    <>
+                      {oauth_providers
+                        .filter((x) =>
+                          user.oauth
+                            ?.map(({ provider }) => provider.toLowerCase())
+                            .includes(x.name.toLowerCase())
+                        )
+                        .map(({ name, Icon }, i) => (
+                          <>
+                            <MenuItem
+                              sx={{ '&:hover': { backgroundColor: 'inherit' } }}
+                              key={i}
+                              py={5}
+                              px={4}
+                              icon={<Icon size={18} colorScheme={theme.colorScheme} />}
+                            >
+                              Logged in with {capitalize(name)}
+                            </MenuItem>
+                          </>
+                        ))}
+                      {oauth_providers.filter((x) =>
+                        user.oauth
+                          ?.map(({ provider }) => provider.toLowerCase())
+                          .includes(x.name.toLowerCase())
+                      ).length ? (
                         <Menu.Divider />
-                      </>
-                    ) : null}
+                      ) : null}
+                    </>
                     <MenuItem icon={<PencilIcon />}>
                       <Select
                         size='xs'

diff --git a/src/components/icons/DiscordIcon.tsx b/src/components/icons/DiscordIcon.tsx
@@ -4,12 +4,18 @@ import Image from 'next/image';
 
 export default function DiscordIcon({ ...props }) {
   return (
-    <Image
-      alt='discord'
-      src='https://assets-global.website-files.com/6257adef93867e50d84d30e2/62595384f934b806f37f4956_145dc557845548a36a82337912ca3ac5.svg'
-      width={24}
-      height={24}
-      {...props}
-    />
+    <svg width='24' height='24' viewBox='0 0 71 55' xmlns='http://www.w3.org/2000/svg'>
+      <g clipPath='url(#clip0)'>
+        <path
+          fill={props.colorScheme === 'manage' ? '#ffffff' : '#5865F2'}
+          d='M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z'
+        />
+      </g>
+      <defs>
+        <clipPath id='clip0'>
+          <rect width='71' height='55' fill='white' />
+        </clipPath>
+      </defs>
+    </svg>
   );
 }
diff --git a/src/components/icons/GitHubIcon.tsx b/src/components/icons/GitHubIcon.tsx
@@ -1,5 +1,17 @@
 import { GitHub } from 'react-feather';
+import Image from 'next/image';
 
-export default function GitHubIcon({ ...props }) {
-  return <GitHub size={24} {...props} />;
+// https://upload.wikimedia.org/wikipedia/commons/9/91/Octicons-mark-github.svg
+export default function GitHubIcon({ colorScheme, ...props }) {
+  return (
+    <svg width={24} height={24} viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' {...props}>
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z'
+        transform='scale(64)'
+        fill={colorScheme === 'dark' ? '#FFFFFF' : '#1B1F23'}
+      />
+    </svg>
+  );
 }
diff --git a/src/components/icons/GoogleIcon.tsx b/src/components/icons/GoogleIcon.tsx
@@ -0,0 +1,15 @@
+// https://developers.google.com/identity/branding-guidelines
+
+import Image from 'next/image';
+
+export default function GoogleIcon({ ...props }) {
+  return (
+    <Image
+      alt='google'
+      src='https://madeby.google.com/static/images/google_g_logo.svg'
+      width={24}
+      height={24}
+      {...props}
+    />
+  );
+}
diff --git a/src/components/icons/index.tsx b/src/components/icons/index.tsx
@@ -29,6 +29,7 @@ import DownloadIcon from './DownloadIcon';
 import FlameshotIcon from './FlameshotIcon';
 import GitHubIcon from './GitHubIcon';
 import DiscordIcon from './DiscordIcon';
+import GoogleIcon from './GoogleIcon';
 import EyeIcon from './EyeIcon';
 import RefreshIcon from './RefreshIcon';
 
@@ -64,6 +65,7 @@ export {
   FlameshotIcon,
   GitHubIcon,
   DiscordIcon,
+  GoogleIcon,
   EyeIcon,
   RefreshIcon,
 };