@celljs/cli 3.9.0 → 4.0.0

package/templates/accounts/src/browser/home.view.tsx

@@ -1,86 +0,0 @@
-import * as React from 'react';
-import { ConfigUtil, ContainerUtil } from '@celljs/core';
-import { UserManager } from '@celljs/security/lib/browser';
-import { View } from '@celljs/react';
-import { LocaleMenu, Icon } from '@celljs/grommet';
-import { useIntl } from 'react-intl';
-import { Box, Button, Heading, ResponsiveContext, Avatar, Text} from 'grommet';
-import { Logout } from 'grommet-icons';
-import styled from 'styled-components';
-import { User } from '@celljs/security';
-const { useContext } = React;
-
-const StyledWraper = styled.div`
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #fafafa;
-`;
-
-interface ContainerProps {
-    size: string;
-};
-
-const StyledContainer = styled.div<ContainerProps>`
-    width: ${props => props.size === 'small' ? '100%' : '340px'};
-    height: ${props => props.size === 'small' ? '100%' : '500px'};
-    position: absolute;
-    top: ${props => props.size === 'small' ? '0' : 'calc(50% - 250px)'};
-    left: ${props => props.size === 'small' ? '0' : 'calc(50% - 170px)'};
-    text-align: center;
-    background-color: #ffffff;
-    box-shadow: ${props => props.size === 'small' ? 'none' : '0px 0px 5px #e9e9e9'};
-    border-radius: ${props => props.size === 'small' ? '0' : '4px'};
-`;
-
-export function Home() {
-    const size = useContext(ResponsiveContext);
-    const intl = useIntl();
-    
-    const loginUserManager = ContainerUtil.get<UserManager>(UserManager);
-    const [user, setUser] = React.useState<User | undefined>(loginUserManager.userInfoSubject.value);
-    React.useEffect(() => {
-        const subscription = loginUserManager.userInfoSubject.subscribe(u => setUser(u));
-        return () => subscription.unsubscribe();
-    }, []);
-    
-    return (
-    <StyledWraper style={size === 'small' ? { top: 0, bottom: 0, right: 0, left: 0 } : undefined }>
-        <StyledContainer size={size}>
-            <Box direction="column" pad="large" align="center" background="brand" round={ size === 'small' ? undefined : { corner: 'top', size: '4px' } }>
-                <Button plain
-                    href={ConfigUtil.get('accounts.home.url')}
-                    icon={<Icon size="large" color="white" icon={ConfigUtil.get('accounts.logo.icon')}></Icon>}>
-                </Button>
-                <Heading level="4" color="white">{intl.formatMessage({ id: 'accounts.logo.label' })}</Heading>
-            </Box>
-            <Box direction="column" align="center" animation="slideDown" pad="large">
-                {user && (
-                    <Box direction="column" align="center">
-                        <Avatar
-                            hoverIndicator title={user.nickname} src={user.avatar} margin="small">
-                        </Avatar>
-                        <Text>{user.nickname}</Text>
-                        <Text style={{ opacity: .7, fontSize: '.8em' }} >{user.email}</Text>
-                        <Button
-                            title={intl.formatMessage({ id: 'accounts.logout.label' })}
-                            margin='small'
-                            hoverIndicator
-                            icon={<Logout/>}
-                            onClick={() => loginUserManager.logout()}>
-                        </Button>
-                    </Box>
-                )}
-            </Box>
-            <Box direction="column" fill="horizontal" style={ { position: 'absolute', bottom: 0 } } align="center">
-                <LocaleMenu size="small" fontSize="12px"/>
-            </Box>
-        </StyledContainer>
-    </StyledWraper>);
-
-}
-@View({ path: '/home', component: Home,  })
-@View({ path: '/', component: Home,  })
-export default class {}

package/templates/accounts/src/browser/index.ts

@@ -1,3 +0,0 @@
-export * from './login.view';
-export * from './home.view';
-

package/templates/accounts/src/browser/login.view.tsx

