Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 13:19:43 +02:00
Code Releases Activity

password changes for Documize auth provider only

Browse source
This commit is contained in:
Harvey Kandola 2017-03-21 11:57:42 +00:00
parent 0fedfb199b
commit 2c33c6443b
22 changed files with 120 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/app/components/auth-settings.js → app/app/components/customize/auth-settings.js
View file

@ -10,8 +10,8 @@
// https://documize.com
import Ember from 'ember';
import constants from '../utils/constants';
import encoding from '../utils/encoding';
import constants from '../../utils/constants';
import encoding from '../../utils/encoding';
const {
computed

0
app/app/components/general-settings.js → app/app/components/customize/general-settings.js
View file

0
app/app/components/global-settings.js → app/app/components/customize/global-settings.js
View file

3
app/app/components/settings/user-list.js → app/app/components/customize/user-list.js
View file

@ -10,8 +10,9 @@
// https://documize.com
import Ember from 'ember';
import AuthProvider from '../../mixins/auth';
export default Ember.Component.extend({
export default Ember.Component.extend(AuthProvider, {
editUser: null,
deleteUser: null,
drop: null,

3
app/app/components/user-settings.js → app/app/components/customize/user-settings.js
View file

@ -10,6 +10,7 @@
// https://documize.com
import Ember from 'ember';
import AuthProvider from '../../mixins/auth';
const {
isEmpty,
@ -18,7 +19,7 @@ const {
get
} = Ember;
export default Ember.Component.extend({
export default Ember.Component.extend(AuthProvider, {
newUser: { firstname: "", lastname: "", email: "", active: true },
firstnameEmpty: computed.empty('newUser.firstname'),
lastnameEmpty: computed.empty('newUser.lastname'),

7
app/app/components/user-profile.js
View file

@ -10,6 +10,7 @@
// https://documize.com
import Ember from 'ember';
import AuthProvider from '../mixins/auth';
const {
computed,
@ -18,7 +19,7 @@ const {
isPresent
} = Ember;
export default Ember.Component.extend({
export default Ember.Component.extend(AuthProvider, {
password: { password: "", confirmation: "" },
hasFirstnameError: computed.empty('model.firstname'),
hasLastnameError: computed.empty('model.lastname'),
@ -44,6 +45,10 @@ export default Ember.Component.extend({
}
}),
didReceiveAttrs() {
this.set
},
actions: {
save() {
let password = this.get('password.password');

25
app/app/mixins/auth.js Normal file
View file

@ -0,0 +1,25 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
//
// You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>.
//
// https://documize.com
import Ember from 'ember';
import constants from '../utils/constants';
export default Ember.Mixin.create({
appMeta: Ember.inject.service(),
isAuthProviderDocumize: true,
IsAuthProviderKeycloak: false,
init() {
this._super(...arguments);
this.set('isAuthProviderDocumize', this.get('appMeta.authProvider') === constants.AuthProvider.Documize);
this.set('isAuthProviderKeycloak', this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak);
}
});

10
app/app/pods/auth/share/route.js
View file

@ -24,5 +24,13 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
controller.set('serial', this.serial);
controller.set('slug', this.slug);
controller.set('folderId', this.folderId);
}
},
activate() {
$('body').addClass('background-color-off-white');
},
deactivate() {
$('body').removeClass('background-color-off-white');
}
});

20
app/app/pods/customize/auth/controller.js
View file

@ -11,12 +11,20 @@
import Ember from 'ember';
import NotifierMixin from "../../../mixins/notifier";
import constants from '../../../utils/constants';
export default Ember.Controller.extend(NotifierMixin, {
global: Ember.inject.service(),
appMeta: Ember.inject.service(),
session: Ember.inject.service(),
handleProviderChange(data) {
this.get('session').logout();
this.set('appMeta.authProvider', data.authProvider);
this.set('appMeta.authConfig', data.authConfig);
window.location.href= '/';
},
actions: {
onSave(provider, config) {
if(this.get('session.isGlobalAdmin')) {
@ -24,11 +32,15 @@ export default Ember.Controller.extend(NotifierMixin, {
return this.get('global').saveAuthConfig(data).then(() => {
this.showNotification('Saved');
if (provider !== this.get('appMeta.authProvider')) {
this.get('session').logout();
this.set('appMeta.authProvider', provider);
this.set('appMeta.authConfig', config);
window.location.href= '/';
if (provider === constants.AuthProvider.Keycloak) {
this.get('global').syncExternalUsers().then(() => {
this.handleProviderChange(data);
});
} else {
this.handleProviderChange(data);
}
} else {
this.set('appMeta.authProvider', provider);
this.set('appMeta.authConfig', config);

2
app/app/pods/customize/auth/template.hbs
View file

@ -1 +1 @@
{{auth-settings authProvider=model.authProvider authConfig=model.authConfig onSave=(action 'onSave') onSync=(action 'onSync')}}
{{customize/auth-settings authProvider=model.authProvider authConfig=model.authConfig onSave=(action 'onSave') onSync=(action 'onSync')}}

2
app/app/pods/customize/general/template.hbs
View file

@ -1 +1 @@
{{general-settings model=model save=(action 'save')}}
{{customize/general-settings model=model save=(action 'save')}}

2
app/app/pods/customize/global/template.hbs
View file

@ -1 +1 @@
{{global-settings model=model saveSMTP=(action 'saveSMTP') saveLicense=(action 'saveLicense')}}
{{customize/global-settings model=model saveSMTP=(action 'saveSMTP') saveLicense=(action 'saveLicense')}}

4
app/app/pods/customize/users/template.hbs
View file

@ -1,5 +1,5 @@
{{user-settings add=(action 'add')}}
{{customize/user-settings add=(action 'add')}}
<div class="clearfix" />
{{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}}
{{customize/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}}

3
app/app/styles/view/page-onboard.scss
View file

@ -1,5 +1,4 @@
.onboarding-container
{
.onboarding-container {
width: 100%;
text-align: left;
color: $color-off-black;

0
app/app/templates/components/auth-settings.hbs → app/app/templates/components/customize/auth-settings.hbs
View file

0
app/app/templates/components/general-settings.hbs → app/app/templates/components/customize/general-settings.hbs
View file

0
app/app/templates/components/global-settings.hbs → app/app/templates/components/customize/global-settings.hbs
View file

30
app/app/templates/components/settings/user-list.hbs → app/app/templates/components/customize/user-list.hbs
View file

@ -91,22 +91,24 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="input-control">
<label>Password</label>
<div class="tip">Optional new password</div>
{{input id="edit-password" type="password" value=password.password}}
{{#if isAuthProviderDocumize}}
<div class="row">
<div class="col-md-6">
<div class="input-control">
<label>Password</label>
<div class="tip">Optional new password</div>
{{input id="edit-password" type="password" value=password.password}}
</div>
</div>
<div class="col-md-6">
<div class="input-control">
<label>Confirm Password</label>
<div class="tip">Confirm new password</div>
{{input id="edit-confirmPassword" type="password" value=password.confirmation}}
</div>
</div>
</div>
<div class="col-md-6">
<div class="input-control">
<label>Confirm Password</label>
<div class="tip">Confirm new password</div>
{{input id="edit-confirmPassword" type="password" value=password.confirmation}}
</div>
</div>
</div>
{{/if}}
</form>
</div>
<div class="actions">

21
app/app/templates/components/customize/user-settings.hbs Normal file
View file

@ -0,0 +1,21 @@
{{#if isAuthProviderDocumize}}
<form class="form-bordered">
<div class="form-header">
<div class="title">Add user</div>
<div class="tip">New users receive an invitation email with a random password</div>
</div>
<div class="input-control">
<label>Firstname</label>
{{focus-input id="newUserFirstname" type="text" value=newUser.firstname class=(if hasFirstnameEmptyError 'error')}}
</div>
<div class="input-control">
<label>Lastname</label>
{{input id="newUserLastname" type="text" value=newUser.lastname class=(if hasLastnameEmptyError 'error')}}
</div>
<div class="input-control">
<label>Email</label>
{{input id="newUserEmail" type="text" value=newUser.email class=(if hasEmailEmptyError 'error')}}
</div>
<div class="regular-button button-blue" {{ action 'add' }}>Add</div>
</form>
{{/if}}

7
app/app/templates/components/onboard/share-folder.hbs
View file

@ -4,7 +4,6 @@
<img class="logo" src="/assets/img/logo-color.png"/>
<div class="stage-1">
<h2>Documize Sign-up</h2>
<p>Let's set up your account</p>
<div class="input-control">
<label>Firstname</label>
@ -13,11 +12,11 @@
</div>
<div class="input-control">
<label>Lastname</label>
<div class="tip">To customize the app for you</div>
<div class="tip">What the government calls you</div>
<input id="stage-1-lastname" type="text" value="" />
</div>
<div class="input-control">
<div id="stage-1-next" class="regular-button button-green">Next &rsaquo;</div>
<div id="stage-1-next" class="regular-button button-green">Next &rarr;</div>
</div>
</div>
@ -34,7 +33,7 @@
<input id="stage-2-password-confirm" type="password" value="" />
</div>
<div class="input-control">
<div id="stage-2-next" class="regular-button button-green">Sign In &rsaquo;</div>
<div id="stage-2-next" class="regular-button button-green">Sign In &rarr;</div>
</div>
</div>

22
app/app/templates/components/user-profile.hbs
View file

@ -15,15 +15,17 @@
<label>Email</label>
{{input id="email" type="text" value=model.email class=(if hasEmailError 'error')}}
</div>
<div class="input-control">
<label>Password</label>
<div class="tip">Optional change your password</div>
{{input id="password" type="password" value=password.password class=hasPasswordError}}
</div>
<div class="input-control">
<label>Confirm Password</label>
<div class="tip">Confirm your new password</div>
{{input id="confirmPassword" type="password" value=password.confirmation class=hasConfirmPasswordError}}
</div>
{{#if isAuthProviderDocumize}}
<div class="input-control">
<label>Password</label>
<div class="tip">Optional change your password</div>
{{input id="password" type="password" value=password.password class=hasPasswordError}}
</div>
<div class="input-control">
<label>Confirm Password</label>
<div class="tip">Confirm your new password</div>
{{input id="confirmPassword" type="password" value=password.confirmation class=hasConfirmPasswordError}}
</div>
{{/if}}
<div class="regular-button button-blue" {{ action 'save' }}>save</div>
</div>

19
app/app/templates/components/user-settings.hbs
View file

@ -1,19 +0,0 @@
<form class="form-bordered">
<div class="form-header">
<div class="title">Add user</div>
<div class="tip">New users receive an invitation email with a random password</div>
</div>
<div class="input-control">
<label>Firstname</label>
{{focus-input id="newUserFirstname" type="text" value=newUser.firstname class=(if hasFirstnameEmptyError 'error')}}
</div>
<div class="input-control">
<label>Lastname</label>
{{input id="newUserLastname" type="text" value=newUser.lastname class=(if hasLastnameEmptyError 'error')}}
</div>
<div class="input-control">
<label>Email</label>
{{input id="newUserEmail" type="text" value=newUser.email class=(if hasEmailEmptyError 'error')}}
</div>
<div class="regular-button button-blue" {{ action 'add' }}>Add</div>
</form>