Merge pull request #51 from longguikeji/lh/add-saml

feat: add saml
longguikeji · Dec 9, 2019 · 54c8cc1 · 54c8cc1
2 parents b06c245 + 05576f4
commit 54c8cc1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/models/oneid.ts b/src/models/oneid.ts
@@ -567,6 +567,12 @@ export class OAuthData {
   authorization_grant_type = 'authorization-code'
 }
 
+export class SamlData {
+  entity_id = ''
+  acs = ''
+  sls = ''
+}
+
 export interface AccessPermData {
   permit_owners: {
     results: PermOwnerData[];
@@ -585,6 +591,7 @@ export interface AppData {
   oauth_app: OAuthData|null
   ldap_app?: object|null
   http_app?: object|null
+  saml_app?: SamlData|null
   auth_protocols: string[]
   access_perm: AccessPermData
 }
@@ -603,6 +610,7 @@ export class App {
     obj.index = data.index
     obj.ldap_app = data.ldap_app
     obj.http_app = data.http_app
+    obj.saml_app = data.saml_app
     obj.auth_protocols = data.auth_protocols
     if (data.access_perm) {
       obj.permit_owners = data.access_perm.permit_owners.results
@@ -619,6 +627,7 @@ export class App {
   oauth_app?: OAuthData|null = null
   ldap_app?: object|null = null
   http_app?: object|null = null
+  saml_app?: SamlData|null = null
   auth_protocols: string[] = []
   permit_owners: PermOwnerData[] = []// 白名单
   reject_owners: PermOwnerData[] = []// 黑名单

diff --git a/src/oneid-app/admin/apps/AddApp.ts b/src/oneid-app/admin/apps/AddApp.ts
@@ -1,4 +1,4 @@
-import {App, OAuthData} from '@/models/oneid'
+import {App, OAuthData, SamlData} from '@/models/oneid'
 import * as api from '@/services/oneid'
 import { Component, Vue, Watch } from 'vue-property-decorator'
 import './AddApp.less'
@@ -93,6 +93,17 @@ import './AddApp.less'
                 </FormItem>
               </div>
             </TabPane>
+            <TabPane v-if="app.auth_protocols.includes(authTypes[3])" :label="authTypes[3]" :name="authTypes[3]">
+              <FormItem prop="app.saml_app.entity_id" label="entity_id">
+                <Input type="text" v-model="app.saml_app.entity_id" placeholder="请输入 entity_id..."></Input>
+              </FormItem>
+              <FormItem prop="app.saml_app.acs" label="acs">
+                <Input type="text" v-model="app.saml_app.acs" placeholder="请输入 acs..."></Input>
+              </FormItem>
+              <FormItem prop="app.saml_app.sls" label="sls">
+                <Input type="text" v-model="app.saml_app.sls" placeholder="请输入 sls..."></Input>
+              </FormItem>
+            </TabPane>
           </Tabs>
         </Form>
       </div>
@@ -122,7 +133,7 @@ export default class AddApp extends Vue {
       'oauth_app.redirect_uris': [required],
     }
   }
-  authTypes = ['OAuth 2.0', 'LDAP', 'HTTP']
+  authTypes = ['OAuth 2.0', 'LDAP', 'HTTP', 'SAML2']
   selectedAuthTypes?: string[] = []
   clientTypes = ['confidential', 'public']
   grantTypes = ['authorization-code', 'implicit', 'password', 'client']
@@ -132,6 +143,7 @@ export default class AddApp extends Vue {
     super()
     const newApp = new App()
     newApp.oauth_app = new OAuthData()
+    newApp.saml_app = new SamlData()
     this.app = newApp
   }
 
@@ -218,6 +230,16 @@ export default class AddApp extends Vue {
       params.http_app = null
     }
 
+    if (this.app!.auth_protocols.includes(this.authTypes[3])) {
+      params.saml_app = {
+        entity_id: this.app!.saml_app!.entity_id,
+        acs: this.app!.saml_app!.acs,
+        sls: this.app!.saml_app!.sls,
+      }
+    } else {
+      params.saml_app = null
+    }
+
     return params
   }