@@ -1,78 +0,0 @@
-import * as React from 'react';
-import { useLocation } from 'react-router';
-import { parse, stringify } from 'querystring';
-import { ConfigUtil } from '@celljs/core';
-import { View } from '@celljs/react';
-import { LocaleMenu, Icon } from '@celljs/grommet';
-import { useIntl } from 'react-intl';
-import { Box, Button, Heading, ResponsiveContext, Nav } from 'grommet';
-import styled from 'styled-components';
-const { useContext } = React;
-
-const StyledWraper = styled.div`
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #fafafa;
-`;
-
-interface ContainerProps {
-    size: string;
-};
-
-const StyledContainer = styled.div<ContainerProps>`
-    width: ${props => props.size === 'small' ? '100%' : '340px'};
-    height: ${props => props.size === 'small' ? '100%' : '500px'};
-    position: absolute;
-    top: ${props => props.size === 'small' ? '0' : 'calc(50% - 250px)'};
-    left: ${props => props.size === 'small' ? '0' : 'calc(50% - 170px)'};
-    text-align: center;
-    background-color: #ffffff;
-    box-shadow: ${props => props.size === 'small' ? 'none' : '0px 0px 5px #e9e9e9'};
-    border-radius: ${props => props.size === 'small' ? '0' : '4px'};
-`;
-
-export function Login() {
-    const location = useLocation();
-    const size = useContext(ResponsiveContext);
-    const intl = useIntl();
-    const targetUrlParameter = ConfigUtil.get<string>('cell.security.targetUrlParameter');
-    const registrations = ConfigUtil.get<{[key: string]: { icon?: string, clientName: string } }>('cell.oauth2.client.registrations');
-    const redirect = parse(location.search && location.search.substring(1))[targetUrlParameter];
-    const queryStr = redirect ? `?${stringify({ [targetUrlParameter]: redirect})}` : '';
-    return (
-    <StyledWraper style={size === 'small' ? { top: 0, bottom: 0, right: 0, left: 0 } : undefined }>
-        <StyledContainer size={size}>
-            <Box direction="column" pad="large" align="center" background="brand" round={ size === 'small' ? undefined : { corner: 'top', size: '4px' } }>
-                <Button plain
-                    href={ConfigUtil.get('accounts.home.url')}
-                    icon={<Icon size="large" color="white" icon={ConfigUtil.get('accounts.logo.icon')}></Icon>}>
-                </Button>
-                <Heading level="4" color="white">{intl.formatMessage({ id: 'accounts.logo.label' })}</Heading>
-            </Box>
-            <Box direction="column" align="center" animation="slideDown">
-                <Heading level="6">{intl.formatMessage({ id: 'accounts.quick.login.label' })}</Heading>
-                <Nav>
-                    {
-                        Object.keys(registrations).map(id => (
-                            <Button
-                                hoverIndicator
-                                icon={<Icon icon={registrations[id].icon || registrations[id].clientName} size="large"></Icon>}
-                                href={`/oauth2/authorization/${id}${queryStr}`}>
-                            </Button>
-                        ))
-                    }
-                </Nav>
-            </Box>
-            <Box direction="column" fill="horizontal" style={ { position: 'absolute', bottom: 0 } } align="center">
-                <LocaleMenu size="small" fontSize="12px"/>
-            </Box>
-        </StyledContainer>
-    </StyledWraper>);
-
-}
-
-@View({ path: '/login', component: Login })
-export default class {}

package/templates/accounts/src/browser/module.ts

@@ -1,3 +0,0 @@
-import { autoBind } from '@celljs/core';
-import './index';
-export default autoBind();

package/templates/accounts/src/common/entity-protocol.ts

@@ -1,7 +0,0 @@
-export interface BaseEntity {
-    id: number;
-
-    createdAt: Date;
-
-    updatedAt: Date;
-}

package/templates/accounts/src/common/index.ts

@@ -1 +0,0 @@
-export * from './entity-protocol';

package/templates/accounts/src/node/authentication/authentication-success-handler.ts

