-
Notifications
You must be signed in to change notification settings - Fork 32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #7424: make all of Sirepo moderated #7426
Conversation
A trial is now required to access all of Sirepo. Every new user is moderated. All existing users will be give 30 days access. After that a paid plan will be required. 30 days after this is deployed (after all non-paid users are expired) we can remove moderating for Jupyterhub. Just the moderation for Sirepo will be enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code looks good. I have a few naming comments. I haven't tested yet. I'll test when you are done with these changes
<div class="row"> | ||
<div class="col-sm-6 col-sm-offset-2"> | ||
<h1>Plan Required</h1> | ||
<p>An <span data-plans-link="" link-text="active plan"></span> is required to use Sirepo.</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is it data-plans-link=""
and not directive <data-plan-link>active plan</data-plan-link>
? I.e. why is the span necessary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you create directives that way? I don't see any examples
$ grep -ri --exclude-dir='ext' '<data-' ~/src/radiasoft/sirepo/sirepo/package_data/static/
/home/vagrant/src/radiasoft/sirepo/sirepo/package_data/static/js/sirepo-beamline.js: <data-ng-include src="::iconUrl" data-onload="iconLoaded()"/>
@@ -557,6 +564,11 @@ | |||
} | |||
}, | |||
"customErrors": { | |||
"402": { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good use of 402. That's one code I didn't have memorized.
However, I think this is for all plan, though? I think this exception is "plan-expired" and in the case of a paid plan, it will have different text.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the moderation page it should explain a bit about the reason for the moderation. If it is for require_plan, then it should be explain a bit about the reason why sirepo is moderated. On the registration page, we'll definitely want something about using institutional email, not gmail or yahoo. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did some simple tests which worked. I will test more on alpha
@robnagler ready for another review |
A trial is now required to access all of Sirepo. Every new user is moderated.
All existing users will be give 30 days access. After that a paid plan will be required.
30 days after this is deployed (after all non-paid users are expired) we can remove moderating for Jupyterhub. Just the moderation for Sirepo will be enough.