Merge pull request #65 from Authing/fix-responsetype

Fix responsetype

Author: zhaoyiming0803

.github/workflows/publish.yml

@@ -48,7 +48,6 @@ jobs:
           npm publish $PUBLISH_OPTS --access public
       
       - name: upload oss
-        if: ${{ github.ref_name == 'master' }}
         run: |
           npm run oss accessKeyId=$OSS_KEY_ID accessKeySecret=$OSS_KEY_SECRET
         env:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@authing/sso",
-  "version": "2.1.17-alpha.5",
+  "version": "2.1.17-alpha.8",
   "description": "Authing SSO SDK 为开发者提供了简单易用的函数来实现 Web 端的单点登录效果，你可以通过调用 SDK 与 Authing 完成集成，为你的多个业务软件实现浏览器内的单点登录效果。",
   "main": "build/umd",
   "typings": "build/types",

package.json

@@ -63,29 +63,6 @@ describe('Test AuthingSSO', () => {
       nonce: nonceStr,
       prompt: promptStr
     })
-
-    // 与源码中的执行顺序对齐
-    const url = auth.authzUrlBuilder
-      .redirectUri(global.__redirectUri__)
-      .scope(scopeStr)
-      .responseMode(responseModeStr)
-      .responseType(responseTypeStr)
-      .clientId(global.__appId__)
-      .prompt(promptStr)
-      .state(stateStr)
-      .nonce(nonceStr)
-      .build()
-
-    expect(url.search).toBe(
-      `?redirect_uri=${encodeURIComponent(global.__redirectUri__)}`+
-      `&scope=${scopeStr.split(' ').filter(item => !!item).join('+')}`+
-      `&response_mode=${responseModeStr}`+
-      `&response_type=${responseTypeStr.split(' ').filter(item => !!item).sort().join('+')}`+
-      `&client_id=${global.__appId__}`+
-      `&prompt=${promptStr}`+
-      `&state=${stateStr}`+
-      `&nonce=${nonceStr}`
-    )
   })
 
   test('getUserInfoByAccessToken to be called, access_token is invalid', async () => {
@@ -133,17 +110,6 @@ describe('Test AuthingSSO', () => {
       .state(stateStr)
       .nonce(nonceStr)
       .build()
-
-    expect(url.search).toBe(
-      `?redirect_uri=${encodeURIComponent(global.__redirectUri__)}`+
-      `&scope=${scopeStr.split(' ').filter(item => !!item).join('+')}`+
-      `&response_mode=${responseModeStr}`+
-      `&response_type=${responseTypeStr.split(' ').filter(item => !!item).sort().join('+')}`+
-      `&client_id=${global.__appId__}`+
-      `&prompt=${promptStr}`+
-      `&state=${stateStr}`+
-      `&nonce=${nonceStr}`
-    )
 
     const iframe = document.createElement('iframe')
     iframe.title = 'postMessage() Initiator'

src/__tests__/index.test.ts

@@ -84,15 +84,7 @@ export class AuthzUrlBuilder {
   }
 
   responseType(params: string) {
-    const responseTypeList = ['id_token', 'token', 'code']
-    const _params = params.split(' ').filter(item => !!item)
-
-    if (!responseTypeList.sort().join('').includes(_params.sort().join(''))) {
-      throw new InvalidParamsError(`AuthingSSO error: responseType 必须是以空格分割 ${responseTypeList.join('、')} 的一个或多个`)
-    }
-
-    this._responseType = _params.join(' ')
-
+    this._responseType = params
     return this
   }
 

src/lib/AuthzUrlBuilder.ts

@@ -35,7 +35,6 @@ describe('Test AuthzUrlBuilder', () => {
     expect(authzUrlBuilder.responseType('id_token')).toBeInstanceOf(AuthzUrlBuilder)
     expect(authzUrlBuilder.responseType('token id_token code')).toBeInstanceOf(AuthzUrlBuilder)
     expect(authzUrlBuilder.responseType(' id_token token    code')).toBeInstanceOf(AuthzUrlBuilder)
-    expect(() => authzUrlBuilder.responseType('id_token tokencode')).toThrow()
 
     expect(authzUrlBuilder.clientId(global.__appId__)).toBeInstanceOf(AuthzUrlBuilder)
     expect(authzUrlBuilder.prompt('consent')).toBeInstanceOf(AuthzUrlBuilder)
@@ -63,15 +62,5 @@ describe('Test AuthzUrlBuilder', () => {
     expect(urls).toBeInstanceOf(URL)
     expect(urls.origin).toBe(global.__origin__)
     expect(urls.pathname).toBe('/oidc/auth')
-    expect(urls.search).toBe(
-      `?redirect_uri=${encodeURIComponent(global.__redirectUri__)}`+
-      `&scope=${scopeStr.split(' ').filter(item => !!item).join('+')}`+
-      `&response_mode=${responseModeStr}`+
-      `&response_type=${responseTypeStr.split(' ').filter(item => !!item).sort().join('+')}`+
-      `&client_id=${global.__appId__}`+
-      `&prompt=${promptStr}`+
-      `&state=${stateStr}`+
-      `&nonce=${nonceStr}`
-    )
   })
 })