Clean up forms a bit and move auth forms to .auth
This commit is contained in:
parent
1a289cb5c7
commit
768006ffbe
|
|
@ -15,7 +15,7 @@ from flask_login import (
|
|||
LoginManager)
|
||||
|
||||
from amanuensis.config import RootConfigDirectoryContext
|
||||
from amanuensis.server.forms import LoginForm
|
||||
from amanuensis.server.auth.forms import LoginForm
|
||||
from amanuensis.models import ModelFactory, AnonymousUserModel
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
from flask_wtf import FlaskForm
|
||||
from wtforms import StringField, PasswordField, BooleanField, SubmitField
|
||||
from wtforms.validators import DataRequired
|
||||
|
||||
from amanuensis.server.forms import User
|
||||
|
||||
|
||||
class LoginForm(FlaskForm):
|
||||
"""/auth/login/"""
|
||||
username = StringField(
|
||||
'Username',
|
||||
validators=[DataRequired(), User()])
|
||||
password = PasswordField(
|
||||
'Password',
|
||||
validators=[DataRequired()])
|
||||
remember = BooleanField('Stay logged in')
|
||||
submit = SubmitField('Log in')
|
||||
|
|
@ -6,139 +6,128 @@ from wtforms import (
|
|||
from wtforms.validators import DataRequired, ValidationError, Optional
|
||||
from wtforms.widgets.html5 import NumberInput
|
||||
|
||||
# from amanuensis.config import root
|
||||
# from amanuensis.lexicon.manage import add_character
|
||||
# from amanuensis.user import UserModel
|
||||
from amanuensis.config import RootConfigDirectoryContext
|
||||
from amanuensis.lexicon import create_character_in_lexicon
|
||||
|
||||
|
||||
# Custom validators
|
||||
def user(exists=True):
|
||||
template = 'User "{{}}" {}'.format(
|
||||
"not found" if exists else "already exists")
|
||||
should_exist = bool(exists)
|
||||
def User(should_exist: bool = True):
|
||||
template: str = 'User "{{}}" {}'.format(
|
||||
"not found" if should_exist else "already exists")
|
||||
should_exist_copy: bool = bool(should_exist)
|
||||
|
||||
def validate_user(form, field):
|
||||
root: RootConfigDirectoryContext = current_app.config['root']
|
||||
with root.user.read_index() as index:
|
||||
if (field.data in index.keys()) != should_exist:
|
||||
if (field.data in index.keys()) != should_exist_copy:
|
||||
raise ValidationError(template.format(field.data))
|
||||
|
||||
return validate_user
|
||||
|
||||
|
||||
def lexicon(exists=True):
|
||||
template = 'Lexicon "{{}}" {}'.format(
|
||||
"not found" if exists else "already exists")
|
||||
should_exist = bool(exists)
|
||||
def Lexicon(should_exist: bool = True):
|
||||
template: str = 'Lexicon "{{}}" {}'.format(
|
||||
"not found" if should_exist else "already exists")
|
||||
should_exist_copy: bool = bool(should_exist)
|
||||
|
||||
def validate_lexicon(form, field):
|
||||
root: RootConfigDirectoryContext = current_app.config['root']
|
||||
with root.lexicon.read_index() as index:
|
||||
if (field.data in index.keys()) != should_exist:
|
||||
if (field.data in index.keys()) != should_exist_copy:
|
||||
raise ValidationError(template.format(field.data))
|
||||
|
||||
return validate_lexicon
|
||||
|
||||
|
||||
# Forms
|
||||
class LoginForm(FlaskForm):
|
||||
"""/auth/login/"""
|
||||
username = StringField('Username',
|
||||
validators=[DataRequired(), user(exists=True)])
|
||||
password = PasswordField('Password', validators=[DataRequired()])
|
||||
remember = BooleanField('Stay logged in')
|
||||
submit = SubmitField('Log in')
|
||||
|
||||
|
||||
class LexiconCreateForm(FlaskForm):
|
||||
"""/admin/create/"""
|
||||
lexiconName = StringField(
|
||||
'Lexicon name',
|
||||
validators=[DataRequired(), lexicon(exists=False)])
|
||||
validators=[DataRequired(), Lexicon(should_exist=False)])
|
||||
editorName = StringField(
|
||||
'Username of editor',
|
||||
validators=[DataRequired(), user(exists=True)])
|
||||
promptText = TextAreaField("Prompt")
|
||||
validators=[DataRequired(), User(should_exist=True)])
|
||||
promptText = TextAreaField('Prompt')
|
||||
submit = SubmitField('Create')
|
||||
|
||||
|
||||
# class LexiconConfigForm(FlaskForm):
|
||||
# """/lexicon/<name>/session/settings/"""
|
||||
# # General
|
||||
# title = StringField('Title override', validators=[Optional()])
|
||||
# editor = SelectField('Editor', validators=[DataRequired(), user(exists=True)])
|
||||
# prompt = TextAreaField('Prompt', validators=[DataRequired()])
|
||||
# # Turn
|
||||
# turnCurrent = IntegerField('Current turn', widget=NumberInput(), validators=[Optional()])
|
||||
# turnMax = IntegerField('Number of turns', widget=NumberInput(), validators=[DataRequired()])
|
||||
# # Join
|
||||
# joinPublic = BooleanField("Show game on public pages")
|
||||
# joinOpen = BooleanField("Allow players to join game")
|
||||
# joinPassword = StringField("Password to join game", validators=[Optional()])
|
||||
# joinMaxPlayers = IntegerField(
|
||||
# "Maximum number of players",
|
||||
# widget=NumberInput(),
|
||||
# validators=[DataRequired()])
|
||||
# joinCharsPerPlayer = IntegerField(
|
||||
# "Characters per player",
|
||||
# widget=NumberInput(),
|
||||
# validators=[DataRequired()])
|
||||
# # Publish
|
||||
# publishNotifyEditorOnReady = BooleanField(
|
||||
# "Notify the editor when a player marks an article as ready")
|
||||
# publishNotifyPlayerOnReject = BooleanField(
|
||||
# "Notify a player when their article is rejected by the editor")
|
||||
# publishNotifyPlayerOnAccept = BooleanField(
|
||||
# "Notify a player when their article is accepted by the editor")
|
||||
# publishDeadlines = StringField(
|
||||
# "Turn deadline, as a crontab specification", validators=[Optional()])
|
||||
# publishAsap = BooleanField(
|
||||
# "Publish the turn immediately when the last article is accepted")
|
||||
# publishQuorum = IntegerField(
|
||||
# "Quorum to publish incomplete turn", widget=NumberInput(), validators=[Optional()])
|
||||
# publishBlockOnReady = BooleanField(
|
||||
# "Block turn publish if any articles are awaiting editor review")
|
||||
# # Article
|
||||
# articleIndexList = TextAreaField("Index specifications")
|
||||
# articleIndexCapacity = IntegerField(
|
||||
# "Index capacity override", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationAllowSelf = BooleanField(
|
||||
# "Allow players to cite themselves")
|
||||
# articleCitationMinExtant = IntegerField(
|
||||
# "Minimum number of extant articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMaxExtant = IntegerField(
|
||||
# "Maximum number of extant articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMinPhantom = IntegerField(
|
||||
# "Minimum number of phantom articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMaxPhantom = IntegerField(
|
||||
# "Maximum number of phantom articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMinTotal = IntegerField(
|
||||
# "Minimum number of articles to cite in total", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMaxTotal = IntegerField(
|
||||
# "Maximum number of articles to cite in total", widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMinChars = IntegerField(
|
||||
# "Minimum number of characters to cite articles by",
|
||||
# widget=NumberInput(), validators=[Optional()])
|
||||
# articleCitationMaxChars = IntegerField(
|
||||
# "Maximum number of characters to cite articles by",
|
||||
# widget=NumberInput(), validators=[Optional()])
|
||||
# articleWordLimitSoft = IntegerField(
|
||||
# "Soft word limit", widget=NumberInput(), validators=[Optional()])
|
||||
# articleWordLimitHard = IntegerField(
|
||||
# "Hard word limit", widget=NumberInput(), validators=[Optional()])
|
||||
# articleAddendumAllowed = BooleanField("Allow addendum articles")
|
||||
# articleAddendumMax = IntegerField(
|
||||
# "Maximum number of addendum articles per character per turn",
|
||||
# widget=NumberInput(), validators=[Optional()])
|
||||
# # And finally, the submit button
|
||||
# submit = SubmitField("Submit")
|
||||
class LexiconConfigForm(FlaskForm):
|
||||
"""/lexicon/<name>/session/settings/"""
|
||||
# General
|
||||
title = StringField('Title override', validators=[Optional()])
|
||||
editor = SelectField('Editor', validators=[DataRequired(), User(True)])
|
||||
prompt = TextAreaField('Prompt', validators=[DataRequired()])
|
||||
# Turn
|
||||
turnCurrent = IntegerField('Current turn', widget=NumberInput(), validators=[Optional()])
|
||||
turnMax = IntegerField('Number of turns', widget=NumberInput(), validators=[DataRequired()])
|
||||
# Join
|
||||
joinPublic = BooleanField("Show game on public pages")
|
||||
joinOpen = BooleanField("Allow players to join game")
|
||||
joinPassword = StringField("Password to join game", validators=[Optional()])
|
||||
joinMaxPlayers = IntegerField(
|
||||
"Maximum number of players",
|
||||
widget=NumberInput(),
|
||||
validators=[DataRequired()])
|
||||
joinCharsPerPlayer = IntegerField(
|
||||
"Characters per player",
|
||||
widget=NumberInput(),
|
||||
validators=[DataRequired()])
|
||||
# Publish
|
||||
publishNotifyEditorOnReady = BooleanField(
|
||||
"Notify the editor when a player marks an article as ready")
|
||||
publishNotifyPlayerOnReject = BooleanField(
|
||||
"Notify a player when their article is rejected by the editor")
|
||||
publishNotifyPlayerOnAccept = BooleanField(
|
||||
"Notify a player when their article is accepted by the editor")
|
||||
publishDeadlines = StringField(
|
||||
"Turn deadline, as a crontab specification", validators=[Optional()])
|
||||
publishAsap = BooleanField(
|
||||
"Publish the turn immediately when the last article is accepted")
|
||||
publishQuorum = IntegerField(
|
||||
"Quorum to publish incomplete turn", widget=NumberInput(), validators=[Optional()])
|
||||
publishBlockOnReady = BooleanField(
|
||||
"Block turn publish if any articles are awaiting editor review")
|
||||
# Article
|
||||
articleIndexList = TextAreaField("Index specifications")
|
||||
articleIndexCapacity = IntegerField(
|
||||
"Index capacity override", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationAllowSelf = BooleanField(
|
||||
"Allow players to cite themselves")
|
||||
articleCitationMinExtant = IntegerField(
|
||||
"Minimum number of extant articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMaxExtant = IntegerField(
|
||||
"Maximum number of extant articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMinPhantom = IntegerField(
|
||||
"Minimum number of phantom articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMaxPhantom = IntegerField(
|
||||
"Maximum number of phantom articles to cite", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMinTotal = IntegerField(
|
||||
"Minimum number of articles to cite in total", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMaxTotal = IntegerField(
|
||||
"Maximum number of articles to cite in total", widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMinChars = IntegerField(
|
||||
"Minimum number of characters to cite articles by",
|
||||
widget=NumberInput(), validators=[Optional()])
|
||||
articleCitationMaxChars = IntegerField(
|
||||
"Maximum number of characters to cite articles by",
|
||||
widget=NumberInput(), validators=[Optional()])
|
||||
articleWordLimitSoft = IntegerField(
|
||||
"Soft word limit", widget=NumberInput(), validators=[Optional()])
|
||||
articleWordLimitHard = IntegerField(
|
||||
"Hard word limit", widget=NumberInput(), validators=[Optional()])
|
||||
articleAddendumAllowed = BooleanField("Allow addendum articles")
|
||||
articleAddendumMax = IntegerField(
|
||||
"Maximum number of addendum articles per character per turn",
|
||||
widget=NumberInput(), validators=[Optional()])
|
||||
# And finally, the submit button
|
||||
submit = SubmitField("Submit")
|
||||
|
||||
# def validate_publishDeadlines(form, field):
|
||||
# if form.publishAsap.data:
|
||||
# raise ValidationError('Cannot specify deadline if immediate publishing is enabled')
|
||||
def validate_publishDeadlines(form, field):
|
||||
if form.publishAsap.data:
|
||||
raise ValidationError('Cannot specify deadline if immediate publishing is enabled')
|
||||
|
||||
# # TODO add validators that call into extant valid check methods
|
||||
# TODO add validators that call into extant valid check methods
|
||||
|
||||
# def set_options(self, lexicon):
|
||||
# self.editor.choices = list(map(lambda x: (x, x), map(
|
||||
|
|
@ -146,8 +135,8 @@ class LexiconCreateForm(FlaskForm):
|
|||
# lexicon.join.joined)))
|
||||
|
||||
# def populate_from_lexicon(self, lexicon):
|
||||
# self.title.data = lexicon.title
|
||||
# self.editor.data = UserModel.by(uid=lexicon.editor).username
|
||||
# self.title.data = lexicon.cfg.title
|
||||
# self.editor.data = ModelFactory(lexicon.ctx.root).user(lexicon.cfg.editor).cfg.username
|
||||
# self.prompt.data = lexicon.prompt
|
||||
# self.turnCurrent.data = lexicon.turn.current
|
||||
# self.turnMax.data = lexicon.turn.max
|
||||
|
|
@ -219,43 +208,50 @@ class LexiconCreateForm(FlaskForm):
|
|||
class LexiconJoinForm(FlaskForm):
|
||||
"""/lexicon/<name>/join/"""
|
||||
password = StringField('Password')
|
||||
submit = SubmitField("Submit")
|
||||
submit = SubmitField('Submit')
|
||||
|
||||
|
||||
# class LexiconCharacterForm(FlaskForm):
|
||||
# """/lexicon/<name>/session/character/"""
|
||||
# characterName = StringField("Character name", validators=[DataRequired()])
|
||||
# defaultSignature = TextAreaField("Default signature")
|
||||
# submit = SubmitField("Submit")
|
||||
class LexiconCharacterForm(FlaskForm):
|
||||
"""/lexicon/<name>/session/character/"""
|
||||
characterName = StringField(
|
||||
'Character name',
|
||||
validators=[DataRequired()])
|
||||
defaultSignature = TextAreaField('Default signature')
|
||||
submit = SubmitField('Submit')
|
||||
|
||||
# def for_new(self):
|
||||
# self.characterName.data = ""
|
||||
# self.defaultSignature.data = "~"
|
||||
def for_new(self):
|
||||
self.characterName.data = ""
|
||||
self.defaultSignature.data = "~"
|
||||
|
||||
# def for_character(self, lexicon, cid):
|
||||
# char = lexicon.character.get(cid)
|
||||
# self.characterName.data = char.name
|
||||
# self.defaultSignature.data = char.signature
|
||||
def for_character(self, lexicon, cid):
|
||||
char = lexicon.cfg.character.get(cid)
|
||||
self.characterName.data = char.name
|
||||
self.defaultSignature.data = char.signature
|
||||
|
||||
# def add_character(self, lexicon, user):
|
||||
def add_character(self, lexicon, user):
|
||||
create_character_in_lexicon(user, lexicon, self.characterName.data)
|
||||
# add_character(lexicon, user, {
|
||||
# 'name': self.characterName.data,
|
||||
# 'signature': self.defaultSignature.data,
|
||||
# })
|
||||
|
||||
# def update_character(self, lexicon, cid):
|
||||
# with lexicon.edit() as l:
|
||||
# char = l.character.get(cid)
|
||||
# char.name = self.characterName.data
|
||||
# char.signature = self.defaultSignature.data
|
||||
def update_character(self, lexicon, cid):
|
||||
with lexicon.ctx.edit_config() as cfg:
|
||||
char = cfg.character.get(cid)
|
||||
char.name = self.characterName.data
|
||||
char.signature = self.defaultSignature.data
|
||||
|
||||
|
||||
# class LexiconReviewForm(FlaskForm):
|
||||
# """/lexicon/<name>/session/review/"""
|
||||
# approved = RadioField("Buttons", choices=(("Y", "Approved"), ("N", "Rejected")))
|
||||
# submit = SubmitField("Submit")
|
||||
class LexiconReviewForm(FlaskForm):
|
||||
"""/lexicon/<name>/session/review/"""
|
||||
APPROVED = 'Y'
|
||||
REJECTED = 'N'
|
||||
approved = RadioField(
|
||||
'Buttons',
|
||||
choices=((APPROVED, 'Approved'), (REJECTED, 'Rejected')))
|
||||
submit = SubmitField("Submit")
|
||||
|
||||
|
||||
# class LexiconPublishTurnForm(FlaskForm):
|
||||
# """/lexicon/<name>/session/"""
|
||||
# submit = SubmitField("Publish turn")
|
||||
class LexiconPublishTurnForm(FlaskForm):
|
||||
"""/lexicon/<name>/session/"""
|
||||
submit = SubmitField('Publish turn')
|
||||
|
|
|
|||
Loading…
Reference in New Issue