fix: remove public beta flags

This commit is contained in:
Baptiste Grob
2020-10-07 12:42:25 +02:00
parent 83bf5d7192
commit d088d74069
4 changed files with 5 additions and 21 deletions

View File

@@ -63,11 +63,8 @@ type AccountMenuState = {
server: string; server: string;
encryptionEnabled: boolean; encryptionEnabled: boolean;
selectedAutoLockInterval: any; selectedAutoLockInterval: any;
strictSigninDisabled: boolean;
} }
declare const __PUBLIC_BETA__: boolean;
class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> { class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
public appVersion: string public appVersion: string
@@ -94,7 +91,6 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
mergeLocal: true, mergeLocal: true,
ephemeral: false, ephemeral: false,
}, },
strictSigninDisabled: __PUBLIC_BETA__,
mutable: {} mutable: {}
} as AccountMenuState; } as AccountMenuState;
} }
@@ -336,14 +332,10 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
} }
showRegister() { showRegister() {
if (__PUBLIC_BETA__) {
alertDialog({ text: 'Registration is disabled for this beta version.' });
} else {
this.setFormDataState({ this.setFormDataState({
showRegister: true showRegister: true
}); });
} }
}
async readFile(file: File): Promise<any> { async readFile(file: File): Promise<any> {
return new Promise((resolve) => { return new Promise((resolve) => {

View File

@@ -28,8 +28,6 @@ import {
import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
import { confirmDialog } from '@/services/alertService'; import { confirmDialog } from '@/services/alertService';
declare const __PUBLIC_BETA__: boolean;
/** /**
* Disable before production release. * Disable before production release.
* Anyone who used the beta will still have access to * Anyone who used the beta will still have access to
@@ -141,9 +139,6 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
reloadUpgradeStatus() { reloadUpgradeStatus() {
this.application.checkForSecurityUpdate().then((available) => { this.application.checkForSecurityUpdate().then((available) => {
if (__PUBLIC_BETA__) {
return;
}
this.setState({ this.setState({
dataUpgradeAvailable: available dataUpgradeAvailable: available
}); });

View File

@@ -84,13 +84,11 @@
) )
.sk-horizontal-group.tight .sk-horizontal-group.tight
input.sk-input( input.sk-input(
ng-disabled="self.state.strictSigninDisabled"
ng-model='self.state.formData.strictSignin', ng-model='self.state.formData.strictSignin',
type='checkbox' type='checkbox'
) )
p.sk-p(ng-if="!self.state.strictSigninDisabled") Use strict sign in p.sk-p Use strict sign in
p.sk-p(ng-if="self.state.strictSigninDisabled") Strict sign is disabled for this beta version span
span(ng-if="!self.state.strictSigninDisabled")
a.info( a.info(
href='https://standardnotes.org/help/security', href='https://standardnotes.org/help/security',
rel='noopener', rel='noopener',

View File

@@ -15,7 +15,6 @@ module.exports = (env = {
__VERSION__: JSON.stringify(require('./package.json').version), __VERSION__: JSON.stringify(require('./package.json').version),
__WEB__: JSON.stringify(env.platform === 'web'), __WEB__: JSON.stringify(env.platform === 'web'),
__DESKTOP__: JSON.stringify(env.platform === 'desktop'), __DESKTOP__: JSON.stringify(env.platform === 'desktop'),
__PUBLIC_BETA__: JSON.stringify(env.public_beta === 'true'),
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output // Options similar to the same options in webpackOptions.output