@@ -35,9 +35,8 @@ const internalStream = {
35
35
data . meta = { } ;
36
36
}
37
37
38
- let data_no_domains = structuredClone ( data ) ;
39
-
40
38
// streams aren't routed by domain name so don't store domain names in the DB
39
+ let data_no_domains = structuredClone ( data ) ;
41
40
delete data_no_domains . domain_names ;
42
41
43
42
return streamModel
@@ -73,7 +72,7 @@ const internalStream = {
73
72
// Configure nginx
74
73
return internalNginx . configure ( streamModel , 'stream' , row )
75
74
. then ( ( ) => {
76
- return internalStream . get ( access , { id : row . id , expand : [ 'owner' ] } ) ;
75
+ return row ;
77
76
} ) ;
78
77
} )
79
78
. then ( ( row ) => {
@@ -140,12 +139,6 @@ const internalStream = {
140
139
. query ( )
141
140
. patchAndFetchById ( row . id , data )
142
141
. then ( utils . omitRow ( omissions ( ) ) )
143
- . then ( ( saved_row ) => {
144
- return internalNginx . configure ( streamModel , 'stream' , saved_row )
145
- . then ( ( ) => {
146
- return internalStream . get ( access , { id : row . id , expand : [ 'owner' ] } ) ;
147
- } ) ;
148
- } )
149
142
. then ( ( saved_row ) => {
150
143
// Add to audit log
151
144
return internalAuditLog . add ( access , {
@@ -158,6 +151,17 @@ const internalStream = {
158
151
return saved_row ;
159
152
} ) ;
160
153
} ) ;
154
+ } )
155
+ . then ( ( ) => {
156
+ return internalStream . get ( access , { id : data . id , expand : [ 'owner' , 'certificate' ] } )
157
+ . then ( ( row ) => {
158
+ return internalNginx . configure ( streamModel , 'stream' , row )
159
+ . then ( ( new_meta ) => {
160
+ row . meta = new_meta ;
161
+ row = internalHost . cleanRowCertificateMeta ( row ) ;
162
+ return _ . omit ( row , omissions ( ) ) ;
163
+ } ) ;
164
+ } ) ;
161
165
} ) ;
162
166
} ,
163
167
0 commit comments