@@ -1,69 +0,0 @@
-import { Component, Autowired } from '@celljs/core';
-import { User, UserType } from '@celljs/security';
-import { Context } from '@celljs/web/lib/node';
-import { AuthenticationSuccessHandler, Authentication, DefaultAuthenticationSuccessHandler } from '@celljs/security/lib/node';
-import { ClientRegistrationManager } from '@celljs/oauth2-client/lib/node';
-import { User as UserEntity, Identity  } from '../entity';
-import { UserRepository } from '../user';
-const requestIp = require('request-ip');
-
-@Component({ id: AuthenticationSuccessHandler, rebind: true })
-export class OAuth2AuthenticationSuccessHandler extends DefaultAuthenticationSuccessHandler {
-
-    @Autowired(UserRepository)
-    protected userRepository: UserRepository;
-
-    @Autowired(ClientRegistrationManager)
-    protected readonly clientRegistrationManager: ClientRegistrationManager;
-
-    protected rebuildAuthentication(authentication: Authentication, userEntity: UserEntity) {
-        authentication.name = userEntity.id + '';
-        const principal = authentication.principal;
-        principal.username = userEntity.id + '';
-        principal.enabled = !!userEntity.blocked;
-    }
-
-    protected log(userEntity: UserEntity) {
-        userEntity.loginsCount += 1;
-        userEntity.lastLogin = new Date();
-        userEntity.lastIp = requestIp.getClientIp(Context.getRequest());
-        return this.userRepository.update(userEntity);
-    }
-
-    async onAuthenticationSuccess(authentication: Authentication): Promise<void> {
-
-        const principal = authentication.principal;
-        if (User.is(principal)) {
-            if (principal.type !== UserType.Memery && principal.type !== UserType.Database) {
-                let userEntity = await this.userRepository.getByConnectionAndIdentifier(principal.type, principal.username);
-                if (!userEntity) {
-                    if (principal.email) {
-                        userEntity = await this.userRepository.getByEmail(principal.email);
-                    }
-                }
-                if (!userEntity) {
-                    const registration = await this.clientRegistrationManager.get(principal.type);
-                    userEntity = new UserEntity();
-                    userEntity.username = principal.login;
-                    userEntity.email = principal.email;
-                    userEntity.emailVerified = !!principal.email;
-                    userEntity.picture = principal.avatar;
-                    userEntity.blocked = false;
-                    userEntity.loginsCount = 0;
-                    userEntity.nickname = principal.nickname || principal.login;
-
-                    const identity = new Identity();
-                    identity.connection = registration!.registrationId;
-                    identity.identifier = principal.username;
-                    identity.isSocial = true;
-                    identity.provider = registration!.provider;
-                    userEntity = await this.userRepository.create(userEntity, identity);
-                }
-                this.rebuildAuthentication(authentication, userEntity);
-                await this.log(userEntity);
-            }
-        }
-        await super.onAuthenticationSuccess(authentication);
-     }
-
-}

package/templates/accounts/src/node/authentication/index.ts

@@ -1 +0,0 @@
-export * from './authentication-success-handler';

package/templates/accounts/src/node/entity/base-entity.ts

@@ -1,13 +0,0 @@
-import { CreateDateColumn, UpdateDateColumn, PrimaryGeneratedColumn } from 'typeorm';
-
-export abstract class BaseEntity {
-
-    @PrimaryGeneratedColumn()
-    id: number;
-
-    @CreateDateColumn()
-    createdAt: Date;
-
-    @UpdateDateColumn()
-    updatedAt: Date;
-}

package/templates/accounts/src/node/entity/connection.ts

@@ -1,52 +0,0 @@
-import {Entity, Column } from 'typeorm';
-import { BaseEntity } from './base-entity';
-
-export class Connection extends BaseEntity {
-
-    @Column()
-    name: string;
-
-}
-
-@Entity()
-export class Database extends Connection {
-
-    @Column()
-    requiresUsername: boolean;
-
-    @Column()
-    usernameMaxLength: number;
-
-    @Column()
-    usernameMinLength: boolean;
-
-    @Column()
-    disableSignUps: boolean;
-
-}
-
-@Entity()
-export class Social extends Connection {
-
-    @Column()
-    strategy: string;
-
-    @Column()
-    clientId: string;
-
-    @Column()
-    clientSecret: string;
-
-    @Column()
-    scopes: string[];
-
-    @Column()
-    redirectUri: string;
-
-    @Column()
-    authorizationGrantType: string;
-
-    @Column()
-    clientAuthenticationMethod: string;
-
-}

package/templates/accounts/src/node/entity/index.ts

@@ -1 +0,0 @@
-export * from './user';

package/templates/accounts/src/node/entity/user.ts

