Working !

app/Controllers/auth/authNotSigmaUser.ts

 import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
-import NotSigmaUser from 'App/Models/NotSigmaUser'
+import User from 'App/Models/User'
 import { randomString } from 'App/Utils/random'
 
 /** Login a user that is not using the CAS */
@@ -24,13 +24,13 @@ export const createNotSigmaUser = async ({ request, response }: HttpContextContr
   const password = randomString(20)
 
   // Check if user already exists
-  const user = await NotSigmaUser.findBy('username', username)
+  const user = await User.findBy('username', username)
 
   if (user) {
     return response.badRequest({ error: 'User already exists' })
   }
 
-  await NotSigmaUser.create({ username, password })
+  await User.create({ username, password })
 
   return response.created({ message: 'User created', username, password })
 }

app/Controllers/auth/authSigmaUser.ts

 import Env from '@ioc:Adonis/Core/Env'
 import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
-import NotSigmaUser from 'App/Models/NotSigmaUser'
+import User from 'App/Models/User'
 import { ClientMetadata, Issuer, generators } from 'openid-client'
 
 const AUTH_URL = 'https://auth.binets.fr'
@@ -61,12 +61,16 @@ export const callbackSigmaUser = async ({ response, request, auth }: HttpContext
   if (!username || !name || !groups)
     throw new Error('The user given by the auth server is incomplete')
 
-  const user = await NotSigmaUser.firstOrCreate({
+  const receivedUser = {
     username, // Unique ?
     name,
     groups: groups as string[], // ! UGLY
-  })
+    isSigmaUser: true,
+    isAdmin: false,
+  }
 
+  const user = await User.firstOrCreate(receivedUser)
   const token = await auth.use('api').login(user)
-  return response.ok('Ok!')
+
+  return response.ok({ token, user })
 }

app/Models/NotSigmaUser.ts → app/Models/User.ts

@@ -2,15 +2,27 @@ import Hash from '@ioc:Adonis/Core/Hash'
 import { BaseModel, beforeSave, column } from '@ioc:Adonis/Lucid/Orm'
 import { DateTime } from 'luxon'
 
-export default class NotSigmaUser extends BaseModel {
+/** Both user connected with Sigma or as visitors are stored as `User`
+ * The `password` is only relevant for the visitors.
+ */
+export default class User extends BaseModel {
   @column({ isPrimary: true })
   public id: number
 
   @column()
   public username: string
 
+  @column()
+  public name: string
+
+  @column()
+  public groups: string[]
+
   @column({ serializeAs: null })
-  public password: string
+  public password: string | null // Password is null for Sigma users
+
+  @column()
+  public isSigmaUser: boolean
 
   @column()
   public isAdmin: boolean
@@ -22,9 +34,9 @@ export default class NotSigmaUser extends BaseModel {
   public updatedAt: DateTime
 
   @beforeSave()
-  public static async hashPassword(notSigmaUser: NotSigmaUser) {
-    if (notSigmaUser.$dirty.password) {
-      notSigmaUser.password = await Hash.make(notSigmaUser.password)
+  public static async hashPassword(user: User) {
+    if (user.$dirty.password && user.password) {
+      user.password = await Hash.make(user.password)
     }
   }
 }

config/auth.ts

@@ -100,7 +100,7 @@ const authConfig: AuthConfig = {
         | that time.
         |
         */
-        model: () => import('App/Models/NotSigmaUser'),
+        model: () => import('App/Models/User'),
       },
     },
   },

contracts/auth.ts

@@ -5,7 +5,7 @@
  * file.
  */
 
-import NotSigmaUser from 'App/Models/NotSigmaUser'
+import User from 'App/Models/User'
 
 declare module '@ioc:Adonis/Addons/Auth' {
   /*
@@ -34,8 +34,8 @@ declare module '@ioc:Adonis/Addons/Auth' {
     |
     */
     user: {
-      implementation: LucidProviderContract<typeof NotSigmaUser>
-      config: LucidProviderConfig<typeof NotSigmaUser>
+      implementation: LucidProviderContract<typeof User>
+      config: LucidProviderConfig<typeof User>
     }
   }
 

database/migrations/1698869795066_not_sigma_users.ts → database/migrations/1698869795066_users.ts

 import BaseSchema from '@ioc:Adonis/Lucid/Schema'
 
 export default class extends BaseSchema {
-  protected tableName = 'not_sigma_users'
+  protected tableName = 'users'
 
   public async up() {
     this.schema.createTable(this.tableName, (table) => {
       table.increments('id').primary()
+
       table.string('username', 255).notNullable().unique()
-      table.string('password', 180).notNullable()
+      table.string('name', 255).notNullable()
+      table.specificType('groups', 'text[]').notNullable()
+
+      table.string('password', 180)
+
+      table.boolean('is_sigma_user').notNullable()
       table.boolean('is_admin').notNullable().defaultTo(false)
 
       /**

database/migrations/1698869795078_api_tokens.ts

@@ -6,12 +6,7 @@ export default class extends BaseSchema {
   public async up() {
     this.schema.createTable(this.tableName, (table) => {
       table.increments('id').primary()
-      table
-        .integer('user_id')
-        .unsigned()
-        .references('id')
-        .inTable('not_sigma_users')
-        .onDelete('CASCADE')
+      table.integer('user_id').unsigned().references('id').inTable('users').onDelete('CASCADE')
       table.string('name').notNullable()
       table.string('type').notNullable()
       table.string('token', 64).notNullable().unique()

database/seeders/NotSigmaUser.seeder.ts → database/seeders/User.seeder.ts

 import BaseSeeder from '@ioc:Adonis/Lucid/Seeder'
-import NotSigmaUser from 'App/Models/NotSigmaUser'
+import User from 'App/Models/User'
 
 export default class extends BaseSeeder {
   public async run() {
-    await NotSigmaUser.createMany([
+    await User.createMany([
       {
         username: 'admin',
+        name: 'Administrateur',
         password: '0000',
         isAdmin: true,
+        isSigmaUser: false,
+        groups: [],
       },
       {
         username: 'thibaut',
+        name: 'Thibaut',
         password: '0000',
         isAdmin: false,
+        isSigmaUser: false,
+        groups: ['binet_reseau'],
       },
       {
         username: 'thomas',
+        name: 'Thomas',
         password: '0000',
         isAdmin: false,
+        isSigmaUser: false,
+        groups: ['binet_reseau', 'binet_photo'],
       },
       {
         username: 'emre',
+        name: 'Emre',
         password: '0000',
         isAdmin: false,
+        isSigmaUser: false,
+        groups: ['binet_reseau'],
       },
     ])
   }

start/bouncer.ts

@@ -6,7 +6,7 @@
  */
 
 import Bouncer from '@ioc:Adonis/Addons/Bouncer'
-import NotSigmaUser from 'App/Models/NotSigmaUser'
+import User from 'App/Models/User'
 
 /*
 |--------------------------------------------------------------------------
@@ -30,7 +30,7 @@ import NotSigmaUser from 'App/Models/NotSigmaUser'
 | NOTE: Always export the "actions" const from this file
 |****************************************************************
 */
-export const { actions } = Bouncer.define('isAdmin', (user: NotSigmaUser) => {
+export const { actions } = Bouncer.define('isAdmin', (user: User) => {
   return user.isAdmin ? true : Bouncer.deny('This can only be done by an admin')
 })