Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0neerpat committed Feb 15, 2023
2 parents b7b35ca + bdf7936 commit 3253fca
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ jobs:
- name: Checkout branch
uses: actions/checkout@v2
with:
token: ${{ secrets.PAT_GITHUB }}
token: ${{ secrets.PAT }}
ref: ${{ steps.get_variables.outputs.BRANCH }}
- name: Get version
id: get_version
env:
GH_TOKEN: ${{ secrets.PAT_GITHUB }}
GH_TOKEN: ${{ secrets.PAT }}
run: |
VERSION=${{ steps.get_variables.outputs.BRANCH }}
if [ ${{ github.event.inputs.image_tag_prefix }} ] ; then
Expand All @@ -83,7 +83,7 @@ jobs:
- name: Checkout branch
uses: actions/checkout@v2
with:
token: ${{ secrets.PAT_GITHUB }}
token: ${{ secrets.PAT }}
ref: ${{ needs.setup.outputs.BRANCH }}

- name: Setup Earthly
Expand All @@ -94,7 +94,7 @@ jobs:
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
password: ${{ secrets.PAT }}

- name: Build and push images
run: earthly --ci --push -P +docker --VERSION=${{ needs.setup.outputs.VERSION }}
Expand Down
1 change: 1 addition & 0 deletions api/src/lib/oAuth/providers/discord/discord.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const params = {
client_id: process.env.DISCORD_CLIENT_ID,
scope: DISCORD_SCOPE,
redirect_uri: DISCORD_REDIRECT_URI,
prompt: 'none',
}

export const onSubmitCode = async (code, { codeVerifier }) => {
Expand Down
4 changes: 3 additions & 1 deletion packages/oauth2-server/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const app = (db, settings) => {
const { uid, prompt, params } = details
// console.log('/oauth/interaction/:uid', prompt)
const client = await oidc.Client.find(params.client_id)

const provider =
req.apiGateway?.event?.queryStringParameters?.login_provider
if (prompt.name === 'login') {
Expand Down Expand Up @@ -80,6 +79,9 @@ const app = (db, settings) => {
client.logoUri && (path += `&clientLogoUri=${client.logoUri}`)
client.policyUri && (path += `&clientPolicyUri=${client.policyUri}`)
client.tosUri && (path += `&clientTosUri=${client.tosUri}`)
client.redirectUris &&
(path += `&clientRedirectUri=${client.redirectUris[0]}`)

// For more client metadata available see https://github.com/panva/node-oidc-provider/blob/main/lib/consts/client_attributes.js

return res.redirect(path)
Expand Down

0 comments on commit 3253fca

Please sign in to comment.