@@ -1,73 +0,0 @@
-import { Entity, Column } from 'typeorm';
-import { Exclude } from 'class-transformer';
-import { BaseEntity } from './base-entity';
-
-@Entity()
-export class Identity extends BaseEntity {
-
-    @Column()
-    userId: number;
-
-    @Column()
-    provider: string;
-
-    @Column()
-    connection: string;
-
-    @Column()
-    isSocial: boolean;
-
-    @Column()
-    identifier: string;
-
-}
-
-@Entity()
-export class User extends BaseEntity {
-
-    @Column({ length: 256, nullable: true })
-    email?: string;
-
-    @Column({ default: false })
-    emailVerified: boolean;
-
-    @Column({ length: 128, nullable: true })
-    username?: string;
-
-    @Column({ length: 64, nullable: true })
-    phoneNumber?: string;
-
-    @Column({ default: false })
-    phoneVerified: boolean;
-
-    @Column({ length: 512, nullable: true  })
-    appMetadata?: string;
-
-    @Column({ length: 512, nullable: true })
-    userMetadata?: string;
-
-    @Column({ length: 512, nullable: true })
-    picture?: string;
-
-    @Column({ length: 64, nullable: true  })
-    nickname?: string;
-
-    @Column({ nullable: true })
-    multifactor?: string;
-
-    @Column({ length: 32, nullable: true })
-    lastIp?: string;
-
-    @Column({ nullable: true })
-    lastLogin?: Date;
-
-    @Column({ default: 0 })
-    loginsCount: number;
-
-    @Column({ default: false })
-    blocked: boolean;
-
-    @Column({ length: 256, nullable: true })
-    @Exclude()
-    password!: string;
-}

package/templates/accounts/src/node/error/error.ts

@@ -1,14 +0,0 @@
-import { CustomError } from '@celljs/core';
-
-export class UserNotFoundError extends CustomError {
-    constructor(public userIdOrEmail: number | string) {
-        super(`No user found: ${userIdOrEmail}`);
-    }
-}
-
-export class IdentityNotFoundError extends CustomError {
-
-    constructor(public identity: number, public provider: string) {
-        super(`No identity found: ${provider}(${identity})`);
-    }
-}

package/templates/accounts/src/node/error/index.ts

@@ -1 +0,0 @@
-export * from './error';

package/templates/accounts/src/node/index.ts

@@ -1,2 +0,0 @@
-export * from './authentication';
-export * from './user';

package/templates/accounts/src/node/module.ts

@@ -1,9 +0,0 @@
-
-import { autoBind } from '@celljs/core';
-import { autoBindEntities } from '@celljs/typeorm';
-import * as entities from './entity';
-import './index';
-
-autoBindEntities(entities);
-
-export default autoBind();

package/templates/accounts/src/node/user/index.ts

@@ -1,4 +0,0 @@
-export * from './user-service';
-export * from './user-protocol';
-export * from './user-repository';
-

package/templates/accounts/src/node/user/user-protocol.ts

@@ -1,19 +0,0 @@
-import { Identity, User } from '../entity';
-export const UserRepository = Symbol('UserRepository');
-
-export interface UserRepository {
-
-    getByConnectionAndIdentifier(connection: string, identity: string): Promise<User | null>;
-
-    getByEmail(email: string): Promise<User | null>;
-
-    getByUsername(username: string): Promise<User | null>;
-
-    get(id: number): Promise<User | null>;
-
-    update(user: User): Promise<User>;
-
-    create(user: User, identity: Identity): Promise<User>;
-
-}
-

package/templates/accounts/src/node/user/user-repository.ts

@@ -1,72 +0,0 @@
-import { Component } from '@celljs/core';
-import { Transactional, OrmContext } from '@celljs/typeorm/lib/node';
-import { Identity, User } from '../entity';
-import { UserNotFoundError } from '../error';
-import { plainToClassFromExist, classToPlain } from 'class-transformer';
-import { UserRepository } from './user-protocol';
-
-@Component(UserRepository)
-export class UserRepositoryImpl implements UserRepository {
-
-    @Transactional({ readOnly: true })
-    getByConnectionAndIdentifier(connection: string, identifier: string): Promise<User | null> {
-        const repo = OrmContext.getRepository(User);
-
-        const identityQb = OrmContext.getRepository(Identity).createQueryBuilder('identity')
-            .select('identity.userId')
-            .where('identity.identifier = :identifier and identity.connection = :connection', { connection, identifier });
-        return repo.createQueryBuilder('user')
-            .where(`user.id IN (${identityQb.getQuery()})`)
-            .setParameters(identityQb.getParameters())
-            .getOne();
-
-    }
-
-    @Transactional({ readOnly: true })
-    getByEmail(email: string): Promise<User | null> {
-        const repo = OrmContext.getRepository(User);
-        return repo.createQueryBuilder('user')
-            .where('user.email = :email', { email })
-            .getOne();
-    }
-
-    @Transactional({ readOnly: true })
-    getByUsername(username: string): Promise<User | null> {
-        const repo = OrmContext.getRepository(User);
-        return repo.createQueryBuilder('user')
-            .where('user.username = :email', { username })
-            .getOne();
-    }
-
-    @Transactional({ readOnly: true })
-    async get(id: number): Promise<User> {
-        const repo = OrmContext.getRepository(User);
-        const user = await repo.findOneBy({ id });
-        if (user) {
-            return user;
-        }
-        throw new UserNotFoundError(id);
-    }
-
-    @Transactional()
-    async update(user: User): Promise<User> {
-        const repo = OrmContext.getRepository(User);
-        const oldUser = await repo.findOneBy({ id: user.id });
-        if (oldUser) {
-            const newUser = plainToClassFromExist(oldUser, classToPlain(user));
-            return repo.save(newUser);
-        }
-        throw new UserNotFoundError(user.id);
-    }
-
-    @Transactional()
-    async create(user: User, identity: Identity): Promise<User> {
-        const userRepo = OrmContext.getRepository(User);
-        const identityRepo = OrmContext.getRepository(Identity);
-        const newUser = await userRepo.save(user);
-        identity.userId = newUser.id;
-        await identityRepo.save(identity);
-        return newUser;
-    }
-
-}

