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

fix base64 url-safe and add nestedGroup to google auth view

This commit is contained in:
Nancy Butler 2021-04-14 06:53:03 -07:00
parent 5ab89982ee
commit fcd55c6c03
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edit/auth/googleoauth.vue
View File

@ -104,6 +104,8 @@ export default {
<template slot="rows"> <template slot="rows">
<tr><td>{{ t(`authConfig.${NAME}.adminEmail`) }}: </td><td>{{ model.adminEmail }}</td></tr> <tr><td>{{ t(`authConfig.${NAME}.adminEmail`) }}: </td><td>{{ model.adminEmail }}</td></tr>
<tr><td>{{ t(`authConfig.${NAME}.domain`) }}: </td><td>{{ model.hostname }}</td></tr> <tr><td>{{ t(`authConfig.${NAME}.domain`) }}: </td><td>{{ model.hostname }}</td></tr>
<tr><td>{{ t('authConfig.ldap.nestedGroupMembership.label') }}: </td><td>{{ model.nestedGroupMembershipEnabled ? t('generic.enabled') : t('generic.disabled') }}</td></tr>
</template> </template>
</AuthBanner> </AuthBanner>

3
utils/crypto/index.js
View File

@ -24,10 +24,9 @@ export function base64Encode(string, alphabet = NORMAL) {
const m = { const m = {
'+': '-', '+': '-',
'/': '_', '/': '_',
'=': ''
}; };
return buf.toString('base64').replace(/[+/]|=+$/g, char => m[char]); return buf.toString('base64').replace(/[+/]|=+$/g, char => m[char] || '');
} }
return buf.toString('base64'); return buf.toString('base64');