Merge alpha 0.0.5 to master #54

Merged
niggl merged 292 commits from dev into main 2020-12-23 17:05:35 +00:00
2 changed files with 10 additions and 0 deletions
Showing only changes of commit 445e96dcdf - Show all commits

View File

@ -36,4 +36,11 @@ export class Permission {
*/ */
@Column({ type: 'varchar' }) @Column({ type: 'varchar' })
action: PermissionAction; action: PermissionAction;
/**
* Turn this into a string for exporting (and jwts).
*/
public toString(): string {
return this.target + ":" + this.action;
}
} }

View File

@ -129,6 +129,9 @@ export class User extends Principal {
return final_permissions return final_permissions
} }
/**
* Turn this into a response.
*/
public toResponse(): ResponsePrincipal { public toResponse(): ResponsePrincipal {
return new ResponseUser(this); return new ResponseUser(this);
} }