package/templates/accounts/src/node/user/user-service.ts

@@ -1,36 +0,0 @@
-import { UserService, UsernameNotFoundError } from '@celljs/security/lib/node';
-import { Value, Component, Autowired } from '@celljs/core';
-import { User, UserType } from '@celljs/security';
-import { UserRepository } from './user-protocol';
-
-@Component({ id: UserService, rebind: true })
-export class DatabaseUserService implements UserService<string, User> {
-
-    @Value('cell.security')
-    protected readonly options: any;
-
-    @Autowired(UserRepository)
-    protected userRepository: UserRepository;
-
-    async load(username: string): Promise<User> {
-        const userEntity = await this.userRepository.getByUsername(username);
-        if (userEntity) {
-            return {
-                type: UserType.Database,
-                username: userEntity.id + '',
-                password: userEntity.password,
-                login: userEntity.username,
-                avatar: userEntity.picture,
-                email: userEntity.email,
-                nickname: userEntity.nickname,
-                accountNonExpired: true,
-                accountNonLocked: true,
-                credentialsNonExpired: true,
-                enabled: !userEntity.blocked,
-                policies: []
-            };
-        }
-
-        throw new UsernameNotFoundError(`Could not find: ${username}`);
-    }
-}

package/templates/accounts/tsconfig.json

@@ -1,32 +0,0 @@
-{
-  "compilerOptions": {
-    "skipLibCheck": true,
-    "declaration": true,
-    "declarationMap": true,
-    "noImplicitAny": true,
-    "noEmitOnError": false,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "module": "node16",
-    "moduleResolution": "node16",
-    "jsx": "react",
-    "target": "ES2017",
-    "lib": [
-      "ES2017",
-      "dom"
-    ],
-    "sourceMap": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "strict": false,
-    "types": [
-      "node"
-    ]
-  },
-  "include": [
-    "src"
-  ]
-}

package/templates/admin-app/.github/workflows/deploy.yml

@@ -1,25 +0,0 @@
-name: Cell Deploy
-
-on: push
-
-jobs:
-  cell-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - uses: bahmutov/npm-install@v1
-      - run: npm run lint --if-present
-      - run: npm test
-      - if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
-        env: ${{ secrets }}
-        run: npx cell deploy -m prod
-      - if: ${{ github.ref == 'refs/heads/pre' }}
-        env: ${{ secrets }}
-        run: npx cell deploy -m pre
-      - if: ${{ github.ref != 'refs/heads/master' && github.ref == 'refs/heads/main' && github.ref != 'refs/heads/pre' }}
-        env: ${{ secrets }}
-        run: npx cell deploy -m test

package/templates/admin-app/.vscode/launch.json

@@ -1,23 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Cell Debug",
-            "request": "launch",
-            "runtimeArgs": [
-                "cell",
-                "serve"
-            ],
-            "runtimeExecutable": "npx",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "env": {
-                "NODE_ENV": "development"
-            },
-            "internalConsoleOptions": "openOnSessionStart",
-            "outputCapture": "std",
-            "type": "pwa-node"
-        }
-    ]
-}