Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blocked msg #4210

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5ce4cab
feat: Implement recovery code via SMS
malosayli Oct 15, 2024
b7cb59d
Merge pull request #1 from nayla-finance/inv-recovery
aalkhodiry Oct 17, 2024
fe4788e
feat: Implement login attempt tracking and account deactivation
malosayli Oct 20, 2024
58accf0
Merge pull request #2 from nayla-finance/add-login-attempts
aalkhodiry Oct 21, 2024
394987c
chore: update schema versions
malosayli Oct 21, 2024
fdf0fd1
Merge pull request #3 from nayla-finance/add-login-attempts
aalkhodiry Oct 21, 2024
957a70f
ci: update CI workflow and reorganize GitHub Actions
aalkhodiry Oct 21, 2024
08f30d9
update
aalkhodiry Oct 21, 2024
ccacee5
removed master push build
aalkhodiry Oct 21, 2024
fa0392f
feat: reactivate inactive account on recovery
malosayli Oct 21, 2024
0b0af0d
Merge pull request #4 from nayla-finance/reactivate-on-password-reset
aalkhodiry Oct 21, 2024
51912d7
dev and release
aalkhodiry Oct 21, 2024
82c76e5
feat: add inactive identity deactivation
malosayli Nov 5, 2024
babaf58
refactor: only run deactivation if there are any inactive identities
malosayli Nov 5, 2024
0b6906c
chore: add identity inactivity threshold config key
malosayli Nov 5, 2024
2c790a0
chore: new config to schema json file
malosayli Nov 5, 2024
98410f6
Merge pull request #5 from nayla-finance/inactive-account
aalkhodiry Nov 5, 2024
4ff5efb
updated the link of the schema
aalkhodiry Nov 5, 2024
ceca748
feat: Implement recovery code via SMS
malosayli Oct 15, 2024
bea573c
feat: Implement login attempt tracking and account deactivation
malosayli Oct 20, 2024
e24518d
chore: update schema versions
malosayli Oct 21, 2024
dac4e8d
ci: update CI workflow and reorganize GitHub Actions
aalkhodiry Oct 21, 2024
8e7e276
update
aalkhodiry Oct 21, 2024
2ae7c3a
removed master push build
aalkhodiry Oct 21, 2024
9718aa7
feat: reactivate inactive account on recovery
malosayli Oct 21, 2024
8d68ffd
dev and release
aalkhodiry Oct 21, 2024
8ca175f
feat: add inactive identity deactivation
malosayli Nov 5, 2024
d323c06
refactor: only run deactivation if there are any inactive identities
malosayli Nov 5, 2024
5a1e370
chore: add identity inactivity threshold config key
malosayli Nov 5, 2024
2742cf9
chore: new config to schema json file
malosayli Nov 5, 2024
30ec02e
updated the link of the schema
aalkhodiry Nov 5, 2024
980db1c
Merge branch 'master' into resolve-ory-master-conflict
malosayli Nov 6, 2024
ff6ae08
Update cve-scan.yaml
aalkhodiry Nov 6, 2024
bbf5195
Merge pull request #7 from nayla-finance/resolve-ory-master-conflict
aalkhodiry Nov 6, 2024
ba4e6f1
add blocked state to identity
Nov 12, 2024
2264260
Merge pull request #8 from nayla-finance/add-blocked-state
aalkhodiry Nov 12, 2024
f96f208
Update master.yaml
aalkhodiry Nov 12, 2024
25453f9
Update dev.yaml
aalkhodiry Nov 12, 2024
9eeb640
Update master.yaml
aalkhodiry Nov 12, 2024
10a80a9
serrated msg from blocked user and recovery
Nov 14, 2024
763f631
we should not send blocked users a recovery code
Nov 14, 2024
ecda954
update msg
Nov 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 0 additions & 110 deletions .github/workflows/cve-scan.yaml

This file was deleted.

115 changes: 115 additions & 0 deletions .github/workflows/dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
name: Dev-build
on:
push:
branches:
- dev

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
IMAGE_TAG: ${{ github.ref_name }}-${{ github.sha }}

