opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-09-24 15:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(desktop): signup api (#4314)

Browse Source
This commit is contained in:
xudaotutou
2023-11-21 16:50:02 +08:00
committed by GitHub
parent 5c59030312
commit 7c08451b74
19 changed files with 9658 additions and 13220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/desktop/package.json
+2
View File
@@ -10,6 +10,7 @@
"test:e2e": "jest --testPathPattern=/e2e/ --runInBand",
"test:e2e-namespace": "jest --testPathPattern=/e2e/namespace/ --runInBand",
"test:e2e-auth": "jest --testPathPattern=/e2e/auth/ --runInBand",
"test:e2e-api": "jest --testPathPattern=/e2e/v1alpha/ --runInBand",
"test:ci": "jest --runInBand"
},
"dependencies": {
@@ -46,6 +47,7 @@
"next-pwa": "^5.6.0",
"nprogress": "^0.2.0",
"qrcode.react": "^3.1.0",
"randexp": "^0.5.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-draggable": "^4.4.6",
frontend/desktop/src/__tests__/api/e2e/namespace/create.test.ts
+1 -1
View File
@@ -56,7 +56,7 @@ describe('Login create', () => {
const res = await createRequest({ teamName: 'hello' });
expect(res.code).toBe(409);
});
it.each(new Array(getTeamLimit() + 2).map((_, idx) => [`team${idx}`, idx]))(
it.skip.each(new Array(getTeamLimit() + 2).map((_, idx) => [`team${idx}`, idx]))(
'limit 4 team',
async (teamName: string, idx: number) => {
if (idx === 0) {
frontend/desktop/src/__tests__/api/e2e/v1alpha/signup.test.ts
+64
View File
@@ -0,0 +1,64 @@
import { Session } from 'sealos-desktop-sdk/*';
import * as k8s from '@kubernetes/client-node';
import { _passwordLoginRequest, _passwordModifyRequest } from '@/api/auth';
import { _setAuth, cleanDb, cleanK8s } from '@/__tests__/api/tools';
import { _createRequest } from '@/api/namespace';
import request from '@/__tests__/api/request';
import { Db, MongoClient } from 'mongodb';
import { ApiResp } from '@/types';
import RandExp from 'randexp';
export const getUserAndPassword = () => {
const userFactory = new RandExp('[a-zA-Z0-9_-]{10,16}');
const password = new RandExp(/\w{8,20}/).gen();
return {
username: userFactory.gen(),
password
};
};
describe('v1alpha/signup', () => {
const generateRequest = (data: { username: string; password: string }) =>
request.post<any, ApiResp<Omit<Session, 'token'>>>('/api/v1alpha/password/signup', data);
const signinRequest = (data: { username: string; password: string }) =>
request.post<typeof data, ApiResp<Omit<Session, 'token'>>>(
'/api/v1alpha/password/signin',
data
);
let db: Db;
let connection: MongoClient;
const setAuth = _setAuth(request);
beforeAll(async () => {
//@ts-ignore
const uri = process.env.MONGODB_URI as string;
connection = new MongoClient(uri);
await connection.connect();
db = connection.db();
const kc = new k8s.KubeConfig();
await cleanK8s(kc, db);
await cleanDb(db);
}, 100000);
afterAll(async () => {
await connection.close();
});
it.each([[1], [2], [3], [4], [5]])(
'sign up test',
async (time) => {
const user = getUserAndPassword();
if (!user) return;
expect.assertions(2);
const genRes = await generateRequest(user);
expect(genRes.data).toBeDefined();
console.log(`the ${time} times`);
console.log(`session`, genRes.data);
if (genRes.code === 200) {
const res = await signinRequest(user);
expect(res.data?.kubeconfig).toBe(genRes.data?.kubeconfig);
} else {
const res = await signinRequest(user);
expect(res.code).toBe(403);
}
setAuth({});
},
10000
);
});
frontend/desktop/src/__tests__/api/tools.ts
+6 -5
View File
@@ -50,10 +50,11 @@ export const cleanDb = async (db: Db) => {
);
};
export const _setAuth = (request: AxiosInstance) => (session: Session) => {
export const _setAuth = (request: AxiosInstance) => (session: Partial<Session>) => {
request.interceptors.request.clear();
request.interceptors.request.use((config) => {
config.headers.Authorization = session?.token;
return config;
});
session?.token &&
request.interceptors.request.use((config) => {
config.headers.Authorization = session.token;
return config;
});
};
frontend/desktop/src/pages/api/auth/password/exist.ts
+12 -11
View File
@@ -5,6 +5,7 @@ import { queryUser } from '@/services/backend/db/user';
import { hashPassword } from '@/utils/crypto';
import { TUserExist } from '@/types/user';
import { enablePassword, enableSignUp } from '@/services/enable';
import { passwrodUserIsExist } from '@/services/backend/oauth';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
if (!enablePassword()) {
@@ -21,8 +22,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
}
});
}
const result = await queryUser({ id: user, provider: 'password_user' });
if (!result || !result.password || result.password === hashPassword('')) {
const isExist = await passwrodUserIsExist({ username: user });
if (!isExist)
return jsonRes<TUserExist>(res, {
message: 'user not found',
code: 201,
@@ -31,15 +32,15 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
exist: false
}
});
}
return jsonRes<TUserExist>(res, {
code: 200,
message: 'Successfully',
data: {
user,
exist: true
}
});
else
return jsonRes<TUserExist>(res, {
code: 200,
message: 'Successfully',
data: {
user,
exist: true
}
});
} catch (err) {
console.log(err);
return jsonRes(res, {
frontend/desktop/src/pages/api/v1alpha/password/signin.ts
+53
View File
@@ -0,0 +1,53 @@
import { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@/services/backend/response';
import { ApiSession, Session } from '@/types/session';
import { signInByPassword } from '@/services/backend/oauth';
import { enableApi, enablePassword } from '@/services/enable';
import { getUserKubeconfig } from '@/services/backend/kubernetes/admin';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
if (!enablePassword()) {
throw new Error('PASSWORD_SALT is not defined');
}
if (!enableApi()) throw new Error('Failed to sign in by api');
const { password, username } = req.body as Record<string, string>;
if (!password) return jsonRes(res, { code: 400, message: 'password is Required' });
if (!username) return jsonRes(res, { code: 400, message: 'username is Required' });
const signResult = await signInByPassword({
username,
password
});
if (!signResult)
return jsonRes(res, {
code: 403,
message: 'user is invaild'
});
const { k8s_user, namespace, user } = signResult;
const kubernetesUsername = k8s_user.name;
const kubeconfig = await getUserKubeconfig(user.uid, kubernetesUsername);
if (!kubeconfig) {
throw new Error('Failed to get user config');
}
return jsonRes<ApiSession>(res, {
data: {
user: {
name: user.name,
kubernetesUsername,
avatar: user.avatar_url,
nsID: namespace.id,
nsUID: namespace.uid,
userID: user.uid
},
kubeconfig
},
code: 200,
message: 'Successfully'
});
} catch (err) {
console.log(err);
return jsonRes(res, {
message: 'Failed to authenticate with password',
code: 500
});
}
}
frontend/desktop/src/pages/api/v1alpha/password/signup.ts
+67
View File
@@ -0,0 +1,67 @@
import { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@/services/backend/response';
import { ApiSession, Session } from '@/types/session';
import { passwrodUserIsExist, signUpByPassword } from '@/services/backend/oauth';
import { enablePassword, enableApi, enableSignUp } from '@/services/enable';
import { getUserKubeconfig } from '@/services/backend/kubernetes/admin';
import { strongPassword } from '@/utils/crypto';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
if (!enablePassword()) {
throw new Error('PASSWORD_SALT is not defined');
}
if (!enableSignUp()) throw new Error('Failed to sign up user');
if (!enableApi()) throw new Error('Failed to sign up by api');
const { password, username } = req.body as Record<string, string>;
if (!password) return jsonRes(res, { code: 400, message: 'password is Required' });
if (!username) return jsonRes(res, { code: 400, message: 'username is Required' });
// const userAndPassword = await getUserAndPassword();
// if (!userAndPassword) throw Error('Failed to generate user ');
// const { username, password } = userAndPassword;
if (!strongPassword(password)) {
return jsonRes(res, {
message:
'Password must be at least 8 characters long and contain at least one uppercase letter, one lowercase letter, one number and one special character',
code: 400
});
}
const isExist = await passwrodUserIsExist({ username });
if (isExist)
return jsonRes(res, {
message: 'User is already exist',
code: 409
});
const signResult = await signUpByPassword({
username,
password
});
if (!signResult) throw new Error('Failed to edit db');
const { k8s_user, namespace, user } = signResult;
const kubernetesUsername = k8s_user.name;
const kubeconfig = await getUserKubeconfig(user.uid, kubernetesUsername);
if (!kubeconfig) {
throw new Error('Failed to get user config');
}
return jsonRes<ApiSession>(res, {
data: {
user: {
name: user.name,
kubernetesUsername,
avatar: user.avatar_url,
nsID: namespace.id,
nsUID: namespace.uid,
userID: user.uid
},
kubeconfig
},
code: 200,
message: 'Successfully'
});
} catch (err) {
console.log(err);
return jsonRes(res, {
message: 'Failed to authenticate with password',
code: 500
});
}
}
frontend/desktop/src/services/backend/kubernetes/admin.ts
-1
View File
@@ -35,7 +35,6 @@ async function watchClusterObject({
try {
const data = await client.getClusterCustomObjectStatus(group, version, plural, name);
body = data.body;
console.log(body);
if (
'status' in body &&
// @ts-ignore
frontend/desktop/src/services/backend/oauth.ts
+35 -3
View File
@@ -11,6 +11,8 @@ import { v4 as uuid } from 'uuid';
import { createUTN, queryUTN } from './db/userToNamespace';
import { InvitedStatus, NSType, UserRole } from '@/types/team';
import { enableSignUp } from '../enable';
import RandExp from 'randexp';
import { reject } from 'lodash';
export const getOauthRes = async ({
provider,
@@ -73,6 +75,7 @@ export const getOauthRes = async ({
kubeconfig
};
};
async function signIn({
userResult: _user,
provider,
@@ -140,7 +143,6 @@ async function signIn({
namespace
};
}
async function signUp({
provider,
id,
@@ -155,8 +157,6 @@ async function signUp({
password?: string;
}) {
const ns_uid = uuid();
if (provider === 'password_user') {
}
let user: User | null = null;
if (provider === 'password_user') {
if (!password) return null;
@@ -191,3 +191,35 @@ async function signUp({
namespace
};
}
export function signUpByPassword({ password, username }: { password: string; username: string }) {
return signUp({
provider: 'password_user',
id: username,
name: username,
avatar_url: '',
password
});
}
export async function signInByPassword({
password,
username
}: {
password: string;
username: string;
}) {
const _user = await queryUser({ id: username, provider: 'password_user' });
if (!_user) return null;
return signIn({
userResult: _user,
provider: 'password_user',
password,
id: username
}).then(
(v) => v,
(_) => Promise.resolve(null)
);
}
export async function passwrodUserIsExist({ username: id }: { username: string }) {
const result = await queryUser({ id, provider: 'password_user' });
return result && result.password && result.password !== hashPassword('');
}
frontend/desktop/src/services/enable.ts
+1
View File
@@ -23,6 +23,7 @@ export const enableRecharge = () => {
return process.env.RECHARGE_ENABLED === 'true';
};
export const enableSignUp = () => process.env.SIGN_UP_ENABLED === 'true';
export const enableApi = () => process.env.API_ENABLED === 'true';
// costcenter
export const enableStripe = () =>
process.env['STRIPE_ENABLED'] === 'true' && !!process.env['STRIPE_PUB'];
frontend/desktop/src/types/session.ts
+13
View File
@@ -23,6 +23,19 @@ export type Session = {
// 帮忙导出用的
kubeconfig: KubeConfig;
};
export type ApiSession = {
// 提供一些简单的信息
user: {
readonly kubernetesUsername: string;
readonly name: string;
readonly avatar: string;
readonly nsID: string;
readonly nsUID: string;
readonly userID: string;
};
// 帮忙导出用的
kubeconfig: KubeConfig;
};
export type JWTPayload = {
kubeconfig: KubeConfig;
user: Record<'uid' | 'nsid' | 'k8s_username' | 'ns_uid', string>;
frontend/pnpm-lock.yaml
Generated
+9351 -13168
View File
File diff suppressed because it is too large Load Diff
frontend/providers/dbprovider/next.config.js
+9 -9
View File
@@ -1,8 +1,8 @@
/** @type {import('next').NextConfig} */
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
const { i18n } = require('./next-i18next.config')
const analyzer = process.env === 'production' ? [new BundleAnalyzerPlugin()] : []
const path = require('path')
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const { i18n } = require('./next-i18next.config');
const analyzer = process.env === 'production' ? [new BundleAnalyzerPlugin()] : [];
const path = require('path');
const nextConfig = {
i18n,
output: 'standalone',
@@ -15,14 +15,14 @@ const nextConfig = {
issuer: /\.[jt]sx?$/,
use: ['@svgr/webpack']
}
])
config.plugins = [...config.plugins, ...analyzer]
return config
]);
config.plugins = [...config.plugins, ...analyzer];
return config;
},
experimental: {
// this includes files from the monorepo base two directories up
outputFileTracingRoot: path.join(__dirname, '../../')
}
}
};
module.exports = nextConfig
module.exports = nextConfig;
frontend/providers/template/src/pages/develop/components/BreadCrumbHeader.tsx
+12 -6
View File
@@ -21,13 +21,15 @@ const BreadCrumbHeader = ({
justifyContent={'start'}
alignItems={'center'}
backgroundColor={'rgba(255, 255, 255)'}
backdropBlur={'100px'}>
backdropBlur={'100px'}
>
<Flex
alignItems={'center'}
fontWeight={500}
fontSize={16}
color={'#7B838B'}
cursor={'pointer'}>
cursor={'pointer'}
>
<Flex
alignItems={'center'}
css={{
@@ -38,13 +40,15 @@ const BreadCrumbHeader = ({
fill: '#219BF4'
}
}
}}>
}}
>
<Icon
viewBox="0 0 15 15"
fill={'#24282C'}
w={'15px'}
h="15px"
onClick={() => router.push('/')}>
onClick={() => router.push('/')}
>
<path d="M9.1875 13.1875L3.92187 7.9375C3.85937 7.875 3.81521 7.80729 3.78937 7.73438C3.76312 7.66146 3.75 7.58333 3.75 7.5C3.75 7.41667 3.76312 7.33854 3.78937 7.26562C3.81521 7.19271 3.85937 7.125 3.92187 7.0625L9.1875 1.79687C9.33333 1.65104 9.51562 1.57812 9.73438 1.57812C9.95312 1.57812 10.1406 1.65625 10.2969 1.8125C10.4531 1.96875 10.5312 2.15104 10.5312 2.35938C10.5312 2.56771 10.4531 2.75 10.2969 2.90625L5.70312 7.5L10.2969 12.0938C10.4427 12.2396 10.5156 12.4192 10.5156 12.6325C10.5156 12.8463 10.4375 13.0312 10.2812 13.1875C10.125 13.3438 9.94271 13.4219 9.73438 13.4219C9.52604 13.4219 9.34375 13.3438 9.1875 13.1875Z" />
</Icon>
<Text ml="4px" onClick={() => router.push('/')}>
@@ -54,7 +58,8 @@ const BreadCrumbHeader = ({
<Text px="6px">/</Text>
<Text
_hover={{ fill: '#219BF4', color: '#219BF4' }}
color={router.pathname === '/develop' ? '#262A32' : '#7B838B'}>
color={router.pathname === '/develop' ? '#262A32' : '#7B838B'}
>
{t('develop.YAML Detection Tool')}
</Text>
</Flex>
@@ -69,7 +74,8 @@ const BreadCrumbHeader = ({
minW={'120px'}
h={'34px'}
variant={'primary'}
onClick={applyFormalCb}>
onClick={applyFormalCb}
>
{t('develop.Formal Deploy')}
</Button>
)}
frontend/providers/template/src/pages/develop/index.tsx
+10 -5
View File
@@ -212,7 +212,8 @@ export default function Develop() {
borderRadius={'8px'}
overflowY={'hidden'}
overflowX={'scroll'}
flex={1}>
flex={1}
>
{/* left */}
<Flex flexDirection={'column'} w="50%" borderRight={'1px solid #EFF0F1'}>
<Flex
@@ -222,7 +223,8 @@ export default function Develop() {
alignItems={'center'}
backgroundColor={'#F8FAFB'}
px="36px"
borderRadius={'8px 8px 0px 0px '}>
borderRadius={'8px 8px 0px 0px '}
>
<MyIcon name="dev" color={'#24282C'} w={'24px'} h={'24px'}></MyIcon>
<Text fontWeight={'500'} fontSize={'16px'} color={'#24282C'} ml="8px">
{t('develop.Development')}
@@ -250,7 +252,8 @@ export default function Develop() {
alignItems={'center'}
backgroundColor={'#F8FAFB'}
pl="42px"
borderRadius={'8px 8px 0px 0px '}>
borderRadius={'8px 8px 0px 0px '}
>
<MyIcon name="eyeShow" color={'#24282C'} w={'24px'} h={'24px'}></MyIcon>
<Text fontWeight={'500'} fontSize={'16px'} color={'#24282C'} ml="8px">
{t('develop.Preview')}
@@ -262,7 +265,8 @@ export default function Develop() {
pt="26px"
pr={{ sm: '20px', md: '60px' }}
borderBottom={'1px solid #EFF0F1'}
flexDirection={'column'}>
flexDirection={'column'}
>
<Text fontWeight={'500'} fontSize={'18px'} color={'#24282C'}>
{t('develop.Configure Form')}
</Text>
@@ -278,7 +282,8 @@ export default function Develop() {
minW={'100px'}
h={'34px'}
variant={'link'}
onClick={handleExportYaml}>
onClick={handleExportYaml}
>
{t('Export')} Yaml
</Button>
</Flex>
frontend/providers/template/src/pages/instance/components/appList.tsx
+6 -3
View File
@@ -112,7 +112,8 @@ export default function AppList({ instanceName }: { instanceName: string }) {
variant={'base'}
leftIcon={<MyIcon name={'detail'} transform={'translateY(-1px)'} />}
px={3}
onClick={() => handleToDetailPage(item.name)}>
onClick={() => handleToDetailPage(item.name)}
>
{t('Details')}
</Button>
</Flex>
@@ -141,14 +142,16 @@ export default function AppList({ instanceName }: { instanceName: string }) {
justifyContent={'center'}
alignItems={'center'}
background={'white'}
p="32px">
p="32px"
>
<Flex
border={'1px dashed #9CA2A8'}
borderRadius="50%"
w={'48px'}
h={'48px'}
justifyContent="center"
alignItems={'center'}>
alignItems={'center'}
>
<MyIcon color={'#7B838B'} name="empty"></MyIcon>
</Flex>
<Text mt={'12px'} fontSize={14} color={'#5A646E'}>
frontend/providers/template/src/pages/instance/components/cronjobList.tsx
+6 -3
View File
@@ -100,7 +100,8 @@ export default function CronJobList({ instanceName }: { instanceName: string })
variant={'base'}
leftIcon={<MyIcon name={'detail'} transform={'translateY(-1px)'} />}
px={3}
onClick={() => handleToDetailPage(item.name)}>
onClick={() => handleToDetailPage(item.name)}
>
{t('Details')}
</Button>
</Flex>
@@ -129,14 +130,16 @@ export default function CronJobList({ instanceName }: { instanceName: string })
justifyContent={'center'}
alignItems={'center'}
background={'white'}
p="32px">
p="32px"
>
<Flex
border={'1px dashed #9CA2A8'}
borderRadius="50%"
w={'48px'}
h={'48px'}
justifyContent="center"
alignItems={'center'}>
alignItems={'center'}
>
<MyIcon color={'#7B838B'} name="empty"></MyIcon>
</Flex>
<Text mt={'12px'} fontSize={14} color={'#5A646E'}>
frontend/providers/template/src/pages/instance/components/dbList.tsx
+6 -3
View File
@@ -98,7 +98,8 @@ export default function AppList({ instanceName }: { instanceName: string }) {
variant={'base'}
leftIcon={<MyIcon name={'detail'} transform={'translateY(-1px)'} />}
px={3}
onClick={() => handleToDetailPage(item.name)}>
onClick={() => handleToDetailPage(item.name)}
>
{t('Details')}
</Button>
</Flex>
@@ -129,14 +130,16 @@ export default function AppList({ instanceName }: { instanceName: string }) {
justifyContent={'center'}
alignItems={'center'}
background={'white'}
p="32px">
p="32px"
>
<Flex
border={'1px dashed #9CA2A8'}
borderRadius="50%"
w={'48px'}
h={'48px'}
justifyContent="center"
alignItems={'center'}>
alignItems={'center'}
>
<MyIcon color={'#7B838B'} name="empty"></MyIcon>
</Flex>
<Text mt={'12px'} fontSize={14} color={'#5A646E'}>
frontend/providers/template/src/pages/instance/components/otherList.tsx
+4 -2
View File
@@ -81,14 +81,16 @@ export default function OtherList({ instanceName }: { instanceName: string }) {
justifyContent={'center'}
alignItems={'center'}
background={'white'}
p="32px">
p="32px"
>
<Flex
border={'1px dashed #9CA2A8'}
borderRadius="50%"
w={'48px'}
h={'48px'}
justifyContent="center"
alignItems={'center'}>
alignItems={'center'}
>
<MyIcon color={'#7B838B'} name="empty"></MyIcon>
</Flex>
<Text mt={'12px'} fontSize={14} color={'#5A646E'}>