rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ldap component issues 

show github info on edit

google oauth inputs
This commit is contained in:
Nancy Butler 2021-03-01 10:55:16 -07:00
parent 9a9c551eb2
commit 85609db2b9
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/product/auth.js
View File

@ -35,6 +35,7 @@ export function init(store) {
name: 'config', name: 'config',
weight: 100, weight: 100,
route: { name: 'c-cluster-auth-config' }, route: { name: 'c-cluster-auth-config' },
ifHaveType: MANAGEMENT.AUTH_CONFIG
}); });
spoofedType({ spoofedType({

2
edit/auth/github.vue
View File

@ -194,7 +194,7 @@ export default {
</div> </div>
</div> </div>
<InfoBox v-if="!model.enabled" class="mt-20 mb-20 p-10"> <InfoBox class="mt-20 mb-20 p-10">
<ul v-html="t(`authConfig.${NAME}.form.prefix`, tArgs, true)" /> <ul v-html="t(`authConfig.${NAME}.form.prefix`, tArgs, true)" />
<ul> <ul>
<li> <li>

7
edit/auth/ldap/config.vue
View File

@ -74,7 +74,8 @@ export default {
this.value.port = newDefault; this.value.port = newDefault;
} }
} }
} },
}; };
</script> </script>
@ -90,9 +91,11 @@ export default {
:value="model.port" :value="model.port"
type="number" type="number"
required required
:min="0"
:step="1"
:mode="mode" :mode="mode"
:label="t('authConfig.ldap.port')" :label="t('authConfig.ldap.port')"
@input="e=>model.port = e.replace(/[^0-9]/g, '')" @input="e=>$set(model, 'port', e.replace(/[^0-9]*/g, ''))"
/> />
</div> </div>

6
mixins/auth-config.js
View File

@ -231,7 +231,7 @@ export default {
set(this.model, 'accessMode', 'unrestricted'); set(this.model, 'accessMode', 'unrestricted');
set(this.model, 'starttls', false); set(this.model, 'starttls', false);
if (this.model.id === 'activedirectory') { if (this.model.id === 'activedirectory') {
set(this.model, 'disabledStatusBitmask', 1); set(this.model, 'disabledStatusBitmask', 2);
} else { } else {
set(this.model, 'disabledStatusBitmask', 0); set(this.model, 'disabledStatusBitmask', 0);
} }
@ -241,10 +241,10 @@ export default {
const { oauthCredential, serviceAccountCredential } = this.originalValue; const { oauthCredential, serviceAccountCredential } = this.originalValue;
if (!this.model.oauthCredential) { if (!this.model.oauthCredential) {
this.model.oauthCredential = oauthCredential; set(this.model, 'oauthCredential', oauthCredential);
} }
if (!this.model.serviceAccountCredential) { if (!this.model.serviceAccountCredential) {
this.model.serviceAccountCredential = serviceAccountCredential; set(this.model, 'serviceAccountCredential', serviceAccountCredential);
} }
} }
break; break;