Commit 97346b19 authored by bradburyr's avatar bradburyr
Browse files

Combine clientCredentials and authorizationCode into a merged securityScheme.

parent 7b08adf9

5gms_pro_ph2,oauth2,bbc.nppsess

0 → 100755
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<NotepadPlus>

    <Session activeView="0">

        <mainView activeIndex="17">

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1095" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="1" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ConsumptionReporting.yaml" backupFilePath="" originalFileLastModifTimestamp="1193486220" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ContentHosting.yaml" backupFilePath="" originalFileLastModifTimestamp="1193486220" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml" backupFilePath="" originalFileLastModifTimestamp="1193486220" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ContentProtocols.yaml" backupFilePath="" originalFileLastModifTimestamp="1193486220" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ContentPublishing.yaml" backupFilePath="" originalFileLastModifTimestamp="1193486220" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_EdgeResources.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_EventDataProcessing.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_MetricsReporting.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_PolicyTemplates.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ProvisioningSessions.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_Provisioning_ServerCertificates.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_SessionHandling_ConsumptionReporting.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_SessionHandling_DynamicPolicy.yaml" backupFilePath="" originalFileLastModifTimestamp="-1692971374" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_SessionHandling_MetricsReporting.yaml" backupFilePath="" originalFileLastModifTimestamp="1193546180" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_SessionHandling_NetworkAssistance.yaml" backupFilePath="" originalFileLastModifTimestamp="1193606126" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml" backupFilePath="" originalFileLastModifTimestamp="1193606126" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="0" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26512_Maf_Provisioning.yaml" backupFilePath="" originalFileLastModifTimestamp="1193606126" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

            <File firstVisibleLine="0" xOffset="0" scrollWidth="1469" startPos="0" endPos="0" selMode="0" offset="0" wrapCount="1" lang="YAML" encoding="-1" userReadOnly="no" filename="C:\Users\richardb\Work (offline)\5G_APIs\5gms_pro_ph2,oauth2,bbc\TS26512_Maf_SessionHandling.yaml" backupFilePath="" originalFileLastModifTimestamp="1193606126" originalFileLastModifTimestampHigh="31089490" tabColourId="-1" mapFirstVisibleDisplayLine="-1" mapFirstVisibleDocLine="-1" mapLastVisibleDocLine="-1" mapNbLine="-1" mapHigherPos="-1" mapWidth="-1" mapHeight="-1" mapKByteInDoc="512" mapWrapIndentMode="-1" mapIsWrap="no" />

        </mainView>

        <subView activeIndex="0" />

    </Session>

</NotepadPlus>

TS26510_Maf_SessionHandling_DynamicPolicy.yaml

+20 −32
Original line number Diff line number Diff line
@@ -26,15 +26,14 @@ security: 
  - {}

  - OAuth2ClientCredentials: []

  - OAuth2AuthorizationCode: []



paths:

  /dynamic-policies:

    post:

      operationId: createDynamicPolicy

      summary: 'Create (and optionally upload) a new Dynamic Policy resource'

      security:

        - OAuth2ClientCredentials:

          - dynamic-policy-create

        - oAuth2AuthorizationCode:

        - OAuth2:

          - dynamic-policy-create

      requestBody:

        description: 'An optional JSON representation of a Dynamic Policy resource'
@@ -88,10 +87,8 @@ paths: 
      operationId: retrieveDynamicPolicy

      summary: 'Retrieve an existing Dynamic Policy resource'

      security:

        - OAuth2ClientCredentials:

          - dynamic-policy-read

        - oAuth2AuthorizationCode:

          - dynamic-policy-read

        - OAuth2:

          - dynamic-policy-retrieve

      responses:

        '200': # OK

          description: 'Success'
@@ -121,10 +118,8 @@ paths: 
      operationId: updateDynamicPolicy

      summary: 'Update an existing Dynamic Policy resource'

      security:

        - OAuth2ClientCredentials:

          - metrics-reporting-put

        - oAuth2AuthorizationCode:

          - metrics-reporting-put

        - OAuth2:

          - dynamic-policy-replace

      requestBody:

        description: 'A replacement JSON representation of a Dynamic Policy resource'

        required: true
@@ -169,9 +164,7 @@ paths: 
      operationId: patchDynamicPolicy

      summary: 'Patch an existing Dynamic Policy resource'

      security:

        - OAuth2ClientCredentials:

          - dynamic-policy-patch

        - oAuth2AuthorizationCode:

        - OAuth2:

          - dynamic-policy-patch

      requestBody:

        description: 'A JSON patch to a Dynamic Policy resource'
@@ -220,10 +213,8 @@ paths: 
      operationId: destroyDynamicPolicy

      summary: 'Destroy an existing Dynamic Policy resource'

      security:

        - OAuth2ClientCredentials:

          - dynamic-policy-delete

        - oAuth2AuthorizationCode:

          - dynamic-policy-delete

        - OAuth2:

          - dynamic-policy-destroy

      responses:

        '204': # No Content

          description: 'Dynamic Policy Destroyed'
@@ -248,29 +239,26 @@ paths: 


components:

  securitySchemes:

    OAuth2ClientCredentials:

    OAuth2:

      type: oauth2

      flows:

        clientCredentials:

          tokenUrl: '{tokenUrl}'

          scopes:

            dynamic-policy-create: Create a dynamic policy

            dynamic-policy-read: Read a dynamic policy

            dynamic-policy-put: Put a dynamic policy

            dynamic-policy-patch: Patch a dynamic policy

            dynamic-policy-delete: Delete a dynamic policy

    oAuth2AuthorizationCode:

      type: oauth2

      flows:

            dynamic-policy-create: Create a Dynamic Policy resource

            dynamic-policy-retrieve: Retrieve a Dynamic Policy resource

            dynamic-policy-replace: Replace a Dynamic Policy resource

            dynamic-policy-patch: Patch a Dynamic Policy resource

            dynamic-policy-destroy: Destroy a Dynamic Policy resource

        authorizationCode:

          authorizationUrl: '{authorizationUrl}'

          tokenUrl: '{tokenUrl}'

          scopes: 

            dynamic-policy-create: Create a dynamic policy

            dynamic-policy-read: Read a dynamic policy

            dynamic-policy-put: Put a dynamic policy

            dynamic-policy-patch: Patch a dynamic policy

            dynamic-policy-delete: Delete a dynamic policy

            dynamic-policy-create: Create a Dynamic Policy resource

            dynamic-policy-retrieve: Retrieve a Dynamic Policy resource

            dynamic-policy-replace: Replace a Dynamic Policy resource

            dynamic-policy-patch: Patch a Dynamic Policy resource

            dynamic-policy-destroy: Destroy a Dynamic Policy resource

  schemas:

    DynamicPolicy:

      description: "A representation of a Dynamic Policy resource."