jobs:
build_x86:
name: Build and Push Image for x86
runs-on: ubuntu-latest
environment: dev
permissions:
contents: read
packages: write
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
labels: |
maintainer=${{github.repository_owner}}
org.opencontainers.image.title=${{github.repository}}
org.opencontainers.image.description=This is ${{github.repository}} build from ${{github.ref_name}}
org.opencontainers.image.vendor=${{github.repository_owner}}
tags: |
type=sha,prefix={{branch}}-
type=ref,event=branch

- name: Login to Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set container metadata and create job output
run: |
echo '${{ steps.meta.outputs.json }}' > job_output.json

- name: Upload job output
uses: actions/upload-artifact@v4
with:
name: build_output
path: job_output.json

- name: Build and Push the image
id: docker_build
uses: docker/build-push-action@v6
with:
context: ./
file: .docker/Dockerfile-build
push: true
platforms: linux/amd64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# build_arm64:
# name: Build and Push Image for arm64
# runs-on: ubuntu-arm64
# environment: dev
# permissions:
# contents: read
# packages: write
# steps:
# - name: Checkout code
# uses: actions/checkout@v4

# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v3

# - name: Docker meta
# id: meta
# uses: docker/metadata-action@v5
# with:
# images: |
# ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-arm
# labels: |
# maintainer=${{github.repository_owner}}
# org.opencontainers.image.title=${{github.repository}}
# org.opencontainers.image.description=This is ${{github.repository}} build from ${{github.ref_name}}
# org.opencontainers.image.vendor=${{github.repository_owner}}
# tags: |
# type=sha,prefix={{branch}}-
# type=ref,event=branch

# - name: Login to Container Registry
# uses: docker/login-action@v3
# with:
# registry: ${{ env.REGISTRY }}
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}

# - name: Build and Push the image
# id: docker_build
# uses: docker/build-push-action@v6
# with:
# context: ./
# file: .docker/Dockerfile-build
# push: true
# platforms: linux/arm64
# tags: ${{ steps.meta.outputs.tags }}
# labels: ${{ steps.meta.outputs.labels }}
117 changes: 117 additions & 0 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
name: CI-build
on:
push:
branches:
- master
tags:
- "v*"

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
IMAGE_TAG: ${{ github.ref_name }}-${{ github.sha }}

jobs:
build_x86:
name: Build and Push Image for x86
runs-on: ubuntu-latest
environment: dev
permissions:
contents: read
packages: write
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
labels: |
maintainer=${{github.repository_owner}}
org.opencontainers.image.title=${{github.repository}}
org.opencontainers.image.description=This is ${{github.repository}} build from ${{github.ref_name}}
org.opencontainers.image.vendor=${{github.repository_owner}}
tags: |
type=semver,pattern={{version}}
type=ref,event=branch

- name: Login to Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set container metadata and create job output
run: |
echo '${{ steps.meta.outputs.json }}' > job_output.json

- name: Upload job output
uses: actions/upload-artifact@v4
with:
name: build_output
path: job_output.json

- name: Build and Push the image
id: docker_build
uses: docker/build-push-action@v6
with:
context: ./
file: .docker/Dockerfile-build
push: true
platforms: linux/amd64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# build_arm64:
# name: Build and Push Image for arm64
# runs-on: ubuntu-arm64
# environment: dev
# permissions:
# contents: read
# packages: write
# steps:
# - name: Checkout code
# uses: actions/checkout@v4

# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v3

# - name: Docker meta
# id: meta
# uses: docker/metadata-action@v5
# with:
# images: |
# ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-arm
# labels: |
# maintainer=${{github.repository_owner}}
# org.opencontainers.image.title=${{github.repository}}
# org.opencontainers.image.description=This is ${{github.repository}} build from ${{github.ref_name}}
# org.opencontainers.image.vendor=${{github.repository_owner}}
# tags: |
# type=semver,pattern={{version}}
# type=ref,event=branch

# - name: Login to Container Registry
# uses: docker/login-action@v3
# with:
# registry: ${{ env.REGISTRY }}
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}

# - name: Build and Push the image
# id: docker_build
# uses: docker/build-push-action@v6
# with:
# context: ./
# file: .docker/Dockerfile-build
# push: true
# platforms: linux/arm64
# tags: ${{ steps.meta.outputs.tags }}
# labels: ${{ steps.meta.outputs.labels }}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml → .github/workflows/old/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: CI
on:
push:
branches:
- master
# branches:
# - master
tags:
- "*"
pull_request:
Expand Down
Loading