@rancher/shell 0.2.2 → 0.2.4

package/edit/auth/googleoauth.vue

@@ -81,7 +81,11 @@ export default {
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
-        <AuthBanner :t-args="tArgs" :disable="disable" :edit="goToEdit">
+        <AuthBanner
+          :t-args="tArgs"
+          :disable="disable"
+          :edit="goToEdit"
+        >
           <template slot="rows">
             <tr><td>{{ t(`authConfig.${NAME}.adminEmail`) }}: </td><td>{{ model.adminEmail }}</td></tr>
             <tr><td>{{ t(`authConfig.${NAME}.domain`) }}: </td><td>{{ model.hostname }}</td></tr>
@@ -90,14 +94,25 @@ export default {
           </template>
         </AuthBanner>
 
-        <hr />
+        <hr>
 
-        <AllowedPrincipals provider="googleoauth" :auth-config="model" :mode="mode" />
+        <AllowedPrincipals
+          provider="googleoauth"
+          :auth-config="model"
+          :mode="mode"
+        />
       </template>
 
       <template v-else>
-        <Banner v-if="!model.enabled" :label="t('authConfig.stateBanner.disabled', tArgs)" color="warning" />
-        <div :style="{'align-items':'center'}" class="row mb-20">
+        <Banner
+          v-if="!model.enabled"
+          :label="t('authConfig.stateBanner.disabled', tArgs)"
+          color="warning"
+        />
+        <div
+          :style="{'align-items':'center'}"
+          class="row mb-20"
+        >
           <div class="col span-5">
             <LabeledInput
               v-model="model.adminEmail"
@@ -115,20 +130,40 @@ export default {
             />
           </div>
           <div class="col span-2">
-            <Checkbox v-model="model.nestedGroupMembershipEnabled" :mode="mode" :label="t('authConfig.ldap.nestedGroupMembership.label')" />
+            <Checkbox
+              v-model="model.nestedGroupMembershipEnabled"
+              :mode="mode"
+              :label="t('authConfig.ldap.nestedGroupMembership.label')"
+            />
           </div>
         </div>
-        <InfoBox :step="1" class=" mt-20 mb-20">
+        <InfoBox
+          :step="1"
+          class=" mt-20 mb-20"
+        >
           <h3 v-html="t('authConfig.googleoauth.steps.1.title', tArgs, true)" />
           <ul class="mt-0 step-list">
             <li>{{ t('authConfig.googleoauth.steps.1.body.1', {}, true) }} </li>
-            <li><b>{{ t('authConfig.googleoauth.steps.1.body.2', {}, true) }}</b> {{ t('authConfig.googleoauth.steps.1.topPrivateDomain', {}, true) }} <CopyToClipboardText :plain="true" :text="tArgs.hostname" /> </li>
-            <li><b>{{ t('authConfig.googleoauth.steps.1.body.3', {}, true) }}</b> <CopyToClipboardText :plain="true" :text="serverUrl" /> </li>
+            <li>
+              <b>{{ t('authConfig.googleoauth.steps.1.body.2', {}, true) }}</b> {{ t('authConfig.googleoauth.steps.1.topPrivateDomain', {}, true) }} <CopyToClipboardText
+                :plain="true"
+                :text="tArgs.hostname"
+              />
+            </li>
+            <li>
+              <b>{{ t('authConfig.googleoauth.steps.1.body.3', {}, true) }}</b> <CopyToClipboardText
+                :plain="true"
+                :text="serverUrl"
+              />
+            </li>
             <li>{{ t('authConfig.googleoauth.steps.1.body.4', {}, true) }} </li>
             <li>{{ t('authConfig.googleoauth.steps.1.body.5', {}, true) }} </li>
           </ul>
         </InfoBox>
-        <InfoBox :step="2" class="mb-20">
+        <InfoBox
+          :step="2"
+          class="mb-20"
+        >
           <div class="row">
             <h3 v-html="t('authConfig.googleoauth.steps.2.title', tArgs, true)" />
           </div>
@@ -136,8 +171,18 @@ export default {
             <div class="col span-6">
               <ul class="mt-0 step-list">
                 <li>{{ t('authConfig.googleoauth.steps.2.body.1', {}, true) }} </li>
-                <li><b>{{ t('authConfig.googleoauth.steps.2.body.2', {}, true) }}</b> <CopyToClipboardText :plain="true" :text="serverUrl" /> </li>
-                <li><b>{{ t('authConfig.googleoauth.steps.2.body.3', {}, true) }}</b> <CopyToClipboardText :plain="true" :text="serverUrl+'/verify-auth'" /> </li>
+                <li>
+                  <b>{{ t('authConfig.googleoauth.steps.2.body.2', {}, true) }}</b> <CopyToClipboardText
+                    :plain="true"
+                    :text="serverUrl"
+                  />
+                </li>
+                <li>
+                  <b>{{ t('authConfig.googleoauth.steps.2.body.3', {}, true) }}</b> <CopyToClipboardText
+                    :plain="true"
+                    :text="serverUrl+'/verify-auth'"
+                  />
+                </li>
                 <li>{{ t('authConfig.googleoauth.steps.2.body.4', {}, true) }} </li>
                 <li>{{ t('authConfig.googleoauth.steps.2.body.5', {}, true) }} </li>
               </ul>
@@ -152,11 +197,19 @@ export default {
                 :tooltip="t(`authConfig.googleoauth.oauthCredentials.tip`)"
                 :hover-tooltip="true"
               />
-              <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'oauthCredential', $event)" />
+              <FileSelector
+                class="role-tertiary add mt-5"
+                :label="t('generic.readFromFile')"
+                :mode="mode"
+                @selected="$set(model, 'oauthCredential', $event)"
+              />
             </div>
           </div>
         </InfoBox>
-        <InfoBox :step="3" class="mb-20">
+        <InfoBox
+          :step="3"
+          class="mb-20"
+        >
           <div class="row">
             <h3 v-html="t('authConfig.googleoauth.steps.3.title', tArgs, true)" />
           </div>
@@ -179,14 +232,25 @@ export default {
                 :tooltip="t(`authConfig.googleoauth.serviceAccountCredentials.tip`)"
                 :hover-tooltip="true"
               />
-              <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'serviceAccountCredential', $event)" />
+              <FileSelector
+                class="role-tertiary add mt-5"
+                :label="t('generic.readFromFile')"
+                :mode="mode"
+                @selected="$set(model, 'serviceAccountCredential', $event)"
+              />
             </div>
           </div>
         </InfoBox>
 
-        <div v-if="!model.enabled" class="row">
+        <div
+          v-if="!model.enabled"
+          class="row"
+        >
           <div class="col span-12">
-            <Banner color="info" v-html="t('authConfig.associatedWarning', tArgs, true)" />
+            <Banner
+              color="info"
+              v-html="t('authConfig.associatedWarning', tArgs, true)"
+            />
           </div>
         </div>
       </template>

package/edit/auth/ldap/config.vue

@@ -108,37 +108,96 @@ export default {
         </div>
 
         <div class="col">
-          <Checkbox v-model="model.tls" :mode="mode" class="full-height" :label="t('authConfig.ldap.tls')" />
+          <Checkbox
+            v-model="model.tls"
+            :mode="mode"
+            class="full-height"
+            :label="t('authConfig.ldap.tls')"
+          />
         </div>
         <div class="col span-1">
-          <Checkbox v-model="model.starttls" :tooltip="t('authConfig.ldap.starttls.tip')" :mode="mode" class="full-height" :label="t('authConfig.ldap.starttls.label')" />
+          <Checkbox
+            v-model="model.starttls"
+            :tooltip="t('authConfig.ldap.starttls.tip')"
+            :mode="mode"
+            class="full-height"
+            :label="t('authConfig.ldap.starttls.label')"
+          />
         </div>
       </div>
-      <div v-if="model.tls || model.starttls" class="row mb-20">
+      <div
+        v-if="model.tls || model.starttls"
+        class="row mb-20"
+      >
         <div class="col span-12">
-          <LabeledInput v-model="model.certificate" required type="multiline" :mode="mode" :label="t('authConfig.ldap.cert')" />
-          <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'certificate', $event)" />
+          <LabeledInput
+            v-model="model.certificate"
+            required
+            type="multiline"
+            :mode="mode"
+            :label="t('authConfig.ldap.cert')"
+          />
+          <FileSelector
+            class="role-tertiary add mt-5"
+            :label="t('generic.readFromFile')"
+            :mode="mode"
+            @selected="$set(model, 'certificate', $event)"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <UnitInput v-model="model.connectionTimeout" required :mode="mode" :label="t('authConfig.ldap.serverConnectionTimeout')" suffix="milliseconds" />
+          <UnitInput
+            v-model="model.connectionTimeout"
+            required
+            :mode="mode"
+            :label="t('authConfig.ldap.serverConnectionTimeout')"
+            suffix="milliseconds"
+          />
         </div>
       </div>
-      <Banner color="info" :label="t('authConfig.ldap.serviceAccountInfo')" />
+      <Banner
+        color="info"
+        :label="t('authConfig.ldap.serviceAccountInfo')"
+      />
       <div class="row mb-20">
-        <div v-if="type==='activedirectory'" class="col span-6">
-          <LabeledInput v-model="model.serviceAccountUsername" required :mode="mode" :label="t('authConfig.ldap.serviceAccountDN')" />
+        <div
+          v-if="type==='activedirectory'"
+          class="col span-6"
+        >
+          <LabeledInput
+            v-model="model.serviceAccountUsername"
+            required
+            :mode="mode"
+            :label="t('authConfig.ldap.serviceAccountDN')"
+          />
         </div>
 
-        <div v-else class="col span-6">
-          <LabeledInput v-model="model.serviceAccountDistinguishedName" required :mode="mode" :label="t('authConfig.ldap.serviceAccountDN')" />
+        <div
+          v-else
+          class="col span-6"
+        >
+          <LabeledInput
+            v-model="model.serviceAccountDistinguishedName"
+            required
+            :mode="mode"
+            :label="t('authConfig.ldap.serviceAccountDN')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.serviceAccountPassword" required type="password" :mode="mode" :label="t('authConfig.ldap.serviceAccountPassword')" />
+          <LabeledInput
+            v-model="model.serviceAccountPassword"
+            required
+            type="password"
+            :mode="mode"
+            :label="t('authConfig.ldap.serviceAccountPassword')"
+          />
         </div>
       </div>
-      <div v-if="type==='activedirectory'" class="row mb-20">
+      <div
+        v-if="type==='activedirectory'"
+        class="row mb-20"
+      >
         <div class="col span-6">
           <LabeledInput
             v-model="model.defaultLoginDomain"
@@ -152,10 +211,21 @@ export default {
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userSearchBase" required :mode="mode" :label="t('authConfig.ldap.userSearchBase.label')" :placeholder="t('authConfig.ldap.userSearchBase.placeholder')" />
+          <LabeledInput
+            v-model="model.userSearchBase"
+            required
+            :mode="mode"
+            :label="t('authConfig.ldap.userSearchBase.label')"
+            :placeholder="t('authConfig.ldap.userSearchBase.placeholder')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupSearchBase" :mode="mode" :placeholder="t('authConfig.ldap.groupSearchBase.placeholder')" :label="t('authConfig.ldap.groupSearchBase.label')" />
+          <LabeledInput
+            v-model="model.groupSearchBase"
+            :mode="mode"
+            :placeholder="t('authConfig.ldap.groupSearchBase.placeholder')"
+            :label="t('authConfig.ldap.groupSearchBase.label')"
+          />
         </div>
       </div>
 
@@ -172,65 +242,128 @@ export default {
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userObjectClass" :mode="mode" :label="t('authConfig.ldap.objectClass')" />
+          <LabeledInput
+            v-model="model.userObjectClass"
+            :mode="mode"
+            :label="t('authConfig.ldap.objectClass')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupObjectClass" :mode="mode" :label="t('authConfig.ldap.objectClass')" />
+          <LabeledInput
+            v-model="model.groupObjectClass"
+            :mode="mode"
+            :label="t('authConfig.ldap.objectClass')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userNameAttribute" :mode="mode" :label="t('authConfig.ldap.usernameAttribute')" />
+          <LabeledInput
+            v-model="model.userNameAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.usernameAttribute')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupNameAttribute" :mode="mode" :label="t('authConfig.ldap.nameAttribute')" />
+          <LabeledInput
+            v-model="model.groupNameAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.nameAttribute')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userLoginAttribute" :mode="mode" :label="t('authConfig.ldap.loginAttribute')" />
+          <LabeledInput
+            v-model="model.userLoginAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.loginAttribute')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupMemberUserAttribute" :mode="mode" :label="t('authConfig.ldap.groupMemberUserAttribute')" />
+          <LabeledInput
+            v-model="model.groupMemberUserAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.groupMemberUserAttribute')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userMemberAttribute" :mode="mode" :label="t('authConfig.ldap.userMemberAttribute')" />
+          <LabeledInput
+            v-model="model.userMemberAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.userMemberAttribute')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupSearchAttribute" :mode="mode" :label="t('authConfig.ldap.searchAttribute')" />
+          <LabeledInput
+            v-model="model.groupSearchAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.searchAttribute')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userSearchAttribute" :mode="mode" :label="t('authConfig.ldap.searchAttribute')" />
+          <LabeledInput
+            v-model="model.userSearchAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.searchAttribute')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupSearchFilter" :mode="mode" :label="t('authConfig.ldap.searchFilter')" />
+          <LabeledInput
+            v-model="model.groupSearchFilter"
+            :mode="mode"
+            :label="t('authConfig.ldap.searchFilter')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userSearchFilter" :mode="mode" :label="t('authConfig.ldap.searchFilter')" />
+          <LabeledInput
+            v-model="model.userSearchFilter"
+            :mode="mode"
+            :label="t('authConfig.ldap.searchFilter')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupMemberMappingAttribute" :mode="mode" :label="t('authConfig.ldap.groupMemberMappingAttribute')" />
+          <LabeledInput
+            v-model="model.groupMemberMappingAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.groupMemberMappingAttribute')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.userEnabledAttribute" :mode="mode" :label="t('authConfig.ldap.userEnabledAttribute')" />
+          <LabeledInput
+            v-model="model.userEnabledAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.userEnabledAttribute')"
+          />
         </div>
         <div class="col span-6">
-          <LabeledInput v-model="model.groupDNAttribute" :mode="mode" :label="t('authConfig.ldap.groupDNAttribute')" />
+          <LabeledInput
+            v-model="model.groupDNAttribute"
+            :mode="mode"
+            :label="t('authConfig.ldap.groupDNAttribute')"
+          />
         </div>
       </div>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="model.disabledStatusBitmask" :mode="mode" :label="t('authConfig.ldap.disabledStatusBitmask')" />
+          <LabeledInput
+            v-model="model.disabledStatusBitmask"
+            :mode="mode"
+            :label="t('authConfig.ldap.disabledStatusBitmask')"
+          />
         </div>
-        <div v-if="type!=='shibboleth'" class=" col span-6">
+        <div
+          v-if="type!=='shibboleth'"
+          class=" col span-6"
+        >
           <RadioGroup
             v-model="model.nestedGroupMembershipEnabled"
             :mode="mode"

package/edit/auth/ldap/index.vue

@@ -88,23 +88,39 @@ export default {
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
-        <AuthBanner :t-args="tArgs" :disable="disable" :edit="goToEdit">
+        <AuthBanner
+          :t-args="tArgs"
+          :disable="disable"
+          :edit="goToEdit"
+        >
           <template slot="rows">
             <tr><td>{{ t(`authConfig.ldap.table.server`) }}: </td><td>{{ serverUrl }}</td></tr>
             <tr><td>{{ t(`authConfig.ldap.table.clientId`) }}: </td><td>{{ model.serviceAccountDistinguishedName || model.serviceAccountUsername }}</td></tr>
           </template>
         </AuthBanner>
 
-        <hr />
+        <hr>
 
-        <AllowedPrincipals :provider="NAME" :auth-config="model" :mode="mode" />
+        <AllowedPrincipals
+          :provider="NAME"
+          :auth-config="model"
+          :mode="mode"
+        />
       </template>
 
       <template v-else>
-        <Banner v-if="!model.enabled" :label="t('authConfig.stateBanner.disabled', tArgs)" color="warning" />
+        <Banner
+          v-if="!model.enabled"
+          :label="t('authConfig.stateBanner.disabled', tArgs)"
+          color="warning"
+        />
 
         <h3>{{ t(`authConfig.ldap.${NAME}`) }}</h3>
-        <config v-model="model" :type="NAME" :mode="mode" />
+        <config
+          v-model="model"
+          :type="NAME"
+          :mode="mode"
+        />
 
         <h4>{{ t('authConfig.testAndEnable') }}</h4>
         <div class="row mb-20">
@@ -126,9 +142,15 @@ export default {
           </div>
         </div>
       </template>
-      <div v-if="!model.enabled" class="row">
+      <div
+        v-if="!model.enabled"
+        class="row"
+      >
         <div class="col span-12">
-          <Banner color="info" v-html="t('authConfig.associatedWarning', tArgs, true)" />
+          <Banner
+            color="info"
+            v-html="t('authConfig.associatedWarning', tArgs, true)"
+          />
         </div>
       </div>
     </CruResource>

package/edit/auth/oidc.vue

@@ -118,7 +118,11 @@ export default {
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
-        <AuthBanner :t-args="tArgs" :disable="disable" :edit="goToEdit">
+        <AuthBanner
+          :t-args="tArgs"
+          :disable="disable"
+          :edit="goToEdit"
+        >
           <template slot="rows">
             <tr><td>{{ t(`authConfig.oidc.rancherUrl`) }}: </td><td>{{ model.rancherUrl }}</td></tr>
             <tr><td>{{ t(`authConfig.oidc.clientId`) }}: </td><td>{{ model.clientId }}</td></tr>
@@ -127,13 +131,21 @@ export default {
           </template>
         </AuthBanner>
 
-        <hr />
+        <hr>
 
-        <AllowedPrincipals :provider="NAME" :auth-config="model" :mode="mode" />
+        <AllowedPrincipals
+          :provider="NAME"
+          :auth-config="model"
+          :mode="mode"
+        />
       </template>
 
       <template v-else>
-        <Banner v-if="!model.enabled" :label="t('authConfig.stateBanner.disabled', tArgs)" color="warning" />
+        <Banner
+          v-if="!model.enabled"
+          :label="t('authConfig.stateBanner.disabled', tArgs)"
+          color="warning"
+        />
 
         <h3>{{ t(`authConfig.oidc.${NAME}`) }}</h3>
 
@@ -165,7 +177,12 @@ export default {
               :mode="mode"
               type="multiline"
             />
-            <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'privateKey', $event)" />
+            <FileSelector
+              class="role-tertiary add mt-5"
+              :label="t('generic.readFromFile')"
+              :mode="mode"
+              @selected="$set(model, 'privateKey', $event)"
+            />
           </div>
           <div class="col span-6">
             <LabeledInput
@@ -175,7 +192,12 @@ export default {
               :mode="mode"
               type="multiline"
             />
-            <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'certificate', $event)" />
+            <FileSelector
+              class="role-tertiary add mt-5"
+              :label="t('generic.readFromFile')"
+              :mode="mode"
+              @selected="$set(model, 'certificate', $event)"
+            />
           </div>
         </div>
 
@@ -249,9 +271,15 @@ export default {
           </div>
         </div>
       </template>
-      <div v-if="!model.enabled" class="row">
+      <div
+        v-if="!model.enabled"
+        class="row"
+      >
         <div class="col span-12">
-          <Banner color="info" v-html="t('authConfig.associatedWarning', tArgs, true)" />
+          <Banner
+            color="info"
+            v-html="t('authConfig.associatedWarning', tArgs, true)"
+          />
         </div>
       </div>
     </CruResource>