diff --git a/dashboard/gulpfile.js b/dashboard/gulpfile.js index 8e55f5520..37addba4b 100644 --- a/dashboard/gulpfile.js +++ b/dashboard/gulpfile.js @@ -142,15 +142,6 @@ gulp.task('js-terminal', function () { .pipe(gulp.dest('dist/js')); }); -gulp.task('js-login', function () { - return gulp.src(['src/js/login.js', 'src/js/utils.js']) - .pipe(ejs({ apiOrigin: apiOrigin, revision: revision, appstore: appstore }, {}, { ext: '.js' })) - .pipe(sourcemaps.init()) - .pipe(concat('login.js', { newLine: ';' })) - .pipe(sourcemaps.write()) - .pipe(gulp.dest('dist/js')); -}); - gulp.task('js-passwordreset', function () { return gulp.src(['src/js/passwordreset.js', 'src/js/utils.js']) .pipe(ejs({ apiOrigin: apiOrigin, revision: revision, appstore: appstore }, {}, { ext: '.js' })) @@ -196,7 +187,7 @@ gulp.task('js-restore', function () { .pipe(gulp.dest('dist/js')); }); -gulp.task('js', gulp.series([ 'js-index', 'js-logs', 'js-filemanager', 'js-terminal', 'js-login', 'js-passwordreset', 'js-setupaccount', 'js-setup', 'js-setupdns', 'js-restore' ])); +gulp.task('js', gulp.series([ 'js-index', 'js-logs', 'js-filemanager', 'js-terminal', 'js-passwordreset', 'js-setupaccount', 'js-setup', 'js-setupdns', 'js-restore' ])); // -------------- // HTML @@ -274,7 +265,6 @@ gulp.task('watch', function (done) { gulp.watch(['src/js/logs.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-logs'])); gulp.watch(['src/js/filemanager.js', 'src/js/client.js', 'src/js/utils.js', 'src/components/*.js'], gulp.series(['js-filemanager'])); gulp.watch(['src/js/terminal.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-terminal'])); - gulp.watch(['src/js/login.js', 'src/js/utils.js'], gulp.series(['js-login'])); gulp.watch(['src/js/passwordreset.js', 'src/js/utils.js'], gulp.series(['js-passwordreset'])); gulp.watch(['src/js/setupaccount.js', 'src/js/utils.js'], gulp.series(['js-setupaccount'])); gulp.watch(['src/js/index.js', 'src/js/client.js', 'src/js/main.js', 'src/views/*.js', 'src/js/utils.js'], gulp.series(['js-index'])); diff --git a/dashboard/src/js/login.js b/dashboard/src/js/login.js deleted file mode 100644 index 0d653048a..000000000 --- a/dashboard/src/js/login.js +++ /dev/null @@ -1,210 +0,0 @@ -'use strict'; - -/* global angular, $, showdown */ - -// create main application module -var app = angular.module('Application', ['pascalprecht.translate', 'ngCookies']); - -app.filter('markdown2html', function () { - var converter = new showdown.Converter({ - simplifiedAutoLink: true, - strikethrough: true, - tables: true, - openLinksInNewWindow: true - }); - - return function (text) { - return converter.makeHtml(text); - }; -}); - -// disable sce for footer https://code.angularjs.org/1.5.8/docs/api/ng/service/$sce -app.config(function ($sceProvider) { - $sceProvider.enabled(false); -}); - -app.config(['$translateProvider', function ($translateProvider) { - $translateProvider.useStaticFilesLoader({ - prefix: 'translation/', - suffix: '.json' - }); - $translateProvider.preferredLanguage('en'); - $translateProvider.fallbackLanguage('en'); -}]); - -// Add shorthand "tr" filter to avoid having ot use "translate" -// This is a copy of the code at https://github.com/angular-translate/angular-translate/blob/master/src/filter/translate.js -// If we find out how to get that function handle somehow dynamically we can use that, otherwise the copy is required -function translateFilterFactory($parse, $translate) { - var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) { - if (!angular.isObject(interpolateParams)) { - var ctx = this || { - '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f' - }; - interpolateParams = $parse(interpolateParams)(ctx); - } - - return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage); - }; - - if ($translate.statefulFilter()) { - translateFilter.$stateful = true; - } - - return translateFilter; -} -translateFilterFactory.displayName = 'translateFilterFactory'; -app.filter('tr', translateFilterFactory); - - -app.controller('LoginController', ['$scope', '$translate', '$http', function ($scope, $translate, $http) { - // Stupid angular location provider either wants html5 location mode or not, do the query parsing on my own - var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.indexOf('=') === -1 ? [item, true] : [item.slice(0, item.indexOf('=')), item.slice(item.indexOf('=')+1)]; }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {}); - - $scope.initialized = false; - $scope.mode = ''; - $scope.busy = false; - $scope.error = false; - $scope.status = null; - $scope.username = ''; - $scope.password = ''; - $scope.totpToken = ''; - $scope.passwordResetIdentifier = ''; - $scope.newPassword = ''; - $scope.newPasswordRepeat = ''; - var API_ORIGIN = '<%= apiOrigin %>' || window.location.origin; - - $scope.onLogin = function () { - $scope.busy = true; - $scope.error = false; - - var data = { - username: $scope.username, - password: $scope.password, - totpToken: $scope.totpToken - }; - - function error(data, status) { - $scope.busy = false; - $scope.error = {}; - - if (!data || status !== 401) return $scope.error.internal = true; - - if (data.message === 'Username and password does not match') { - $scope.error.password = true; - $scope.password = ''; - setTimeout(function () { $('#inputPassword').focus(); }, 200); - } else if (data.message.indexOf('totpToken') !== -1) { - $scope.error.totpToken = true; - $scope.totpToken = ''; - setTimeout(function () { $('#inputTotpToken').focus(); }, 200); - } else { - $scope.error.generic = true; - } - - $scope.loginForm.$setPristine(); - } - - $http.post(API_ORIGIN + '/api/v1/cloudron/login', data).success(function (data, status) { - if (status !== 200) return error(data, status); - - localStorage.token = data.accessToken; - - // prevent redirecting to random domains - var returnTo = search.returnTo || '/'; - if (returnTo.indexOf('/') !== 0) returnTo = '/'; - - window.location.href = returnTo; - }).error(error); - }; - - $scope.onPasswordReset = function () { - $scope.busy = true; - - var data = { - identifier: $scope.passwordResetIdentifier - }; - - function done() { - $scope.busy = false; - $scope.mode = 'passwordResetDone'; - } - - $http.post(API_ORIGIN + '/api/v1/cloudron/password_reset_request', data).success(done).error(done); - }; - - $scope.onNewPassword = function () { - $scope.busy = true; - - var data = { - resetToken: search.resetToken, - password: $scope.newPassword, - totpToken: $scope.totpToken - }; - - function error(data, status) { - console.log('error', status); - $scope.busy = false; - - if (status === 401) $scope.error = data.message; - else if (status === 409) $scope.error = 'Ask your admin for an invite link first'; - else $scope.error = 'Unknown error'; - } - - $http.post(API_ORIGIN + '/api/v1/cloudron/password_reset', data).success(function (data, status) { - if (status !== 202) return error(data, status); - - // set token to autologin - localStorage.token = data.accessToken; - - $scope.mode = 'newPasswordDone'; - }).error(function (data, status) { - error(data, status); - }); - }; - - $scope.showPasswordReset = function () { - window.document.title = 'Password Reset Request'; - $scope.mode = 'passwordReset'; - $scope.passwordResetIdentifier = ''; - setTimeout(function () { $('#inputPasswordResetIdentifier').focus(); }, 200); - }; - - $scope.showLogin = function () { - if ($scope.status) window.document.title = $scope.status.cloudronName + ' Login'; - $scope.mode = 'login'; - $scope.error = false; - setTimeout(function () { $('#inputUsername').focus(); }, 200); - }; - - $scope.showNewPassword = function () { - window.document.title = 'Set New Password'; - $scope.mode = 'newPassword'; - setTimeout(function () { $('#inputNewPassword').focus(); }, 200); - }; - - $http.get(API_ORIGIN + '/api/v1/cloudron/status').success(function (data, status) { - $scope.initialized = true; - - if (status !== 200) return; - - if (data.language) $translate.use(data.language); - - if ($scope.mode === 'login') window.document.title = data.cloudronName + ' Login'; - $scope.status = data; - }).error(function () { - $scope.initialized = false; - }); - - // Init into the correct view - if (search.passwordReset) { - $scope.showPasswordReset(); - } else if (search.resetToken) { - $scope.showNewPassword(); - } else if (search.accessToken || search.access_token) { // auto-login feature - localStorage.token = search.accessToken || search.access_token; - window.location.href = '/'; - } else { - $scope.showLogin(); - } -}]); diff --git a/dashboard/src/login.html b/dashboard/src/login.html deleted file mode 100644 index fd0c6548d..000000000 --- a/dashboard/src/login.html +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - Cloudron Login - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
- -
-

{{ 'login.loginTo' | tr }} {{ status.cloudronName || 'Cloudron' }}

-
-
-
-
-
-

{{ 'login.errorIncorrectCredentials' | tr }}

-

{{ 'login.errorIncorrect2FAToken' | tr }}

-

{{ 'login.errorInternal' | tr }}

-
-
-
-
-
-
- - -
-
- - -
-
- - -
- -
- {{ 'login.resetPasswordAction' | tr }} -
-
-
-
- -
-
-
-
- -
-

{{ 'passwordReset.title' | tr }}

-
-
-
-
-
-
-
- - -
-
- -
- {{ 'passwordReset.backToLoginAction' | tr }} -
-
-
-
- -
-
-
-
- -
-

{{ 'passwordReset.emailSent.title' | tr }}

-
- -
-
-
-
- -
-
-
-
- -
-

{{ 'passwordReset.newPassword.title' | tr }}

-
-
-
-
-
-

{{ error }}

-
-
-
-
-
-
- -
- -
- {{ 'passwordReset.newPassword.errorLength' | tr }} -
- -
-
- -
- {{ 'passwordReset.newPassword.errorMismatch' | tr }} -
- -
-
- - -
-
- -
- {{ 'passwordReset.backToLoginAction' | tr }} -
-
-
-
- -
-
-
-
- -
-

{{ 'passwordReset.success.title' | tr }}

-
- {{ 'passwordReset.success.openDashboardAction' | tr }} -
-
-
-
- - - -
- - - -