fix(ui): merge conflict

semaphoreui · Jul 9, 2023 · 076bb19 · 076bb19
2 parents bfa9a3c + 4fef07b
commit 076bb19
Show file tree

Hide file tree

Showing 55 changed files with 1,248 additions and 402 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.18 }
+        with: { go-version: 1.19 }
 
       - uses: actions/setup-node@v3
         with: { node-version: '16' }
@@ -42,7 +42,7 @@ jobs:
 #    needs: build-local
 #    steps:
 #      - uses: actions/setup-go@v3
-#        with: { go-version: 1.18 }
+#        with: { go-version: 1.19 }
 #
 #      - run: go install github.com/go-task/task/v3/cmd/task@latest
 #
@@ -98,7 +98,7 @@ jobs:
     needs: [test-db-migration]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.18 }
+        with: { go-version: 1.19 }
 
       - run: go install github.com/go-task/task/v3/cmd/task@latest
 
@@ -113,7 +113,7 @@ jobs:
     needs: [test-integration]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.18 }
+        with: { go-version: 1.19 }
 
       - run: go install github.com/go-task/task/v3/cmd/task@latest
 
@@ -147,7 +147,7 @@ jobs:
   #   runs-on: [ubuntu-latest]
   #   steps:
   #     - uses: actions/setup-go@v3
-  #       with: { go-version: 1.18 }
+  #       with: { go-version: 1.19 }
 
   #     - run: go install github.com/go-task/task/v3/cmd/task@latest
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.18 }
+        with: { go-version: 1.19 }
 
       - uses: actions/setup-node@v3
         with: { node-version: '16' }
@@ -36,7 +36,7 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/setup-go@v3
-        with: { go-version: 1.18 }
+        with: { go-version: 1.19 }
 
       - run: go install github.com/go-task/task/v3/cmd/task@latest
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
     - uses: actions/setup-go@v3
-      with: { go-version: 1.18 }
+      with: { go-version: 1.19 }
 
     - run: go install github.com/go-task/task/v3/cmd/task@latest
 

diff --git a/api-docs.yml b/api-docs.yml
@@ -44,6 +44,24 @@ definitions:
         format: password
         description: Password
 
+  LoginMetadata:
+    type: object
+    properties:
+      oidc_providers:
+        type: array
+        description: List of OIDC providers
+        items:
+          type: object
+          properties:
+            id:
+              type: string
+              description: ID of the provider, used in the login URL
+              x-example: mysso
+            name:
+              type: string
+              description: Text to show on the login button
+              x-example: Sign in with MySSO
+
   UserRequest:
     type: object
     properties:
@@ -610,6 +628,17 @@ paths:
 
   # Authentication
   /auth/login:
+    get:
+      tags:
+        - authentication
+      summary: Fetches login metadata
+      description: Fetches metadata for login, such as available OIDC providers
+      security: []
+      responses:
+        200:
+          description: Login metadata
+          schema:
+            $ref: "#/definitions/LoginMetadata"
     post:
       tags:
         - authentication
@@ -637,6 +666,38 @@ paths:
         204:
           description: Your session was successfully nuked
 
+  /auth/oidc/{provider_id}/login:
+    parameters:
+      - name: provider_id
+        in: path
+        type: string
+        required: true
+        x-example: "mysso"
+    get:
+      tags:
+        - authentication
+      summary: Begin OIDC authentication flow and redirect to OIDC provider
+      description: The user agent is redirected to this endpoint when chosing to sign in via OIDC
+      responses:
+        302:
+          description: Redirection to the OIDC provider on success, or to the login page on error
+
+  /auth/oidc/{provider_id}/redirect:
+    parameters:
+      - name: provider_id
+        in: path
+        type: string
+        required: true
+        x-example: "mysso"
+    get:
+      tags:
+        - authentication
+      summary: Finish OIDC authentication flow, upon succes you will be logged in
+      description: The user agent is redirected here by the OIDC provider to complete authentication
+      responses:
+        302:
+          description: Redirection to the Semaphore root URL on success, or to the login page on error
+
   # User Tokens
   /user/:
     get: