mirror of
https://github.com/ToolJet/ToolJet
synced 2026-05-24 09:28:31 +00:00
* add: new URL prefix
* fix: working on home page
* add: profile path
* playing with rxjs
* removed context part
* working on path changes
* changing routes
- TODO: replace the workspaceId with actual id
* redo: public apps path
* initial commit
* added authorize API
* remove privileges from auth response
* fixed some api issue
- added subscriptions
* fix: redirect url workspace-id null issue
* fix: switch workspace
* fix: organization list mapping
- menu item paths
* fix: preview url
- editor, viewer permission mapping
* jwt fix
* fix: some url issue
- permission mappings
- workspace login
* fixed some issues
- user invite workspace-id
- org settings menu item default selected item issue
* app viewer fixes
* fixing workspace login issues
* fix
* fixing issues
- tooljet db
- path issues
- refatoring the code
* fix: workspace vars permissions
* fix: multi-page handle
* fix: create app from template
* fix: bulk user upload
* fix: import app
- clone app
- upload profile image
* fix: onboarding
* fix: log out
* fixed multi-workspace logout issue
* fix: launch btn
* fix: oauth2
* fixes
* fix: sso login
* fix: workspace sso login
* fixing sso issues
* fix: moved list of orgs to rxjs
- fixed switching issues
* reverting some changes
* fixed some minor bugs
* fixing sso redirect url issues
* fix: switching network timing issues
* fix: back to workspace-id
* fix: tj-database
- refactored the code - removed org id from some pages
- will get the org id from the service file only
* fix: multi-pages
* fix: infinite loop issue
* fixing workspace switching issue
* fixes
- comment link
- logout & private route redirect url
* fix: wrong uuid error
* fixing subpath
- fixed most of the places
- need to test & fix workspace login, sso, new account
* fix: subpath workspace login
* fix: rxjs handle bug
* Revert "fix: tj-database"
This reverts commit 9632ec2ff0.
* fix: reverted tj-db changes
* fix: subpath sso
* typo fix
* fix: existing session issues
* new: switch workspace page
* fix: modal dark-mode
* added default sso support
* fixes
- subpath workspace switching
- handle wrong routes
* fix: manager user button
- refactored the code
* removed SINGLE Workspace feature
* rebase
* add: change modal text
* fix: added validation
* fixed private app 401 issue
* initial commit
* fix: logged out session multi-tab issue
* refactoring the code
* fix: redirect url issue
* added auth-token in cookies
* Fix: failing e2e specs
* added session API
* fix: backend session guard
* fix: removing user details from local storage
* fix: null wid
* undo and redo
* fix: login page
* fix: viewer login redirection
* fix: login page redirection
* fix: public apps logout issue
* added session storage and scheduler
* added profile api
* fix: sso login
- switch workspace
- login page
- setup admin
* working on fixes
* fix: socket issue
* fix: setup admin api
* connected profile & logout apis
* fix: malfunctioned auth token case
* fix: realtime avatar
* fix: profile avatar
* fix: Realtime cursors avatar
* setting max age for auth token cookie
* add: Go to login page if logout api returns 401
* fix: subpath login
* fix
* fix: app logout [viewer]
* fix: authorize page
* remove expiry from jwt
* fix: integrations route
- session api
* small fix
* fix: updated profile
* fix: workspace login [logged user]
* fix: oauth and another workspace page issue
* fixed app preview logout issue
* subpath fix
* fix: subpath app id
* fix: selected state didnt change for apps page [subpath]
* fix
* add cookie parser to test app
* specs added
* increased user session expiry time
* test: session & new apis
* working on test cases
* fix: onboarding issue
* fixing specs
* fix: test cases
* fix: removing profile api calls
* some fixes
* fixing rebase issues
* fix: global ds issues
* fix: app is crashing
* fix: back to text
* fix: oauth test cases
* fix: test-helper
* fix: onboarding test cases
* fix: tests again
* refactoring the code
* latest develop merging precautions
- fixed a minor null issue
* fix: typo
* fix :menu issues due to the merging
* fix: - clicking on tooljet logo didnt redirect to login page for public apps
- private app preview doesnt load after login
* subpath fixes
* fixed back to issue
* PR changes
* fix: spec fixes for EE
* doc: URL scoped for workspace
---------
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: Shubhendra <withshubh@gmail.com>
137 lines
3.1 KiB
TypeScript
137 lines
3.1 KiB
TypeScript
import {
|
|
Entity,
|
|
Column,
|
|
PrimaryGeneratedColumn,
|
|
CreateDateColumn,
|
|
UpdateDateColumn,
|
|
BeforeInsert,
|
|
BeforeUpdate,
|
|
OneToMany,
|
|
BaseEntity,
|
|
ManyToMany,
|
|
JoinTable,
|
|
OneToOne,
|
|
JoinColumn,
|
|
ManyToOne,
|
|
} from 'typeorm';
|
|
import { App } from './app.entity';
|
|
import { GroupPermission } from './group_permission.entity';
|
|
const bcrypt = require('bcrypt');
|
|
import { OrganizationUser } from './organization_user.entity';
|
|
import { UserGroupPermission } from './user_group_permission.entity';
|
|
import { File } from './file.entity';
|
|
import { Organization } from './organization.entity';
|
|
|
|
@Entity({ name: 'users' })
|
|
export class User extends BaseEntity {
|
|
@BeforeInsert()
|
|
@BeforeUpdate()
|
|
hashPassword(): void {
|
|
if (this.password) {
|
|
this.password = bcrypt.hashSync(this.password, 10);
|
|
}
|
|
}
|
|
|
|
@PrimaryGeneratedColumn('uuid')
|
|
id: string;
|
|
|
|
@Column({ name: 'first_name' })
|
|
firstName: string;
|
|
|
|
@Column({ name: 'last_name' })
|
|
lastName: string;
|
|
|
|
@Column()
|
|
email: string;
|
|
|
|
@Column({ name: 'phone_number' })
|
|
phoneNumber: string;
|
|
|
|
@Column({
|
|
type: 'enum',
|
|
enumName: 'status',
|
|
name: 'status',
|
|
enum: ['invited', 'verified', 'active', 'archived'],
|
|
default: 'invited',
|
|
})
|
|
status: string;
|
|
|
|
@Column({
|
|
type: 'enum',
|
|
enumName: 'source',
|
|
name: 'source',
|
|
enum: ['signup', 'invite', 'google', 'git'],
|
|
default: 'invite',
|
|
})
|
|
source: string;
|
|
|
|
@Column({ name: 'avatar_id', nullable: true, default: null })
|
|
avatarId?: string;
|
|
|
|
@Column({ name: 'invitation_token' })
|
|
invitationToken: string;
|
|
|
|
@Column({ name: 'forgot_password_token' })
|
|
forgotPasswordToken: string;
|
|
|
|
@Column({ name: 'password_digest' })
|
|
password: string;
|
|
|
|
@Column({ name: 'organization_id' })
|
|
defaultOrganizationId: string;
|
|
|
|
@Column({ name: 'company_name' })
|
|
companyName: string;
|
|
|
|
@Column({ name: 'role' })
|
|
role: string;
|
|
|
|
@Column({ name: 'company_size' })
|
|
companySize: string;
|
|
|
|
@Column({ name: 'password_retry_count' })
|
|
passwordRetryCount: number;
|
|
|
|
@CreateDateColumn({ default: () => 'now()', name: 'created_at' })
|
|
createdAt: Date;
|
|
|
|
@UpdateDateColumn({ default: () => 'now()', name: 'updated_at' })
|
|
updatedAt: Date;
|
|
|
|
@OneToMany(() => OrganizationUser, (organizationUser) => organizationUser.user, { eager: true })
|
|
organizationUsers: OrganizationUser[];
|
|
|
|
@ManyToOne(() => Organization, (organization) => organization.id)
|
|
@JoinColumn({ name: 'organization_id' })
|
|
organization: Organization;
|
|
|
|
@JoinColumn({ name: 'avatar_id' })
|
|
@OneToOne(() => File, {
|
|
nullable: true,
|
|
})
|
|
avatar?: File;
|
|
|
|
@ManyToMany(() => GroupPermission)
|
|
@JoinTable({
|
|
name: 'user_group_permissions',
|
|
joinColumn: {
|
|
name: 'user_id',
|
|
},
|
|
inverseJoinColumn: {
|
|
name: 'group_permission_id',
|
|
},
|
|
})
|
|
groupPermissions: Promise<GroupPermission[]>;
|
|
|
|
@OneToMany(() => UserGroupPermission, (userGroupPermission) => userGroupPermission.user, { onDelete: 'CASCADE' })
|
|
userGroupPermissions: UserGroupPermission[];
|
|
|
|
@OneToMany(() => App, (app) => app.user)
|
|
apps: App[];
|
|
|
|
organizationId: string;
|
|
organizationIds?: Array<string>;
|
|
isPasswordLogin: boolean;
|
|
isSSOLogin: boolean;
|
|
sessionId: string;
|
|
}
|